From beac468b707d4f92086edd571f3ea4089b8b55e0 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 8 Jul 2020 14:51:13 +0200 Subject: [PATCH] fixed tests --- .../seb/sebserver/gbl/model/EntityKey.java | 16 ++++- .../integration/UseCasesIntegrationTest.java | 70 ++++++------------- 2 files changed, 36 insertions(+), 50 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityKey.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityKey.java index cc8a5cac..db47c235 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityKey.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityKey.java @@ -21,7 +21,7 @@ import ch.ethz.seb.sebserver.gbl.api.EntityType; /** An EntityKey uniquely identifies a domain entity within the SEB Server's domain model. * An EntityKey consists of the model identifier of a domain entity and the type of the entity. */ @JsonIgnoreProperties(ignoreUnknown = true) -public class EntityKey implements ModelIdAware, Serializable { +public class EntityKey implements ModelIdAware, Serializable, Comparable { private static final long serialVersionUID = -2368065921846821061L; @@ -120,4 +120,18 @@ public class EntityKey implements ModelIdAware, Serializable { return builder.toString(); } + @Override + public int compareTo(final EntityKey other) { + if (other == null) { + return -1; + } + + final int compareTo = this.entityType.name().compareTo(other.entityType.name()); + if (compareTo == 0) { + return this.modelId.compareTo(other.modelId); + } else { + return compareTo; + } + } + } diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java index 5ba628df..16c4b505 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java @@ -2218,27 +2218,20 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .call() .getOrThrow() .stream() - .sorted((key1, key2) -> { - final int compareTo = key1.entityType.compareTo(key2.entityType); - if (compareTo == 0) { - return key1.modelId.compareTo(key2.modelId); - } else { - return compareTo; - } - }) + .sorted() .collect(Collectors.toList()); assertEquals( - "[EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " - + "EntityKey [modelId=1, entityType=EXAM], " - + "EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " + "[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + + "EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=1, entityType=EXAM], " + + "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EntityKey [modelId=1, entityType=INDICATOR], " + "EntityKey [modelId=2, entityType=INDICATOR]]", dependencies.toString()); @@ -2274,23 +2267,16 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .call() .getOrThrow() .stream() - .sorted((key1, key2) -> { - final int compareTo = key1.entityType.compareTo(key2.entityType); - if (compareTo == 0) { - return key1.modelId.compareTo(key2.modelId); - } else { - return compareTo; - } - }) + .sorted() .collect(Collectors.toList()); assertEquals( - "[EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " - + "EntityKey [modelId=1, entityType=EXAM], " - + "EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " + "[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + + "EntityKey [modelId=1, entityType=EXAM], " + + "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EntityKey [modelId=1, entityType=INDICATOR], " + "EntityKey [modelId=2, entityType=INDICATOR]]", dependencies.toString()); @@ -2303,14 +2289,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .call() .getOrThrow() .stream() - .sorted((key1, key2) -> { - final int compareTo = key1.entityType.compareTo(key2.entityType); - if (compareTo == 0) { - return key1.modelId.compareTo(key2.modelId); - } else { - return compareTo; - } - }) + .sorted() .collect(Collectors.toList()); assertEquals( @@ -2329,27 +2308,20 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .call() .getOrThrow() .stream() - .sorted((key1, key2) -> { - final int compareTo = key1.entityType.compareTo(key2.entityType); - if (compareTo == 0) { - return key1.modelId.compareTo(key2.modelId); - } else { - return compareTo; - } - }) + .sorted() .collect(Collectors.toList()); assertEquals( - "[EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " - + "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " - + "EntityKey [modelId=1, entityType=EXAM], " - + "EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " + "[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + + "EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " + + "EntityKey [modelId=1, entityType=EXAM], " + + "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EntityKey [modelId=1, entityType=INDICATOR], " + "EntityKey [modelId=2, entityType=INDICATOR]]", dependencies.toString());