diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
index b1892e7ae..a7f53feaf 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.librecms.contentsection;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -54,8 +55,7 @@ public class AssetEqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final CcmObject object1 = new CcmObject();
object1.setDisplayName("Object 1");
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
index bc3a39279..dc18a1367 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.librecms.contentsection;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject;
@@ -54,8 +55,7 @@ public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final ContentSection section1 = new ContentSection();
section1.setDisplayName("section1");
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
index c1f64db4e..913a09dcf 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.librecms.contentsection;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -58,8 +59,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final ContentItem item1 = new ContentItem();
item1.setObjectId(-1100);
diff --git a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
index 83f72c96e..0353ce46b 100644
--- a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
@@ -18,8 +18,11 @@
*/
package org.librecms.contenttypes;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
+
import java.util.Arrays;
import java.util.Collection;
+
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@@ -47,8 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
}
}
diff --git a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
index 848ce92e7..d409fa665 100644
--- a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.categorization;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject;
@@ -53,8 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Category category1 = new Category();
category1.setName("Category One");
diff --git a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
index 13dce05d7..f21d632dc 100644
--- a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.core;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@@ -53,8 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final CcmObject ccmObject1 = new CcmObject();
ccmObject1.setObjectId(-100);
diff --git a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
index 7e6bcb611..0bea94111 100644
--- a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.core;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -56,8 +57,7 @@ public class ResourceEntityTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Resource resource1 = new Resource();
final LocalizedString title1 = new LocalizedString();
diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
index da23185be..67f58a389 100644
--- a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.formbuilder;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -61,8 +62,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Component component1 = new Component();
component1.setAdminName("Component One");
diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
index e22f1c42c..a4a0c74ef 100644
--- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.formbuilder.actions;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.formbuilder.Component;
@@ -59,8 +60,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Component component1 = new Component();
component1.setAdminName("Component One");
diff --git a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
index e30438687..cddcc3c58 100644
--- a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.l10n;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -48,8 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Message message1 = new Message();
message1.setSubject("Message One");
diff --git a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
index e9bdeaf26..5b4372892 100644
--- a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
@@ -18,8 +18,7 @@
*/
package org.libreccm.messaging;
-import nl.jqno.equalsverifier.Warning;
-import org.junit.Test;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -55,8 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Message message1 = new Message();
message1.setSubject("Message One");
diff --git a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
index 5741e6f90..a45ceb2cc 100644
--- a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.notification;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -54,8 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Message message1 = new Message();
message1.setSubject("Message One");
diff --git a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
index d98bea47e..9a502a2fd 100644
--- a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
@@ -18,8 +18,7 @@
*/
package org.libreccm.portal;
-import nl.jqno.equalsverifier.Warning;
-import org.junit.Test;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -54,8 +53,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Portal portal1 = new Portal();
portal1.setDisplayName("Portal One");
diff --git a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
index 8c0ba2e75..a218401bb 100644
--- a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.runtime;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@@ -46,8 +47,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Initalizer initalizer1 = new Initalizer();
initalizer1.setClassName("org.example.foo.Initalizer");
diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
index 3f30831aa..c2d304b33 100644
--- a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.search.lucene;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.security.Group;
@@ -49,8 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Document document1 = new Document();
document1.setTitle("document1");
diff --git a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
index cbe1db27a..4ae48e8e8 100644
--- a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.security;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject;
@@ -55,8 +56,8 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(EqualsVerifierApi> verifier) {
+
final Group group1 = new Group();
group1.setName("group1");
diff --git a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
index e6de7f136..7b6046bf9 100644
--- a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.theming.db;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@@ -50,8 +51,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
Objects.requireNonNull(verifier);
diff --git a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
index 8ba190668..1d44c93ef 100644
--- a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
@@ -18,8 +18,7 @@
*/
package org.libreccm.web;
-import nl.jqno.equalsverifier.Warning;
-import org.junit.Test;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@@ -56,8 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
final Resource resource1 = new Resource();
resource1.setDisplayName("Resource One");
diff --git a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
index 068304a4f..4c47c2a57 100644
--- a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.workflow;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -56,8 +57,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
super.addPrefabValues(verifier);
diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
index d0d64d076..031d1ef45 100644
--- a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
+++ b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
@@ -18,6 +18,7 @@
*/
package org.libreccm.testutils;
+import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.Warning;
import org.junit.Test;
import org.junit.runners.Parameterized;
@@ -88,8 +89,7 @@ public class EqualsVerifier {
*
* @param verifier The verifier to which the suppression are added.
*/
- protected void addSuppressWarnings(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addSuppressWarnings(final EqualsVerifierApi> verifier) {
verifier
.suppress(Warning.STRICT_INHERITANCE)
@@ -102,30 +102,22 @@ public class EqualsVerifier {
*
* @param verifier The verifier to which the prefab values are added.
*/
- protected void addPrefabValues(
- final nl.jqno.equalsverifier.EqualsVerifier> verifier) {
+ protected void addPrefabValues(final EqualsVerifierApi> verifier) {
//Nothing here
}
@Test
public void verifyEqualsAndHashCode() {
- final nl.jqno.equalsverifier.EqualsVerifier> verifier
- = nl.jqno.equalsverifier.EqualsVerifier
- .forClass(entityClass)
- .withRedefinedSuperclass();
+
+ final EqualsVerifierApi> verifier
+ = nl.jqno.equalsverifier.EqualsVerifier
+ .forClass(entityClass)
+ .withRedefinedSuperclass();
addSuppressWarnings(verifier);
addPrefabValues(verifier);
verifier.verify();
-
-// nl.jqno.equalsverifier.EqualsVerifier
-// .forClass(entityClass)
-// .suppress(Warning.STRICT_INHERITANCE)
-// .suppress(Warning.NONFINAL_FIELDS)
-// .suppress(Warning.ALL_FIELDS_SHOULD_BE_USED)
-// .withRedefinedSuperclass()
-// .verify();
}
}
diff --git a/pom.xml b/pom.xml
index 17a111a3a..f88ff8e42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -783,7 +783,7 @@
nl.jqno.equalsverifier
equalsverifier
- 2.2
+ 3.1.9