improves stringand float comparisons and assert not invalid message (#…

…142)

framework/src/source/BaseTestSuite.bs

@@ -368,7 +368,7 @@ namespace rooibos
         if value = invalid
           if msg = ""
             expr_as_string = Rooibos.Common.asString(value)
-            msg = expr_as_string + " = Invalid"
+            msg = "Expected value, got invalid"
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
           return false

framework/src/source/CommonUtils.bs

@@ -595,30 +595,21 @@ namespace rooibos.Common
       return false
     end if
 
-    if val1Type = "roString" or val1Type = "String"
-      Value1 = Rooibos.Common.asString(Value1)
-    else
-      Value1 = box(Value1)
-    end if
-
-    if val2Type = "roString" or val2Type = "String"
-      Value2 = Rooibos.Common.asString(Value2)
-    else
-      Value2 = box(Value2)
-    end if
+    v1IsString = val1Type = "roString" or val1Type = "String"
+    v2IsString = val2Type = "roString" or val2Type = "String"
     'update types after boxing
     val1Type = type(Value1)
     val2Type = type(Value2)
 
 
     'Upcast int to float, if other is float
     if val1Type = "roFloat" and val2Type = "roInt"
-      Value2 = box(Cdbl(Value2))
+      Value2 = cdbl(Value2)
     else if val2Type = "roFloat" and val1Type = "roInt"
-      Value1 = box(Cdbl(Value1))
+      Value1 = cdbl(Value1)
     end if
 
-    if val1Type <> val2Type
+    if val1Type <> val2Type and v1IsString <> v2IsString
       return false
     else
       valtype = val1Type

tests/bsconfig.json

@@ -1,28 +1,22 @@
 {
   "rootDir": "src",
-  "files": [
-    "manifest",
-    "source/**/*.*",
-    "components/**/*.*"
-  ],
+  "files": ["manifest", "source/**/*.*", "components/**/*.*"],
   "autoImportComponentScript": true,
   "createPackage": false,
   "stagingFolderPath": "build",
   "diagnosticFilters": [
     {
       "src": "**/roku_modules/**/*.*",
-      "codes": [
-        1107,
-        1009
-      ]
+      "codes": [1107, 1009]
     }
   ],
-  "plugins": [
-    "../bsc-plugin/dist/plugin.js"
-  ],
+  "plugins": ["../bsc-plugin/dist/plugin.js"],
   "rooibos": {
     "showOnlyFailures": true,
-    "lineWidth": 70
+    "catchCrashes": true,
+    "lineWidth": 70,
+    "failFast": false,
+    "sendHomeOnFinish": false
   },
   "sourceMap": true
-}
+}