rooibos-roku 4.5.1 → 4.5.2

package/dist/lib/framework/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

package/dist/lib/framework/CommonUtils.bs

@@ -595,17 +595,8 @@ 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)
@@ -613,12 +604,12 @@ namespace rooibos.Common
 
     '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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rooibos-roku",
-    "version": "4.5.1",
+    "version": "4.5.2",
     "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps - roku brighterscript plugin",
     "repository": {
         "type": "git",