match each will now fail if empty array #2364

karatelabs · Aug 9, 2023 · 6a3f4aa · 6a3f4aa
1 parent c94b9e5
commit 6a3f4aa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/karate-core/src/main/java/com/intuit/karate/MatchOperation.java b/karate-core/src/main/java/com/intuit/karate/MatchOperation.java
@@ -159,7 +159,10 @@ boolean execute() {
             case EACH_CONTAINS_DEEP:
                 if (actual.isList()) {
                     List list = actual.getValue();
-                    Match.Type nestedMatchType = fromMatchEach();
+                    if (list.isEmpty()) {
+                        return fail("match each failed, empty array / list");
+                    }
+                    Match.Type nestedMatchType = fromMatchEach();                    
                     int count = list.size();
                     for (int i = 0; i < count; i++) {
                         Object o = list.get(i);

diff --git a/karate-core/src/test/java/com/intuit/karate/MatchTest.java b/karate-core/src/test/java/com/intuit/karate/MatchTest.java
@@ -233,6 +233,12 @@ void testEach() {
         match("[{ a: 1 }, { a: 2 }]", EACH_EQUALS, "#object");
         match("[{ a: 1 }, { a: 2 }]", EACH_EQUALS, "{ a: '#number' }");
     }
+
+    @Test
+    void testEachEmpty() {
+        match("[]", EACH_EQUALS, "#number", FAILS);
+        message("match each failed, empty array / list");
+    }
 
     @Test
     void testEachWithMagicVariables() {

diff --git a/karate-core/src/test/java/com/intuit/karate/core/ScenarioRuntimeTest.java b/karate-core/src/test/java/com/intuit/karate/core/ScenarioRuntimeTest.java
@@ -764,7 +764,6 @@ void testMatchSchemaArray() {
         run(
                 "def temp = { foo: '#string' }",
                 "def schema = '#[] temp'",
-                "match [] == schema",
                 "match [{ foo: 'bar' }] == schema"
         );
     }

diff --git a/karate-core/src/test/java/com/intuit/karate/core/schema-like.feature b/karate-core/src/test/java/com/intuit/karate/core/schema-like.feature
@@ -142,9 +142,7 @@ Scenario: complex nested arrays
 {
   "foo": {
     "bars": [
-      { "barOne": "dc", "barTwos": [] },
       { "barOne": "dc", "barTwos": [{ title: 'blah' }] },
-      { "barOne": "dc", "barTwos": [{ title: 'blah' }], barThrees: [] },
       { "barOne": "dc", "barTwos": [{ title: 'blah' }], barThrees: [{ num: 1 }] }
     ]
   }

diff --git a/karate-core/src/test/java/com/intuit/karate/core/schema-read.feature b/karate-core/src/test/java/com/intuit/karate/core/schema-read.feature
@@ -3,6 +3,4 @@ Feature:
 Scenario:
 * def schema = "#[] read('schema-read.json')"
 * print schema
-* match [] == schema
-* match [{ foo: 'bar', items: [] }] == schema
 * match [{ foo: 'bar', items: [{ a: 1 }] }] == schema