LibreCCM
/
scientificcms
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed equals and hashCode

pull/1/head
Jens Pelzetter 2019-11-20 20:36:21 +01:00
parent 9d16eeb580
commit 1d84cb8e94
4 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sci-publications/src/main/java/org/scientificcms/publications/Authorship.java
View File

@ -131,6 +131,9 @@ public class Authorship implements Serializable, Comparable<Authorship> {
if (authorshipId != other.getAuthorshipId()) { if (authorshipId != other.getAuthorshipId()) {
return false; return false;
} }
if (!Objects.equals(uuid, other.getUuid())) {
return false;
}
if (editor != other.isEditor()) { if (editor != other.isEditor()) {
return false; return false;
} }

1
sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java
View File

@ -8,7 +8,6 @@ package org.scientificcms.publications.contenttypes;
import com.arsdigita.cms.contenttypes.ui.ProceedingsCreateForm; import com.arsdigita.cms.contenttypes.ui.ProceedingsCreateForm;
import com.arsdigita.cms.contenttypes.ui.ProceedingsPropertiesStep; import com.arsdigita.cms.contenttypes.ui.ProceedingsPropertiesStep;
import jdk.jfr.ContentType;
import org.librecms.CmsConstants; import org.librecms.CmsConstants;
import org.librecms.contenttypes.AuthoringKit; import org.librecms.contenttypes.AuthoringKit;
import org.librecms.contenttypes.AuthoringStep; import org.librecms.contenttypes.AuthoringStep;

21
sci-publications/src/test/java/org/scientificcms/publications/EqualsAndHashCodeTest.java
View File

@ -11,13 +11,12 @@ import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest; import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import org.librecms.assets.Organization; import org.librecms.assets.Organization;
import org.librecms.assets.Person;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Locale; import java.util.Locale;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@ -63,6 +62,18 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
volume2.getTitle().addValue(Locale.ENGLISH, "Test 2"); volume2.getTitle().addValue(Locale.ENGLISH, "Test 2");
verifier.withPrefabValues(CollectedVolume.class, volume1, volume2); verifier.withPrefabValues(CollectedVolume.class, volume1, volume2);
final Person author1 = new Person();
author1.setDisplayName("Max Mustermann");
final Person author2 = new Person();
author2.setDisplayName("John Doe");
verifier.withPrefabValues(Person.class, author1, author2);
final Publication publication1 = new Publication();
publication1.getTitle().addValue(Locale.ENGLISH, "Alpha");
final Publication publication2 = new Publication();
publication2.getTitle().addValue(Locale.ENGLISH, "Bravo");
verifier.withPrefabValues(Publication.class, publication1, publication2);
final Journal journal1 = new Journal(); final Journal journal1 = new Journal();
journal1.setTitle("Journal 1"); journal1.setTitle("Journal 1");
journal1.setFirstYear(1980); journal1.setFirstYear(1980);
@ -92,6 +103,12 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
verifier.withPrefabValues(Proceedings.class, verifier.withPrefabValues(Proceedings.class,
proceedings1, proceedings1,
proceedings2); proceedings2);
final Series series1 = new Series();
series1.getTitle().addValue(Locale.ENGLISH, "Series Alpha");
final Series series2 = new Series();
series2.getTitle().addValue(Locale.ENGLISH, "Series Bravo");
verifier.withPrefabValues(Series.class, series1, series2);
} }
} }

9
sci-publications/src/test/java/org/scientificcms/publications/contenttypes/EqualsAndHashCodeTest.java
View File

@ -23,6 +23,7 @@ import org.librecms.lifecycle.LifecycleDefinition;
import org.scientificcms.publications.CollectedVolume; import org.scientificcms.publications.CollectedVolume;
import org.scientificcms.publications.Journal; import org.scientificcms.publications.Journal;
import org.scientificcms.publications.Proceedings; import org.scientificcms.publications.Proceedings;
import org.scientificcms.publications.Publication;
import org.scientificcms.publications.assets.PrefabAssetsProvider; import org.scientificcms.publications.assets.PrefabAssetsProvider;
import java.util.Arrays; import java.util.Arrays;
@ -154,8 +155,12 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
lifecycle2.setDefinition(lifecycleDef2); lifecycle2.setDefinition(lifecycleDef2);
lifecycle2.setStarted(false); lifecycle2.setStarted(false);
verifier.withPrefabValues(Lifecycle.class, lifecycle1, lifecycle2); verifier.withPrefabValues(Lifecycle.class, lifecycle1, lifecycle2);
final Publication publication1 = new Publication();
publication1.getTitle().addValue(Locale.ENGLISH, "Alpha");
final Publication publication2 = new Publication();
publication2.getTitle().addValue(Locale.ENGLISH, "Bravo");
verifier.withPrefabValues(Publication.class, publication1, publication2);
} }
} }