LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Merge branch 'master' of git.libreccm.org:libreccm

Jens Pelzetter 2019-09-06 19:57:54 +02:00
parent e5cfa65d68 fd1162b627
commit 94499eb61f
21 changed files with 50 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
View File

@ -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);

6
ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
View File

@ -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) {
}
}

4
ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
View File

@ -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);

4
ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
View File

@ -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();

4
ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
View File

@ -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");

6
ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
View File

@ -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");

6
ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
View File

@ -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");

5
ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
View File

@ -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);

6
ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
View File

@ -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");

4
ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
View File

@ -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);

18
ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
View File

@ -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,14 +102,14 @@ 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
final EqualsVerifierApi<?> verifier
= nl.jqno.equalsverifier.EqualsVerifier
.forClass(entityClass)
.withRedefinedSuperclass();
@ -118,14 +118,6 @@ public class EqualsVerifier {
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();
}
}

2
pom.xml
View File

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