rooibos-roku 5.3.4 → 5.3.5

package/dist/lib/framework/BaseTestSuite.bs

@@ -1176,10 +1176,17 @@ namespace rooibos
       end if
       try
         if type(node) = "roSGNode"
-          if node.getChildCount() <> count
-            msg = "node items count <> " + Rooibos.Common.asString(count) + ". Received " + Rooibos.Common.asString(node.getChildCount())
-            m.currentResult.fail(msg, m.currentAssertLineNumber)
-            return false
+          if node.isSubType("mc_Node")
+            if node.isSubType("mc_Node")
+              childCount = node.length
+            else
+              childCount = node.getChildCount()
+            end if
+            if childCount <> count
+              msg = "node items count <> " + Rooibos.Common.asString(count) + ". Received " + Rooibos.Common.asString(childCount)
+              m.currentResult.fail(msg, m.currentAssertLineNumber)
+              return false
+            end if
           end if
         else
           msg = "Input value is not an node."
@@ -1212,7 +1219,12 @@ namespace rooibos
       end if
       try
         if type(node) = "roSGNode"
-          if node.getChildCount() = count
+          if node.isSubType("mc_Node")
+            childCount = node.length
+          else
+            childCount = node.getChildCount()
+          end if
+          if childCount = count
             msg = "node items count = " + Rooibos.Common.asString(count) + "."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
@@ -1247,7 +1259,12 @@ namespace rooibos
       end if
       try
         if type(node) = "roSGNode"
-          if node.getChildCount() > 0
+          if node.isSubType("mc_Node")
+            childCount = node.length
+          else
+            childCount = node.getChildCount()
+          end if
+          if childCount > 0
             msg = "node is not empty."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
@@ -1350,10 +1367,17 @@ namespace rooibos
             msg = "Node doesn't have the '" + Rooibos.Common.asString(value, true) + "' value."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
-          else if node.getChildCount() <> 1
-            msg = "Node Contains speicified value; but other values as well"
-            m.currentResult.fail(msg, m.currentAssertLineNumber)
-            return false
+          else
+            if node.isSubType("mc_Node")
+              childCount = node.length
+            else
+              childCount = node.getChildCount()
+            end if
+            if childCount <> 1
+              msg = "Node Contains specified value; but other values as well"
+              m.currentResult.fail(msg, m.currentAssertLineNumber)
+              return false
+            end if
           end if
         else
           msg = "Input value is not an Node."

package/dist/lib/framework/CommonUtils.bs

@@ -570,12 +570,21 @@ namespace rooibos.Common
   '  */
   function findElementIndexInNode(node, value) as integer
     if type(node) = "roSGNode"
-      for i = 0 to node.getChildCount() - 1
-        compareValue = node.getChild(i)
-        if type(compareValue) = "roSGNode" and compareValue.isSameNode(value)
-          return i
-        end if
-      next
+      if node.isSubType("mc_Node")
+        for i = 0 to node.length - 1
+          compareValue = node@.getChild(i)
+          if type(compareValue) = "roSGNode" and compareValue.isSameNode(value)
+            return i
+          end if
+        end for
+      else
+        for i = 0 to node.getChildCount() - 1
+          compareValue = node.getChild(i)
+          if type(compareValue) = "roSGNode" and compareValue.isSameNode(value)
+            return i
+          end if
+        end for
+      end if
     end if
     return -1
   end function

package/package.json

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