Fixes InaccessibleObjectException when printing errormessage on modulepath

Author: jqno

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Formatter.java

@@ -47,7 +47,7 @@ public static Formatter of(String message, Object... objects) {
     public String format() {
         String result = message;
         for (Object object : objects) {
-            String s = result.replaceFirst("%%", Matcher.quoteReplacement(stringify(object)));
+            String s = result.replaceFirst("%%", Matcher.quoteReplacement(stringify(object, true)));
             if (result.equals(s)) {
                 throw new IllegalStateException("Too many parameters");
             }
@@ -59,18 +59,19 @@ public String format() {
         return result;
     }
 
-    private String stringify(Object obj) {
+    private String stringify(Object obj, boolean recurse) {
         if (obj == null) {
             return "null";
         }
         try {
             return obj.toString();
         }
         catch (AbstractMethodError e) {
-            return stringifyByReflection(obj);
+            return recurse ? stringifyByReflection(obj) : objectToString(obj);
         }
         catch (Throwable e) {
-            return stringifyByReflection(obj) + "-throws " + e.getClass().getSimpleName() + "(" + e.getMessage() + ")";
+            var throwsClause = "-throws " + e.getClass().getSimpleName() + "(" + e.getMessage() + ")";
+            return (recurse ? stringifyByReflection(obj) : objectToString(obj)) + throwsClause;
         }
     }
 
@@ -91,7 +92,7 @@ private String stringifyByReflection(Object obj) {
             result.append("=");
 
             Object value = probe.getValue(obj);
-            result.append(stringify(value));
+            result.append(stringify(value, false));
         }
 
         if (!foundFields) {
@@ -101,4 +102,8 @@ private String stringifyByReflection(Object obj) {
         result.append("]");
         return result.toString();
     }
+
+    private String objectToString(Object obj) {
+        return obj.getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(obj));
+    }
 }

equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/util/FormatterTest.java

@@ -88,8 +88,8 @@ void oneThrowingContainerParameter() {
         ThrowingContainer tc = new ThrowingContainer(i.instantiate());
         Formatter f = Formatter.of("TC: %%", tc);
         String expected =
-                "TC: [ThrowingContainer t=[Throwing i=0 s=null]-throws IllegalStateException(msg)]-throws IllegalStateException(msg)";
-        assertThat(f.format()).contains(expected);
+                "TC: \\[ThrowingContainer t=Throwing@.*-throws IllegalStateException\\(msg\\)\\]-throws IllegalStateException\\(msg\\)";
+        assertThat(f.format()).matches(expected);
     }
 
     @Test
@@ -98,7 +98,7 @@ void oneAbstractContainerParameter() {
         AbstractContainer ac = new AbstractContainer(i.instantiate());
 
         Formatter f = Formatter.of("AC: %%", ac);
-        assertThat(f.format()).contains("AC: [AbstractContainer ad=[AbstractDelegation y=0]]");
+        assertThat(f.format()).matches("AC: \\[AbstractContainer ad=AbstractDelegation.*\\]");
     }
 
     @Test
@@ -107,10 +107,9 @@ void parameterWithMixOfVariousFields() {
         mix.throwing = new Throwing(42, "empty");
 
         Formatter f = Formatter.of("%%", mix);
-        String expected =
-                "[Mix i=42 s=null t=not null throwing=[Throwing i=42 s=empty]-throws IllegalStateException(msg)]"
-                        + "-throws UnsupportedOperationException(null)";
-        assertThat(f.format()).contains(expected);
+        String expected = "\\[Mix i=42 s=null t=not null throwing=Throwing@.*-throws IllegalStateException\\(msg\\)\\]"
+                + "-throws UnsupportedOperationException\\(null\\)";
+        assertThat(f.format()).matches(expected);
     }
 
     @Test

equalsverifier-test-jpms/src/test/java/it/MockitoWorksInTheModularWorldTest.java

@@ -1,10 +1,14 @@
 package it;
 
+import java.util.List;
+import java.util.Objects;
+
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.ScanOption;
 import nl.jqno.equalsverifier.jpms.model.*;
 import nl.jqno.equalsverifier.jpms.model.Records.RecordPoint;
 import nl.jqno.equalsverifier.jpms.model.Records.RecordPointContainer;
+import nl.jqno.equalsverifier_testhelpers.ExpectedException;
 import nl.jqno.equalsverifier_testhelpers.types.RecursiveTypeHelper.RecursiveTypeContainer;
 import org.junit.jupiter.api.Test;
 
@@ -51,4 +55,62 @@ void forPackageWorks() {
                 .forPackage("nl.jqno.equalsverifier.jpms.model", ScanOption.except(Records.class::equals))
                 .verify();
     }
+
+    @Test
+    void showingMessagesWorks() {
+        ExpectedException
+                .when(() -> EqualsVerifier.forClass(IncorrectEquals.class).verify())
+                .assertFailure()
+                .assertMessageContains("Significant fields");
+    }
+
+    @SuppressWarnings("InconsistentHashCode")
+    static final class IncorrectEquals {
+        final List<Foo> l;
+        final int i;
+
+        public IncorrectEquals(List<Foo> l, int i) {
+            this.l = l;
+            this.i = i;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof IncorrectEquals other && Objects.equals(l, other.l);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(l, i);
+        }
+
+        @Override
+        public String toString() {
+            return "IncorrectEquals: [" + l + ", " + i + "]";
+        }
+    }
+
+    static final class Foo {
+        final String s;
+
+        public Foo(String s) {
+            this.s = s;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof Foo other && Objects.equals(s, other.s);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(s);
+        }
+
+        @Override
+        public String toString() {
+            return "Foo: [" + s + "]";
+        }
+    }
+
 }