http: fix contain handler marking values as failed

Author: MykolaGolubyev

webtau-core/src/main/java/org/testingisdocumenting/webtau/expectation/contain/ContainAnalyzer.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2021 webtau maintainers
  * Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +19,7 @@
 
 import org.testingisdocumenting.webtau.data.render.DataRenderers;
 import org.testingisdocumenting.webtau.expectation.ActualPath;
+import org.testingisdocumenting.webtau.expectation.contain.handlers.IterableContainHandler;
 import org.testingisdocumenting.webtau.expectation.contain.handlers.NullContainHandler;
 import org.testingisdocumenting.webtau.expectation.equality.ActualPathMessage;
 import org.testingisdocumenting.webtau.utils.ServiceLoaderUtils;
@@ -30,7 +32,7 @@
 import static java.util.stream.Collectors.joining;
 
 public class ContainAnalyzer {
-    private static List<ContainHandler> handlers = discoverHandlers();
+    private static final List<ContainHandler> handlers = discoverHandlers();
 
     private final List<ActualPathMessage> mismatches;
 
@@ -85,6 +87,7 @@ private static List<ContainHandler> discoverHandlers() {
         List<ContainHandler> result = new ArrayList<>();
         result.add(new NullContainHandler());
         result.addAll(ServiceLoaderUtils.load(ContainHandler.class));
+        result.add(new IterableContainHandler());
 
         return result;
     }

webtau-core/src/main/resources/META-INF/services/org.testingisdocumenting.webtau.expectation.contain.ContainHandler

@@ -14,5 +14,4 @@
 # limitations under the License.
 #
 
-org.testingisdocumenting.webtau.expectation.contain.handlers.StringContainHandler
-org.testingisdocumenting.webtau.expectation.contain.handlers.IterableContainHandler
+org.testingisdocumenting.webtau.expectation.contain.handlers.StringContainHandler

webtau-http-groovy/src/test/groovy/org/testingisdocumenting/webtau/http/HttpGroovyTest.groovy

@@ -18,6 +18,7 @@
 package org.testingisdocumenting.webtau.http
 
 import org.junit.Test
+import org.testingisdocumenting.webtau.data.traceable.CheckLevel
 import org.testingisdocumenting.webtau.http.datanode.DataNode
 import org.testingisdocumenting.webtau.http.datanode.GroovyDataNode
 import org.testingisdocumenting.webtau.http.testserver.TestServerResponse
@@ -527,6 +528,18 @@ class HttpGroovyTest extends HttpTestBase {
         }
     }
 
+    @Test
+    void "list contain check level"() {
+        http.get("/end-point") {
+            list.should contain(2)
+        }
+
+        def body = http.lastValidationResult.bodyNode
+        body.get("list[0]").traceableValue.checkLevel.should == CheckLevel.None
+        body.get("list[1]").traceableValue.checkLevel.should == CheckLevel.ExplicitPassed
+        body.get("list[2]").traceableValue.checkLevel.should == CheckLevel.None
+    }
+
     @Test
     void "groovy find on list"() {
         def found = http.get("/end-point") {

webtau-http/src/test/groovy/org/testingisdocumenting/webtau/http/datanode/DataNodeListContainHandlerTest.groovy

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2021 webtau maintainers
  * Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,15 +26,32 @@ import static org.testingisdocumenting.webtau.data.traceable.CheckLevel.FuzzyPas
 import static org.testingisdocumenting.webtau.data.traceable.CheckLevel.None
 
 class DataNodeListContainHandlerTest {
-    def listOfNames = [
+    def listOfFirstNames = ['FN0', 'FN1', 'FN2', 'FN3']
+
+    def listOfFullNames = [
         [firstName: 'FN0', lastName: 'LN0'],
         [firstName: 'FN1', lastName: 'LN1'],
         [firstName: 'FN2', lastName: 'LN2'],
         [firstName: 'FN3', lastName: 'LN3']]
 
+
+    @Test
+    void "should mark single containing items with passed status and not change other item statuses"() {
+        def dataNode = DataNodeBuilder.fromList(new DataNodeId('body'), listOfFirstNames)
+
+        dataNode.get(0).getTraceableValue().updateCheckLevel(FuzzyPassed)
+
+        dataNode.should contain('FN2')
+
+        dataNode.get(0).getTraceableValue().checkLevel.should == FuzzyPassed
+        dataNode.get(1).getTraceableValue().checkLevel.should == None
+        dataNode.get(2).getTraceableValue().checkLevel.should == ExplicitPassed
+        dataNode.get(3).getTraceableValue().checkLevel.should == None
+    }
+
     @Test
     void "should mark containing items with passed status and not change other item statuses"() {
-        def dataNode = DataNodeBuilder.fromList(new DataNodeId("body"), listOfNames)
+        def dataNode = DataNodeBuilder.fromList(new DataNodeId('body'), listOfFullNames)
 
         dataNode.get(0).get('firstName').getTraceableValue().updateCheckLevel(FuzzyPassed)
 
@@ -49,9 +67,27 @@ class DataNodeListContainHandlerTest {
         dataNode.get(3).get('lastName').getTraceableValue().checkLevel.should == ExplicitPassed
     }
 
+    @Test
+    void "should mark containing items with passed status and not change other item statuses when compare derived items"() {
+        def dataNode = DataNodeBuilder.fromList(new DataNodeId('body'), listOfFullNames)
+
+        dataNode.get(0).get('firstName').getTraceableValue().updateCheckLevel(FuzzyPassed)
+
+        dataNode.get("firstName").should contain('FN3')
+
+        dataNode.get(0).get('firstName').getTraceableValue().checkLevel.should == FuzzyPassed
+        dataNode.get(0).get('lastName').getTraceableValue().checkLevel.should == None
+        dataNode.get(1).get('firstName').getTraceableValue().checkLevel.should == None
+        dataNode.get(1).get('lastName').getTraceableValue().checkLevel.should == None
+        dataNode.get(2).get('firstName').getTraceableValue().checkLevel.should == None
+        dataNode.get(2).get('lastName').getTraceableValue().checkLevel.should == None
+        dataNode.get(3).get('firstName').getTraceableValue().checkLevel.should == ExplicitPassed
+        dataNode.get(3).get('lastName').getTraceableValue().checkLevel.should == None
+    }
+
     @Test
     void "should mark all items as failed when item is not present"() {
-        def dataNode = DataNodeBuilder.fromList(new DataNodeId("body"), listOfNames)
+        def dataNode = DataNodeBuilder.fromList(new DataNodeId('body'), listOfFullNames)
 
         code {
             dataNode.should contain([firstName: 'FN8', lastName: 'LN8'])
@@ -63,15 +99,15 @@ class DataNodeListContainHandlerTest {
 
     @Test
     void "should mark all items as fuzzy passed when item is not present and should not be present"() {
-        def dataNode = DataNodeBuilder.fromList(new DataNodeId("body"), [1, 2, 3])
+        def dataNode = DataNodeBuilder.fromList(new DataNodeId('body'), [1, 2, 3])
         dataNode.shouldNot contain(8)
 
         dataNode.elements().collect { it.getTraceableValue().checkLevel }.should == [FuzzyPassed, FuzzyPassed, FuzzyPassed]
     }
 
     @Test
     void "should mark containing items as failed when when they should not be present"() {
-        def dataNode = DataNodeBuilder.fromList(new DataNodeId("body"), listOfNames)
+        def dataNode = DataNodeBuilder.fromList(new DataNodeId('body'), listOfFullNames)
 
         code {
             dataNode.shouldNot contain([firstName: 'FN2', lastName: 'LN2'])