matchers: containAll renders bean details when compared against maps (#1443)

Author: MykolaGolubyev

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

@@ -16,6 +16,7 @@
 
 package org.testingisdocumenting.webtau.expectation.contain;
 
+import org.testingisdocumenting.webtau.data.converters.ValueConverter;
 import org.testingisdocumenting.webtau.data.render.DataRenderers;
 import org.testingisdocumenting.webtau.data.ValuePath;
 import org.testingisdocumenting.webtau.expectation.ExpectedValuesAware;
@@ -33,13 +34,17 @@
 public class ContainAllMatcher implements ValueMatcher, ExpectedValuesAware {
     private ContainAnalyzer containAnalyzer;
     private final Collection<Object> expectedList;
-    private Boolean isNegative;
     private List<Object> expectedThatFailContains;
 
     public ContainAllMatcher(Collection<Object> expected) {
         this.expectedList = expected;
     }
 
+    @Override
+    public ValueConverter valueConverter() {
+        return containAnalyzer.createValueConverter();
+    }
+
     @Override
     public Set<ValuePath> matchedPaths() {
         return containAnalyzer.generateMatchPaths();
@@ -52,6 +57,7 @@ public Set<ValuePath> mismatchedPaths() {
 
     @Override
     public TokenizedMessage matchingTokenizedMessage(ValuePath actualPath, Object actual) {
+        containAnalyzer = ContainAnalyzer.containAnalyzer();
         return tokenizedMessage().matcher("to contain all").valueFirstLinesOnly(expectedList);
     }
 
@@ -67,10 +73,8 @@ public TokenizedMessage mismatchedTokenizedMessage(ValuePath actualPath, Object
 
     @Override
     public boolean matches(ValuePath actualPath, Object actual) {
-        containAnalyzer = ContainAnalyzer.containAnalyzer();
-        isNegative = false;
-
         expectedThatFailContains = new ArrayList<>();
+        containAnalyzer.resetReportData();
 
         for (Object oneOfExpected : expectedList) {
             boolean expectedContains = containAnalyzer.contains(actualPath, actual, oneOfExpected);
@@ -84,6 +88,7 @@ public boolean matches(ValuePath actualPath, Object actual) {
 
     @Override
     public TokenizedMessage negativeMatchingTokenizedMessage(ValuePath actualPath, Object actual) {
+        containAnalyzer = ContainAnalyzer.containAnalyzer();
         return tokenizedMessage().matcher("to not contain all").valueFirstLinesOnly(expectedList);
     }
 
@@ -99,8 +104,7 @@ public TokenizedMessage negativeMismatchedTokenizedMessage(ValuePath actualPath,
 
     @Override
     public boolean negativeMatches(ValuePath actualPath, Object actual) {
-        containAnalyzer = ContainAnalyzer.containAnalyzer();
-        isNegative = true;
+        containAnalyzer.resetReportData();
 
         boolean allContains = true;
         for (Object oneOfExpected : expectedList) {

webtau-core/src/test/groovy/org/testingisdocumenting/webtau/expectation/contain/ContainAllMatcherTest.groovy

@@ -17,8 +17,11 @@
 package org.testingisdocumenting.webtau.expectation.contain
 
 import org.junit.Test
+import org.testingisdocumenting.webtau.Account
+import org.testingisdocumenting.webtau.Address
 
 import static org.testingisdocumenting.webtau.Matchers.*
+import static org.testingisdocumenting.webtau.WebTauCore.map
 import static org.testingisdocumenting.webtau.testutils.TestConsoleOutput.runExpectExceptionAndValidateOutput
 
 class ContainAllMatcherTest {
@@ -60,4 +63,41 @@ class ContainAllMatcherTest {
     void "containing all alias"() {
         actual([['a'], ['b'], ['c', 'd', 'e']]).should(contain(containingAll('d', 'e')))
     }
+
+    @Test
+    void "list of beans contain all maps prints converted beans"() {
+        def address = new Address("city", "zipcode")
+        def ac1 = new Account("id1", "name1", "d1", address)
+        def ac2 = new Account("id2", "name2", "d2", address)
+        def ac3 = new Account("id3", "name3", "d3", address)
+        def beans = [ac1, ac2, ac3]
+
+        runExpectExceptionAndValidateOutput(AssertionError, 'X failed expecting [value] to contain all [{"id": "id1", "name": "name2"}, {"id": "id2", "name": "name2"}]:\n' +
+                '    no matches found for: [{"id": "id1", "name": "name2"}] (Xms)\n' +
+                '  \n' +
+                '  [\n' +
+                '    {\n' +
+                '      "address": org.testingisdocumenting.webtau.Address@<ref>,\n' +
+                '      "description": "d1",\n' +
+                '      "id": "id1",\n' +
+                '      "name": "name1"\n' +
+                '    },\n' +
+                '    {\n' +
+                '      "address": org.testingisdocumenting.webtau.Address@<ref>,\n' +
+                '      "description": "d2",\n' +
+                '      "id": "id2",\n' +
+                '      "name": "name2"\n' +
+                '    },\n' +
+                '    {\n' +
+                '      "address": org.testingisdocumenting.webtau.Address@<ref>,\n' +
+                '      "description": "d3",\n' +
+                '      "id": "id3",\n' +
+                '      "name": "name3"\n' +
+                '    }\n' +
+                '  ]') {
+            actual(beans).should(containAll(
+                    map("id", "id1", "name", "name2"),
+                    map("id", "id2", "name", "name2")))
+        }
+    }
 }

webtau-docs/znai/release-notes/1.52/fix-2023-04-17-contains-all-matcher-value-converter.md

@@ -0,0 +1 @@
+* Fix: `containsAll` [Matcher](matchers/introduction) now properly renders java bean details when compared against multiple maps