Pulled sameContents function out into nim-langutils library.

src/main/nim/strawbosspkg/configuration.nim

@@ -1,6 +1,7 @@
 import logging, json, os, nre, sequtils, strtabs, tables, times
 import private/util
 
+from langutils import sameContents
 from typeinfo import toAny
 
 # Types

src/test/nim/tconfiguration.nim

@@ -1,5 +1,5 @@
 import json, strtabs, tables, unittest
-import ./testutil
+from langutils import sameContents
 import ../../main/nim/strawbosspkg/configuration
 
 suite "load and save configuration objects":

src/test/nim/testutil.nim

@@ -1,52 +0,0 @@
-import unittest, sequtils
-
-proc sameContents*[T](a1, a2: openArray[T]): bool =
-  # Answers the question: do these two arrays contain the same contents,
-  # regardless of their order?
-  if a1.len != a2.len: return false
-  for a in a1:
-    if not a2.anyIt(a == it): return false
-  return true
-
-type
-  SimpleObj* = object
-    strVal*: string
-
-  TestObj = object
-    strVal*: string
-    intVal*: int
-    objVal*: SimpleObj
-
-suite "testutil":
-
-  test "sameContents":
-    let a1 = [1, 2, 3, 4]
-    let a2 = [3, 2, 4, 1]
-    let a3 = [1, 2, 3, 5]
-    let b1 = ["this", "is", "a", "test"]
-    let b2 = ["a", "test", "this", "is"]
-    let b3 = ["a", "negative", "test", "this", "is"]
-    let c1 = [TestObj(strVal: "a", intVal: 1, objVal: SimpleObj(strVal: "innerA")),
-              TestObj(strVal: "b", intVal: 2, objVal: SimpleObj(strVal: "innerB"))]
-    let c2 = [c1[1], c1[0]]
-
-    check:
-      sameContents(a1, a2)
-      sameContents(b2, b1)
-      sameContents(c1, c2)
-      sameContents(a1, a3) == false
-      sameContents(b1, b3) == false
-
-  test "sameContents (seq)":
-    let a1 = @[1, 2, 3, 4]
-    let a2 = @[3, 2, 4, 1]
-
-    check:
-      sameContents(a1, a2)
-
-  test "sameContents (cross-type)":
-    let a1 = @[1, 2, 3, 4]
-    let a2 = [3, 2, 4, 1]
-
-    check:
-      sameContents(a1, a2)

src/test/nim/tserver.nim

@@ -1,8 +1,8 @@
 import asyncdispatch, httpclient, json, os, osproc, sequtils, strutils,
   tempfile, times, unittest
 
-import logging
+from langutils import sameContents
-import ./testutil
+
 import ../../main/nim/strawbosspkg/configuration
 import ../../main/nim/strawbosspkg/server
 import ../../main/nim/strawbosspkg/private/util

strawboss.nimble

@@ -11,6 +11,7 @@ srcDir        = "src/main/nim"
 
 requires @["nim >= 0.16.1", "docopt >= 0.1.0", "tempfile", "jester", "bcrypt"]
 requires "https://github.com/yglukhov/nim-jwt"
+requires "https://git.jdb-labs.com/jdb/nim-lang-utils.git"
 
 task test, "Runs the test suite.":
   exec "nim c -r src/test/nim/runtests.nim"