Updated nl.jqno.equalsverifier.equalsverifier to 3.4

Jens Pelzetter 2020-06-25 13:52:04 +02:00
parent 56da5cb0f9
commit 159e72ade6
21 changed files with 47 additions and 45 deletions

View File

@ -18,7 +18,7 @@
*/
package org.librecms.contentsection;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -55,7 +55,7 @@ public class AssetEqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final CcmObject object1 = new CcmObject();
object1.setDisplayName("Object 1");

View File

@ -18,7 +18,7 @@
*/
package org.librecms.contentsection;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject;
@ -55,7 +55,7 @@ public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final ContentSection section1 = new ContentSection();
section1.setDisplayName("section1");

View File

@ -18,7 +18,7 @@
*/
package org.librecms.contentsection;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -59,7 +59,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final ContentItem item1 = new ContentItem();
item1.setObjectId(-1100);

View File

@ -18,7 +18,7 @@
*/
package org.librecms.contenttypes;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import java.util.Arrays;
import java.util.Collection;
@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
}
}

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.categorization;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject;
@ -54,8 +54,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(
final SingleTypeEqualsVerifierApi<?> verifier
) {
final Category category1 = new Category();
category1.setName("Category One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.core;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final CcmObject ccmObject1 = new CcmObject();
ccmObject1.setObjectId(-100);

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.core;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -57,7 +57,7 @@ public class ResourceEntityTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Resource resource1 = new Resource();
final LocalizedString title1 = new LocalizedString();

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.formbuilder;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -62,7 +62,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Component component1 = new Component();
component1.setAdminName("Component One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.formbuilder.actions;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.formbuilder.Component;
@ -60,7 +60,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Component component1 = new Component();
component1.setAdminName("Component One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.l10n;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@ -49,7 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Message message1 = new Message();
message1.setSubject("Message One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.messaging;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Message message1 = new Message();
message1.setSubject("Message One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.notification;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Message message1 = new Message();
message1.setSubject("Message One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.portal;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -53,7 +53,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Portal portal1 = new Portal();
portal1.setDisplayName("Portal One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.runtime;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@ -47,7 +47,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Initalizer initalizer1 = new Initalizer();
initalizer1.setClassName("org.example.foo.Initalizer");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.search.lucene;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.security.Group;
@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Document document1 = new Document();
document1.setTitle("document1");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.security;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject;
@ -56,7 +56,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Group group1 = new Group();
group1.setName("group1");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.theming.db;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
@ -51,7 +51,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
Objects.requireNonNull(verifier);

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.web;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category;
@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Resource resource1 = new Resource();
resource1.setDisplayName("Resource One");

View File

@ -18,7 +18,7 @@
*/
package org.libreccm.workflow;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@ -57,7 +57,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
}
@Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
super.addPrefabValues(verifier);

View File

@ -18,8 +18,8 @@
*/
package org.libreccm.testutils;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.Warning;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.Test;
import org.junit.runners.Parameterized;
@ -89,7 +89,9 @@ public class EqualsVerifier {
*
* @param verifier The verifier to which the suppression are added.
*/
protected void addSuppressWarnings(final EqualsVerifierApi<?> verifier) {
protected void addSuppressWarnings(
final SingleTypeEqualsVerifierApi<?> verifier
) {
verifier
.suppress(Warning.STRICT_INHERITANCE)
@ -102,14 +104,14 @@ public class EqualsVerifier {
*
* @param verifier The verifier to which the prefab values are added.
*/
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
//Nothing here
}
@Test
public void verifyEqualsAndHashCode() {
final EqualsVerifierApi<?> verifier
final SingleTypeEqualsVerifierApi<?> verifier
= nl.jqno.equalsverifier.EqualsVerifier
.forClass(entityClass)
.withRedefinedSuperclass();

View File

@ -856,8 +856,7 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<!--<version>1.7.8</version>-->
<version>3.1.9</version>
<version>3.4</version>
</dependency>
<!-- h2 database in used to check some database related things -->