Fixed tests, made Windows system branch

xmonader · Nov 10, 2021 · 5d7ec6d · 5d7ec6d
1 parent 403e5a7
commit 5d7ec6d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/nimassets.nim b/src/nimassets.nim
@@ -1,4 +1,5 @@
 import
+  distros,
   os,
   strformat,
   strutils,
@@ -31,7 +32,10 @@ proc handleFile(path: string): string {.thread.} =
   var val, valString: string
   val = readFile(path).encode()
   valString = "\"\"\"" & val & "\"\"\""
-  result = &"""assets["{escape(path, prefix="", suffix="")}"] = {valString}""" & "\n\n"
+  if detectOs(Windows):
+    result = &"""assets["{escape(path, prefix="", suffix="")}"] = {valString}""" & "\n\n"
+  else:
+    result = &"""assets["{path}"] = {valString}""" & "\n\n"
 
 proc generateDirAssetsSimple*(dir: string): string =
   for path in expandTilde(dir).walkDirRec():

diff --git a/tests/test.nim b/tests/test.nim
@@ -1,14 +1,23 @@
 import
+  distros,
   unittest,
   assetfile, # will be generated by the 'nimble test' task
   assetfile_fast # will be generated by the 'nimble test' task
 
 suite "Nimassets Tests":
   test "Can Obtain Assets (normal)":
-    check assetfile.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt")
-    check assetfile.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt")
+    if detectOs(Windows):
+      check assetfile.getAsset("tests\\testassets\\asset1.txt") == readFile("tests\\testassets\\asset1.txt")
+      check assetfile.getAsset("tests\\testassets\\asset2.txt") == readFile("tests\\testassets\\asset2.txt")
+    else:
+      check assetfile.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt")
+      check assetfile.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt")  
 
   test "Can Obtain Assets (fast)":
-    check assetfile_fast.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt")
-    check assetfile_fast.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt")
+    if detectOs(Windows):
+      check assetfile_fast.getAsset("tests\\testassets\\asset1.txt") == readFile("tests\\testassets\\asset1.txt")
+      check assetfile_fast.getAsset("tests\\testassets\\asset2.txt") == readFile("tests\\testassets\\asset2.txt")
+    else:
+      check assetfile_fast.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt")
+      check assetfile_fast.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt")