matchers: anyOf renders bean details when compared against maps (#1442)

Author: MykolaGolubyev

webtau-cli/src/main/java/org/testingisdocumenting/webtau/cli/CliCommand.java

@@ -18,12 +18,11 @@
 
 import org.testingisdocumenting.webtau.cli.expectation.CliValidationExitCodeOutputHandler;
 import org.testingisdocumenting.webtau.cli.expectation.CliValidationOutputOnlyHandler;
-import org.testingisdocumenting.webtau.data.ResourceNameAware;
 
 import java.nio.file.Path;
 import java.util.function.Supplier;
 
-public class CliCommand implements ResourceNameAware {
+public class CliCommand {
     private Supplier<Object> commandBaseSupplier;
     private String commandBase;
 
@@ -147,9 +146,4 @@ private synchronized String fullCommand(String args) {
                 commandBase:
                 commandBase + " " + args;
     }
-
-    @Override
-    public String resourceName() {
-        return commandBase;
-    }
 }

webtau-core/src/main/java/org/testingisdocumenting/webtau/data/ResourceNameAware.java

@@ -17,6 +17,7 @@
 package org.testingisdocumenting.webtau.expectation.equality;
 
 import org.testingisdocumenting.webtau.data.ValuePath;
+import org.testingisdocumenting.webtau.data.converters.ValueConverter;
 import org.testingisdocumenting.webtau.expectation.ExpectedValuesAware;
 import org.testingisdocumenting.webtau.expectation.ValueMatcher;
 import org.testingisdocumenting.webtau.reporter.TokenizedMessage;
@@ -34,13 +35,19 @@ public AnyOfMatcher(Collection<Object> expected) {
         this.expectedList = expected;
     }
 
+    @Override
+    public ValueConverter valueConverter() {
+        return comparator.createValueConverter();
+    }
+
     @Override
     public Stream<Object> expectedValues() {
         return expectedList.stream();
     }
 
     @Override
     public TokenizedMessage matchingTokenizedMessage(ValuePath actualPath, Object actual) {
+        comparator = CompareToComparator.comparator();
         return tokenizedMessage().matcher("to match any of").valueFirstLinesOnly(expectedList);
     }
 
@@ -58,7 +65,7 @@ public TokenizedMessage mismatchedTokenizedMessage(ValuePath actualPath, Object
     public boolean matches(ValuePath actualPath, Object actual) {
         boolean result = false;
 
-        comparator = CompareToComparator.comparator();
+        comparator.resetReportData();
         for (Object expected : expectedList) {
             result = result || comparator.compareIsEqual(actualPath, actual, expected);
         }
@@ -68,6 +75,7 @@ public boolean matches(ValuePath actualPath, Object actual) {
 
     @Override
     public TokenizedMessage negativeMatchingTokenizedMessage(ValuePath actualPath, Object actual) {
+        comparator = CompareToComparator.comparator();
         return tokenizedMessage().matcher("to not match any of").valueFirstLinesOnly(expectedList);
     }
 
@@ -85,7 +93,7 @@ public TokenizedMessage negativeMismatchedTokenizedMessage(ValuePath actualPath,
     public boolean negativeMatches(ValuePath actualPath, Object actual) {
         boolean result = true;
 
-        comparator = CompareToComparator.comparator();
+        comparator.resetReportData();
         for (Object expected : expectedList) {
             result = result && comparator.compareIsNotEqual(actualPath, actual, expected);
         }

webtau-core/src/main/java/org/testingisdocumenting/webtau/expectation/equality/AnyOfMatcher.java

@@ -17,8 +17,8 @@
 package org.testingisdocumenting.webtau.data.converters
 
 import org.junit.Test
-import org.testingisdocumenting.webtau.data.Account
-import org.testingisdocumenting.webtau.data.GameConfig
+import org.example.domain.Account
+import org.example.domain.GameConfig
 import org.testingisdocumenting.webtau.expectation.equality.handlers.SmallBean
 
 import java.nio.file.Paths

webtau-core/src/test/groovy/org/testingisdocumenting/webtau/data/converters/ObjectPropertiesTest.groovy

@@ -17,14 +17,14 @@
 package org.testingisdocumenting.webtau.expectation.equality
 
 import org.junit.Test
-import org.testingisdocumenting.webtau.data.ValuePath
+import org.example.domain.Account
+
+import static org.testingisdocumenting.webtau.WebTauCore.*
+import org.testingisdocumenting.webtau.data.DummyLiveValue
 
-import static org.testingisdocumenting.webtau.Matchers.*
 import static org.testingisdocumenting.webtau.testutils.TestConsoleOutput.*
 
 class AnyOfMatcherTest {
-    private final ValuePath actualPath = new ValuePath("value")
-
     @Test
     void "positive match"() {
         runAndValidateOutput('. [value] matches any of [3, 10, <greater than 8>, 10] (Xms)') {
@@ -60,4 +60,29 @@ class AnyOfMatcherTest {
             actual(10).shouldNotBe(anyOf(3, 11, lessThan(12)))
         }
     }
+
+    @Test
+    void "wait on live value"() {
+        def liveValue = new DummyLiveValue([1, 10, 100, 1000, 2000])
+        actual(liveValue).waitToBe(anyOf(100, 1000))
+    }
+
+    @Test
+    void "renders converted java bean in case of mismatch"() {
+        def bean = new Account("id1", "name1", 100)
+
+        runExpectExceptionAndValidateOutput(AssertionError, 'X failed expecting [value] to match any of [{"id": "id1", "name": "name2"}, {"id": "id1", "name": "name2"}]:\n' +
+                '    [value].name:  actual: "name1" <java.lang.String>\n' +
+                '                 expected: "name2" <java.lang.String>\n' +
+                '                                ^\n' +
+                '    [value].name:  actual: "name1" <java.lang.String>\n' +
+                '                 expected: "name2" <java.lang.String>\n' +
+                '                                ^ (Xms)\n' +
+                '  \n' +
+                '  {"id": "id1", "money": org.example.domain.Money@<ref>, "name": "name1"}') {
+            actual(bean).shouldBe(anyOf(
+                    map("id", "id1", "name", "name2"),
+                    map("id", "id1", "name", "name2")))
+        }
+    }
 }

webtau-core/src/test/groovy/org/testingisdocumenting/webtau/expectation/equality/AnyOfMatcherTest.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.testingisdocumenting.webtau.data;
+package org.example.domain;
 
 public class Account {
     private final String id;

webtau-core/src/main/java/org/testingisdocumenting/webtau/data/Account.java renamed to webtau-core/src/test/java/org/example/domain/Account.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.testingisdocumenting.webtau.data;
+package org.example.domain;
 
 public class GameAchievement {
     private final String id;

webtau-core/src/main/java/org/testingisdocumenting/webtau/data/GameAchievement.java renamed to webtau-core/src/test/java/org/example/domain/GameAchievement.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.testingisdocumenting.webtau.data;
+package org.example.domain;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

webtau-core/src/main/java/org/testingisdocumenting/webtau/data/GameConfig.java renamed to webtau-core/src/test/java/org/example/domain/GameConfig.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.testingisdocumenting.webtau.data;
+package org.example.domain;
 
 public class Money {
     private final long dollars;

webtau-core/src/main/java/org/testingisdocumenting/webtau/data/Money.java renamed to webtau-core/src/test/java/org/example/domain/Money.java

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