Change tests for dynamic libraries

test/suresql/pq-users.janet

@@ -1,11 +1,12 @@
-(import pq)
+(import "src/suresql/init" :prefix "")
 
-(os/setenv "DATABASE_URL" "postgres://localhost:5432/suresql_test_db")
+(var pq/connect identity)
+(def database-url "postgres://localhost:5432/suresql_test_db")
 
-(import "src/suresql/suresql" :prefix "")
-
-(os/shell "dropdb suresql_test_db")
-(os/shell "createdb suresql_test_db")
+(try!
+  (import pq)
+  (os/shell "dropdb suresql_test_db")
+  (os/shell "createdb suresql_test_db"))
 
 (defqueries "sql/pq-users.sql"
-            {:connection (pq/connect "postgres://localhost:5432/suresql_test_db")})
+            {:connection (pq/connect database-url)})

test/suresql/suresql-pq-test.janet

@@ -1,32 +1,38 @@
 (import tester :prefix "" :exit true)
-(import pq)
 (import ./pq-users :as users)
 
-(users/drop-table)
-(users/create-table)
+(var pq-installed? false)
+(try
+  (do
+    (import pq)
+    (set pq-installed? true))
+  ([_]))
 
-(deftest
-  (test "insert"
-    (is (deep= @{:id 1 :name "sean" :active 1}
-               (users/insert "sean" 1))))
+(when pq-installed?
+  (users/drop-table)
+  (users/create-table)
 
+  (defsuite "postgres"
+    (test "insert"
+      (is (deep= @{:id 1 :name "sean" :active 1}
+                 (users/insert "sean" 1))))
 
-  (test "select"
-    (is (deep= @{:id 1 :name "sean" :active 1}
-               (users/find 1))))
 
+    (test "select"
+      (is (deep= @{:id 1 :name "sean" :active 1}
+                 (users/find 1))))
 
-  (test "where"
-    (is (deep= @[@{:id 1 :name "sean" :active 1}]
-               (users/active?))))
 
+    (test "where"
+      (is (deep= @[@{:id 1 :name "sean" :active 1}]
+                 (users/active?))))
 
-  (test "update"
-    (is (deep= @{:id 1 :name "sean" :active 0}
-               (users/update 0 "sean" 1))))
 
+    (test "update"
+      (is (deep= @{:id 1 :name "sean" :active 0}
+                 (users/update 0 "sean" 1))))
 
-  (test "delete"
-    (is (deep= @{:id 1 :name "sean" :active 0}
-               (users/delete 1)))))
 
+    (test "delete"
+      (is (deep= @{:id 1 :name "sean" :active 0}
+                 (users/delete 1))))))

test/suresql/suresql-test.janet

@@ -1,32 +1,38 @@
 (import tester :prefix "" :exit true)
-(import sqlite3)
 (import ./users)
 
-(users/drop-table)
-(users/create-table)
+(var sqlite-installed? false)
+(try
+  (do
+    (import sqlite3)
+    (set sqlite-installed? true))
+  ([_]))
 
-(deftest
-  (test "insert"
-    (is (deep= @[]
-               (users/insert {:name "sean" :active 1}))))
+(when sqlite-installed?
+  (users/drop-table)
+  (users/create-table)
 
+  (defsuite "sqlite"
+    (test "insert"
+      (is (deep= @{:name "sean" :active 1 :id 1}
+                 (users/insert {:name "sean" :active 1}))))
 
-  (test "select"
-    (is (= {:id 1 :name "sean" :active 1}
-           (users/find 1))))
 
+    (test "select"
+      (is (deep= @{:id 1 :name "sean" :active 1}
+                 (users/find 1))))
 
-  (test "where"
-    (is (deep= @[{:id 1 :name "sean" :active 1}]
-               (users/where {:id 1}))))
 
+    (test "where"
+      (is (deep= @[@{:id 1 :name "sean" :active 1}]
+                 (users/where {:id 1}))))
 
-  (test "update"
-    (is (deep= @[]
-               (users/update {:name "sean" :active 0 :id 1}))))
 
+    (test "update"
+      (is (deep= @[]
+                 (users/update {:name "sean" :active 0 :id 1}))))
 
-  (test "delete"
-    (is (deep= @[]
-               (users/delete 1)))))
 
+    (test "delete"
+      (is (deep= @[]
+                 (users/delete 1))))))

test/suresql/users.janet

@@ -1,8 +1,10 @@
-(import sqlite3)
+(import "src/suresql/init" :prefix "")
 
-(os/setenv "DATABASE_URL" "test.sqlite3")
+(var sqlite3/open identity)
+(def database-url "test.sqlite3")
 
-(import "src/suresql/suresql" :prefix "")
+(try!
+  (import sqlite3))
 
 (defqueries "sql/users.sql"
             {:connection (sqlite3/open "test.sqlite3")})