zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed tests

Browse source
This commit is contained in:
anhefti 2020-07-08 14:51:13 +02:00
parent 35385dcd7b
commit beac468b70
2 changed files with 36 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityKey.java
View file

@ -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 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. */ * An EntityKey consists of the model identifier of a domain entity and the type of the entity. */
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class EntityKey implements ModelIdAware, Serializable { public class EntityKey implements ModelIdAware, Serializable, Comparable<EntityKey> {
private static final long serialVersionUID = -2368065921846821061L; private static final long serialVersionUID = -2368065921846821061L;
@ -120,4 +120,18 @@ public class EntityKey implements ModelIdAware, Serializable {
return builder.toString(); 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;
}
}
} }

70
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

@ -2218,27 +2218,20 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.call() .call()
.getOrThrow() .getOrThrow()
.stream() .stream()
.sorted((key1, key2) -> { .sorted()
final int compareTo = key1.entityType.compareTo(key2.entityType);
if (compareTo == 0) {
return key1.modelId.compareTo(key2.modelId);
} else {
return compareTo;
}
})
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " "[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], "
+ "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=2, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=4, 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=1, entityType=INDICATOR], "
+ "EntityKey [modelId=2, entityType=INDICATOR]]", + "EntityKey [modelId=2, entityType=INDICATOR]]",
dependencies.toString()); dependencies.toString());
@ -2274,23 +2267,16 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.call() .call()
.getOrThrow() .getOrThrow()
.stream() .stream()
.sorted((key1, key2) -> { .sorted()
final int compareTo = key1.entityType.compareTo(key2.entityType);
if (compareTo == 0) {
return key1.modelId.compareTo(key2.modelId);
} else {
return compareTo;
}
})
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " "[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=1, entityType=EXAM], "
+ "EntityKey [modelId=1, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=4, 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=1, entityType=INDICATOR], "
+ "EntityKey [modelId=2, entityType=INDICATOR]]", + "EntityKey [modelId=2, entityType=INDICATOR]]",
dependencies.toString()); dependencies.toString());
@ -2303,14 +2289,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.call() .call()
.getOrThrow() .getOrThrow()
.stream() .stream()
.sorted((key1, key2) -> { .sorted()
final int compareTo = key1.entityType.compareTo(key2.entityType);
if (compareTo == 0) {
return key1.modelId.compareTo(key2.modelId);
} else {
return compareTo;
}
})
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
@ -2329,27 +2308,20 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.call() .call()
.getOrThrow() .getOrThrow()
.stream() .stream()
.sorted((key1, key2) -> { .sorted()
final int compareTo = key1.entityType.compareTo(key2.entityType);
if (compareTo == 0) {
return key1.modelId.compareTo(key2.modelId);
} else {
return compareTo;
}
})
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " "[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], "
+ "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=2, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], "
+ "EntityKey [modelId=4, 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=1, entityType=INDICATOR], "
+ "EntityKey [modelId=2, entityType=INDICATOR]]", + "EntityKey [modelId=2, entityType=INDICATOR]]",
dependencies.toString()); dependencies.toString());