Merge branch 'master' of github.com:georgejecook/rooibos

rokucommunity · May 24, 2022 · ebb1197 · ebb1197
2 parents 0ef4322 + fd728ce
commit ebb1197
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/src/source/BaseTestSuite.bs b/framework/src/source/BaseTestSuite.bs
@@ -900,7 +900,7 @@ namespace rooibos
           end if
         else if Rooibos.Common.isString(item)
           if Rooibos.Common.asString(item) <> ""
-            msg = "Input value is not empty."
+            msg = "String is not empty, contains: " + Rooibos.Common.asString(item, true)
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           end if

diff --git a/framework/src/source/CommonUtils.bs b/framework/src/source/CommonUtils.bs
@@ -305,13 +305,13 @@ namespace rooibos.Common
   '  */
   function asString(input, includeType = false) as string
     if Rooibos.Common.isValid(input) = false
+      return "INVALID"
+    else if Rooibos.Common.isString(input)
       if includeType
         return """" + input + """"
       else
         return input
       end if
-    else if Rooibos.Common.isString(input)
-      return """" + input + """"
     else if Rooibos.Common.isInteger(input) or Rooibos.Common.isLongInteger(input) or Rooibos.Common.isBoolean(input)
       if includeType
         return input.ToStr() + " (" + Rooibos.Common.getSafeType(input) + ")"