tests/*: refine directory structure

ChangeLog

@@ -4,6 +4,8 @@
 
 	* nimbus.nim: use a custom build script
 
+	* tests: refine directory structure
+
 2023-04-25  Anna  <cyber@sysrq.in>
 
 	* nimbus.nim: drop support for patched Nim compilers

tests/nimble/dependencyresolver/test_getpath.nim

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
@@ -11,11 +11,11 @@ discard """
 '''
 """
 
-import os, unittest
-import nimbs/dependencyresolver, nimbs/options, nimbs/version
+import std/[os, unittest]
+import nimbs/[dependencyresolver, options, version]
 
 const
-  nimbleDir = "tests" / "dependencyresolver" / "nimbleDir"
+  nimbleDir = "tests" / "nimble" / "dependencyresolver" / "nimbleDir"
   pkgsDir = nimbleDir / "pkgs2"
 
 let

tests/nimble/dependencyresolver/test_getpath_nonimbledir.nim

@@ -1,14 +1,14 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
   joinable: false
 """
 
-import os, unittest
-import nimbs/dependencyresolver, nimbs/options, nimbs/version
+import std/[os, unittest]
+import nimbs/[dependencyresolver, options, version]
 
-const nimbleDir = "tests" / "dependencyresolver" / "notexists"
+const nimbleDir = "tests" / "nimble" / "dependencyresolver" / "notexists"
 let pkgA: PkgTuple = ("packageA", parseVersionRange(">= 0.1"))
 
 var opts = Options(nimbleDir: nimbleDir)

tests/nimble/dependencyresolver/test_getpath_unsupported.nim

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
@@ -12,11 +12,11 @@ WARN [initPkgList] Skipped unsupported package: packageA-abc
 '''
 """
 
-import os
-import nimbs/dependencyresolver, nimbs/options, nimbs/version
+import std/os
+import nimbs/[dependencyresolver, options, version]
 
 const
-  nimbleDir = "tests" / "dependencyresolver" / "nimbleDir_unsupported"
+  nimbleDir = "tests" / "nimble" / "dependencyresolver" / "nimbleDir_unsupported"
   pkgsDir = nimbleDir / "pkgs2"
 
 let pkgA: PkgTuple = ("packageA", parseVersionRange(">= 0.1"))

tests/nimble/dependencyresolver/test_getpath_url.nim

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
@@ -9,11 +9,11 @@ discard """
 '''
 """
 
-import os, unittest
-import nimbs/dependencyresolver, nimbs/options, nimbs/version
+import std/[os, unittest]
+import nimbs/[dependencyresolver, options, version]
 
 const
-  nimbleDir = "tests" / "dependencyresolver" / "nimbleDir"
+  nimbleDir = "tests" / "nimble" / "dependencyresolver" / "nimbleDir"
   pkgsDir = nimbleDir / "pkgs2"
 
 let

tests/nimble/dependencyresolver/test_parserequires.nim

@@ -1,7 +1,7 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
-import nimbs/dependencyresolver, nimbs/version
+import nimbs/[dependencyresolver, version]
 
 assert parseRequires("nim >= 1.0") == ("nim", parseVersionRange(">= 1.0"))
 assert parseRequires("packageA") == ("packageA", VersionRange(kind: verAny))

tests/nimble/nimbleexecutor/test_notasks.nim

@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
+# SPDX-License-Identifier: BSD-3-Clause
+
+import std/os
+import nimbs/[nimbleexecutor, options]
+
+var opts = Options()
+opts.setNimBin
+
+const nimbleFile = "tests" / "nimble" / "nimbleexecutor" / "blank.nimble"
+
+assert nimbleFile.getTasks(opts) == @[]

tests/nimble/nimbleexecutor/test_tasks.nim

@@ -1,13 +1,13 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
-import os, std/tempfiles
-import nimbs/nimbleexecutor, nimbs/options
+import std/[os, tempfiles]
+import nimbs/[nimbleexecutor, options]
 
 var opts = Options()
 opts.setNimBin
 
-const nimbleFile = "tests" / "nimbleexecutor" / "nimble.nimble"
+const nimbleFile = "tests" / "nimble" / "nimbleexecutor" / "nimble.nimble"
 
 let nimsFile = genTempPath("nimscript_", ".nims")
 copyFile(nimbleFile, nimsFile)

tests/nimble/nimbleexecutor/test_tojsonstring.nim

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
@@ -10,7 +10,7 @@ discard """
 import std/[os, tempfiles]
 import nimbs/[common, nimbleexecutor, options, querytoolscript]
 
-const nimbleFile = "tests" / "nimbleexecutor" / "nimble.nimble"
+const nimbleFile = "tests" / "nimble" / "nimbleexecutor" / "nimble.nimble"
 
 let tempDir = createTempDir("nimbustest_", "")
 let queryTool = open(tempDir / queryToolFileName, fmWrite)

tests/nimble/packageinfo/test_findnimble.nim

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
+# SPDX-License-Identifier: BSD-3-Clause
+
+import std/os
+import nimbs/packageinfo
+
+const dir = "tests" / "nimble" / "packageinfo" / "1nimble"
+
+assert findNimbleFile(dir) == dir / "file.nimble"

tests/nimble/packageinfo/test_findtwonimble.nim

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
@@ -6,9 +6,9 @@ discard """
   outputsub: "Only one .nimble file should be present in"
 """
 
-import os
+import std/os
 import nimbs/packageinfo
 
-const dir = "tests" / "packageinfo" / "2nimble"
+const dir = "tests" / "nimble" / "packageinfo" / "2nimble"
 
 discard findNimbleFile(dir)

tests/nimble/packageinfo/test_findzeronimble.nim

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
 discard """
@@ -6,9 +6,9 @@ discard """
   outputsub: "Could not find a file with a .nimble extension inside the specified directory:"
 """
 
-import os
+import std/os
 import nimbs/packageinfo
 
-const dir = "tests" / "packageinfo" / "0nimble"
+const dir = "tests" / "nimble" / "packageinfo" / "0nimble"
 
 discard findNimbleFile(dir)

tests/nimble/packageinfo/test_getinstallfiles_binary.nim

@@ -1,10 +1,10 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
-import algorithm, os
-import nimbs/options, nimbs/packageinfo
+import std/[algorithm, os]
+import nimbs/[options, packageinfo]
 
-const sourceDir = "tests" / "packageinfo" / "binary"
+const sourceDir = "tests" / "nimble" / "packageinfo" / "binary"
 
 let
   opts = Options(sourceDir: sourceDir)

tests/nimble/packageinfo/test_getinstallfiles_source.nim

@@ -1,10 +1,10 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
-import algorithm, os
-import nimbs/options, nimbs/packageinfo
+import std/[algorithm, os]
+import nimbs/[options, packageinfo]
 
-const sourceDir = "tests" / "packageinfo" / "source"
+const sourceDir = "tests" / "nimble" / "packageinfo" / "source"
 
 let
   opts = Options(sourceDir: sourceDir)

tests/nimble/packageinfo/test_getinstallfiles_source_whitelist.nim

@@ -1,10 +1,10 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
 # SPDX-License-Identifier: BSD-3-Clause
 
-import algorithm, os
-import nimbs/options, nimbs/packageinfo
+import std/[algorithm, os]
+import nimbs/[options, packageinfo]
 
-const sourceDir = "tests" / "packageinfo" / "source-whitelist"
+const sourceDir = "tests" / "nimble" / "packageinfo" / "source-whitelist"
 
 let
   opts = Options(sourceDir: sourceDir)

tests/nimble/packagemetadata/test_geturl.nim

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2022-2023 Anna <cyber@sysrq.in>
+# SPDX-License-Identifier: BSD-3-Clause
+
+import std/os
+import nimbs/packagemetadata
+
+const packageDir = "tests" / "nimble" / "packagemetadata" / "packageA-0.1.0"
+
+assert getUrl(packageDir) == "https://example.com"

tests/nimbleexecutor/test_notasks.nim

@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
-# SPDX-License-Identifier: BSD-3-Clause
-
-import os
-import nimbs/nimbleexecutor, nimbs/options
-
-var opts = Options()
-opts.setNimBin
-
-const nimbleFile = "tests" / "nimbleexecutor" / "blank.nimble"
-
-assert nimbleFile.getTasks(opts) == @[]

tests/packageinfo/test_findnimble.nim

@@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
-# SPDX-License-Identifier: BSD-3-Clause
-
-import os
-import nimbs/packageinfo
-
-const dir = "tests" / "packageinfo" / "1nimble"
-
-assert findNimbleFile(dir) == dir / "file.nimble"

tests/packagemetadata/test_geturl.nim

@@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
-# SPDX-License-Identifier: BSD-3-Clause
-
-import os
-import nimbs/packagemetadata
-
-const packageDir = "tests" / "packagemetadata" / "packageA-0.1.0"
-
-assert getUrl(packageDir) == "https://example.com"

tests/querytoolscript/test.nim

@@ -1,27 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Anna <cyber@sysrq.in>
-# SPDX-License-Identifier: BSD-3-Clause
-
-discard """
-  output: '''#!/usr/bin/env nim e
-
-import json
-
-echo %{
-  "packageName": %packageName,
-  "version": %version,
-  "requiresData": %requiresData,
-  "bin": %bin,
-  "skipDirs": %skipDirs,
-  "skipFiles": %skipFiles,
-  "skipExt": %skipExt,
-  "installDirs": %installDirs,
-  "installFiles": %installFiles,
-  "installExt": %installExt,
-  "srcDir": %srcDir,
-}
-'''
-"""
-
-import nimbs/querytoolscript
-
-stdout.writeQueryToolScript()

tests/scripts/testerscript/test.nim

@@ -18,10 +18,6 @@ const
   nimCache = @build dir/nimcache@.quoteShell
 
 withDir(@tests/testerscript@):
-  for test in listFiles("tests"):
-    if test.startsWith("tests/t") and test.endsWith(".nim"):
-      echo "-- Running test ", test, "..."
-      exec(fmt"{nimBin} --hints:off {nimFlags} r --nimcache:{nimCacheDir} {test.quoteShell}")
 """.replace("@", '"'.repeat(3))
 
 let opts = Options(sourceDir: "tests" / "testerscript",
@@ -29,11 +25,11 @@ let opts = Options(sourceDir: "tests" / "testerscript",
                    nim: "/usr/bin/nim",
                    passNimFlags: @["-d:release", "--threads:on"])
 
-let (cfile, path) = createTempFile("testerscript_", ".nim")
+let (cfile, path) = createTempFile("testerscript_", ".nims")
 cfile.writeTesterScript(opts)
 
 cfile.setFilePos(0)
-assert cfile.readAll() == outputExpected
+assert cfile.readAll.startsWith(outputExpected)
 
 cfile.close()
 removeFile(path)