From 1c2c5f10200d9d93d92f6f690ed28e03a8830b3f Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Wed, 27 Sep 2023 18:57:17 -0700
Subject: [PATCH] refactor - tests

---
 tests/datastore/backendCommonTests.nim |  2 +-
 tests/datastore/sql/testsqliteds.nim   |  2 +-
 tests/datastore/testfsds.nim           | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/tests/datastore/backendCommonTests.nim b/tests/datastore/backendCommonTests.nim
index e09e612..b3fecbe 100644
--- a/tests/datastore/backendCommonTests.nim
+++ b/tests/datastore/backendCommonTests.nim
@@ -55,7 +55,7 @@ template testBasicBackend*[K, V, DB](
       discard ds.get(key).tryGet() # non existing key
 
 template queryTests*(
-  ds: untyped,
+  dsNew: untyped,
   key1, key2, key3: untyped,
   val1, val2, val3: untyped,
   extended = true
diff --git a/tests/datastore/sql/testsqliteds.nim b/tests/datastore/sql/testsqliteds.nim
index 18454ba..e52d90b 100644
--- a/tests/datastore/sql/testsqliteds.nim
+++ b/tests/datastore/sql/testsqliteds.nim
@@ -62,4 +62,4 @@ suite "queryTests":
     val2 = DataBuffer.new "value for 2"
     val3 = DataBuffer.new "value for 3"
 
-  queryTests(ds, key1, key2, key3, val1, val2, val3, extended=true)
+  queryTests(dsNew, key1, key2, key3, val1, val2, val3, extended=true)
diff --git a/tests/datastore/testfsds.nim b/tests/datastore/testfsds.nim
index 33c1a05..4eb4db3 100644
--- a/tests/datastore/testfsds.nim
+++ b/tests/datastore/testfsds.nim
@@ -166,3 +166,29 @@ suite "Test Misc FSDatastore":
 #     require(not dirExists(basePathAbs))
 
 #   queryTests(ds, false)
+
+suite "queryTests":
+
+  let
+    path = currentSourcePath() # get this file's name
+    basePath = "tests_data"
+    basePathAbs = path.parentDir / basePath
+
+  removeDir(basePathAbs)
+  require(not dirExists(basePathAbs))
+  createDir(basePathAbs)
+
+  let
+    fsNew = proc(): FSDatastore[KeyId, DataBuffer] =
+      newFSDatastore[KeyId, DataBuffer](root = basePathAbs, depth = 3).tryGet()
+    key1 = KeyId.new "/a"
+    key2 = KeyId.new "/a/b"
+    key3 = KeyId.new "/a/b/c"
+    val1 = DataBuffer.new "value for 1"
+    val2 = DataBuffer.new "value for 2"
+    val3 = DataBuffer.new "value for 3"
+
+  queryTests(fsNew, key1, key2, key3, val1, val2, val3, extended=true)
+
+  removeDir(basePathAbs)
+  require(not dirExists(basePathAbs))