Improves modules tests

jqno · Feb 7, 2025 · 623586f · 623586f
1 parent b411315
commit 623586f
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 92 deletions.
diff --git a/equalsverifier-test-jpms/src/main/java/module-info.java b/equalsverifier-test-jpms/src/main/java/module-info.java
@@ -0,0 +1,10 @@
+module equalsverifier_jpms {
+    exports nl.jqno.equalsverifier.jpms.model;
+
+    opens nl.jqno.equalsverifier.jpms.model;
+
+    requires java.desktop;
+    requires java.naming;
+    requires java.rmi;
+    requires java.sql;
+}
diff --git a/equalsverifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/ClassPoint.java b/equalsverifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/ClassPoint.java
@@ -0,0 +1,24 @@
+package nl.jqno.equalsverifier.jpms.model;
+
+import java.util.Objects;
+
+public final class ClassPoint {
+
+    private final int x;
+    private final int y;
+
+    private ClassPoint(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof ClassPoint other && x == other.x && y == other.y;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(x, y);
+    }
+}
diff --git a/...rifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/ClassPointContainer.java b/...rifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/ClassPointContainer.java
@@ -0,0 +1,21 @@
+package nl.jqno.equalsverifier.jpms.model;
+
+import java.util.Objects;
+
+public final class ClassPointContainer {
+    private final ClassPoint cp;
+
+    private ClassPointContainer(ClassPoint cp) {
+        this.cp = cp;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof ClassPointContainer other && Objects.equals(cp, other.cp);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(cp);
+    }
+}
diff --git a/...-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/FieldsFromJdkModulesHaver.java b/...-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/FieldsFromJdkModulesHaver.java
@@ -0,0 +1,35 @@
+package nl.jqno.equalsverifier.jpms.model;
+
+import java.util.Objects;
+
+public final class FieldsFromJdkModulesHaver {
+    private final java.awt.Color desktopAwtColor;
+    private final java.rmi.server.UID rmiUid;
+    private final java.sql.Date sqlDate;
+    private final javax.naming.Reference namingReference;
+
+    private FieldsFromJdkModulesHaver(
+            java.awt.Color c,
+            java.rmi.server.UID u,
+            java.sql.Date d,
+            javax.naming.Reference r) {
+        this.desktopAwtColor = c;
+        this.rmiUid = u;
+        this.sqlDate = d;
+        this.namingReference = r;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof FieldsFromJdkModulesHaver other
+                && Objects.equals(desktopAwtColor, other.desktopAwtColor)
+                && Objects.equals(rmiUid, other.rmiUid)
+                && Objects.equals(sqlDate, other.sqlDate)
+                && Objects.equals(namingReference, other.namingReference);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(desktopAwtColor, rmiUid, sqlDate, namingReference);
+    }
+}
diff --git a/equalsverifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/NonFinal.java b/equalsverifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/NonFinal.java
@@ -0,0 +1,21 @@
+package nl.jqno.equalsverifier.jpms.model;
+
+import java.util.Objects;
+
+public class NonFinal {
+    private final int i;
+
+    public NonFinal(int i) {
+        this.i = i;
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        return obj instanceof NonFinal other && Objects.equals(i, other.i);
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(i);
+    }
+}
diff --git a/equalsverifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/Records.java b/equalsverifier-test-jpms/src/main/java/nl/jqno/equalsverifier/jpms/model/Records.java
@@ -0,0 +1,7 @@
+package nl.jqno.equalsverifier.jpms.model;
+
+public final class Records {
+    public record RecordPoint(int x, int y) {}
+
+    public record RecordPointContainer(RecordPoint rp) {}
+}
diff --git a/equalsverifier-test-jpms/src/test/java/it/EverythingWorksInTheModularWorldTest.java b/equalsverifier-test-jpms/src/test/java/it/EverythingWorksInTheModularWorldTest.java
@@ -1,8 +1,9 @@
 package it;
 
-import java.util.Objects;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.jpms.model.*;
+import nl.jqno.equalsverifier.jpms.model.Records.RecordPoint;
+import nl.jqno.equalsverifier.jpms.model.Records.RecordPointContainer;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -44,95 +45,11 @@ void nonFinalClassCanBeVerified() {
         EqualsVerifier.forClass(NonFinal.class).verify();
     }
 
-    static final class ClassPoint {
-        private final int x;
-        private final int y;
-
-        private ClassPoint(int x, int y) {
-            this.x = x;
-            this.y = y;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj instanceof ClassPoint other && x == other.x && y == other.y;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(x, y);
-        }
-    }
-
-    static final class ClassPointContainer {
-        private final ClassPoint cp;
-
-        private ClassPointContainer(ClassPoint cp) {
-            this.cp = cp;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj instanceof ClassPointContainer other && Objects.equals(cp, other.cp);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(cp);
-        }
-    }
-
-    record RecordPoint(int x, int y) {}
-
-    record RecordPointContainer(RecordPoint rp) {}
-
-    static final class FieldsFromJdkModulesHaver {
-        private final java.awt.Color desktopAwtColor;
-        private final java.rmi.server.UID rmiUid;
-        private final java.sql.Date sqlDate;
-        private final javax.naming.Reference namingReference;
-
-        private FieldsFromJdkModulesHaver(
-                java.awt.Color c,
-                java.rmi.server.UID u,
-                java.sql.Date d,
-                javax.naming.Reference r) {
-            this.desktopAwtColor = c;
-            this.rmiUid = u;
-            this.sqlDate = d;
-            this.namingReference = r;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj instanceof FieldsFromJdkModulesHaver other
-                    && Objects.equals(desktopAwtColor, other.desktopAwtColor)
-                    && Objects.equals(rmiUid, other.rmiUid)
-                    && Objects.equals(sqlDate, other.sqlDate)
-                    && Objects.equals(namingReference, other.namingReference);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(desktopAwtColor, rmiUid, sqlDate, namingReference);
-        }
-    }
-
-    static class NonFinal {
-        private final int i;
-
-        public NonFinal(int i) {
-            this.i = i;
-        }
-
-        @Override
-        public final boolean equals(Object obj) {
-            return obj instanceof NonFinal other && Objects.equals(i, other.i);
-        }
-
-        @Override
-        public final int hashCode() {
-            return Objects.hash(i);
-        }
+    @Test
+    void forPackageWorks() {
+        EqualsVerifier
+                .forPackage("nl.jqno.equalsverifier.jpms.model")
+                .except(c -> Records.class.equals(c.getEnclosingClass()) || Records.class.equals(c))
+                .verify();
     }
 }
diff --git a/equalsverifier-test-jpms/src/test/java/module-info.java b/equalsverifier-test-jpms/src/test/java/module-info.java
@@ -1,4 +1,5 @@
 open module equalsverifier_jpms_test {
+    requires equalsverifier_jpms;
     requires nl.jqno.equalsverifier;
 
     requires org.junit.jupiter.api;