stomp.cli: simplify

[factor.git] / extra / site-watcher / site-watcher-tests.factor

diff --git a/extra/site-watcher/site-watcher-tests.factor b/extra/site-watcher/site-watcher-tests.factor
index e58d5a79d5fa7d8c5f556994b4a1a53b30314ec0..75600a54e9d828ab05ede10e4b7fff927a85cf76 100644 (file)
--- a/extra/site-watcher/site-watcher-tests.factor
+++ b/extra/site-watcher/site-watcher-tests.factor
@@ -1,25 +1,23 @@
 ! Copyright (C) 2009 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: db.tuples locals site-watcher site-watcher.db
-site-watcher.private kernel db io.directories io.files.temp
-continuations db.sqlite
-sequences tools.test ;
+! See https://factorcode.org/license.txt for BSD license.
+USING: continuations db db.tuples io.directories io.files.temp kernel
+locals sequences site-watcher.db tools.test webapps.utils ;
 IN: site-watcher.tests
 
-[ "site-watcher.db" temp-file delete-file ] ignore-errors
+"site-watcher.db" temp-file ?delete-file
 
 :: fake-sites ( -- seq )
-    "site-watcher.db" temp-file <sqlite-db> [
+    "site-watcher.db" <temp-sqlite-db> [
         account ensure-table
         site ensure-table
         watching-site ensure-table
 
         "erg" "erg@factorcode.org" insert-account
-        "http://asdfasdfasdfasdfqwerqqq.com" insert-site drop
-        "http://fark.com" insert-site drop
+        "https://asdfasdfasdfasdfqwerqqq.com" insert-site drop
+        "https://fark.com" insert-site drop
 
-        "erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site
+        "erg@factorcode.org" "https://asdfasdfasdfasdfqwerqqq.com" watch-site
         f <site> select-tuples
     ] with-db ;
 
-[ f ] [ fake-sites empty? ] unit-test
+{ f } [ fake-sites empty? ] unit-test