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-09 16:07:08 +02:00
parent 896db25eca
commit e5025e1c47
4 changed files with 69 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2226,19 +2226,19 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " "[CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=1, entityType=EXAM], " + "EXAM, "
+ "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EXAM_CONFIGURATION_MAP, "
+ "EntityKey [modelId=1, entityType=INDICATOR], " + "INDICATOR, "
+ "EntityKey [modelId=2, entityType=INDICATOR]]", + "INDICATOR]",
dependencies.toString()); dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString());
// check that the user is owner of all depending exams and configurations // check that the user is owner of all depending exams and configurations
dependencies.stream() dependencies.stream()
@ -2275,15 +2275,15 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " "[CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=1, entityType=EXAM], " + "EXAM, "
+ "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EXAM_CONFIGURATION_MAP, "
+ "EntityKey [modelId=1, entityType=INDICATOR], " + "INDICATOR, "
+ "EntityKey [modelId=2, entityType=INDICATOR]]", + "INDICATOR]",
dependencies.toString()); dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString());
// only with configuration dependencies // only with configuration dependencies
dependencies = restService.getBuilder(GetUserDependency.class) dependencies = restService.getBuilder(GetUserDependency.class)
@ -2297,11 +2297,11 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " "[CONFIGURATION_NODE, "
+ "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=5, entityType=CONFIGURATION_NODE]]", + "CONFIGURATION_NODE]",
dependencies.toString()); dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString());
// only with exam and configuration dependencies // only with exam and configuration dependencies
dependencies = restService.getBuilder(GetUserDependency.class) dependencies = restService.getBuilder(GetUserDependency.class)
@ -2316,19 +2316,19 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " "[CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=1, entityType=EXAM], " + "EXAM, "
+ "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EXAM_CONFIGURATION_MAP, "
+ "EntityKey [modelId=1, entityType=INDICATOR], " + "INDICATOR, "
+ "EntityKey [modelId=2, entityType=INDICATOR]]", + "INDICATOR]",
dependencies.toString()); dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString());
} }
@Test @Test
@ -2392,20 +2392,20 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.sorted() .sorted()
.collect(Collectors.toList()); .collect(Collectors.toList());
assertEquals( assertEquals(
"[EntityKey [modelId=1, entityType=CLIENT_CONNECTION], " "[CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=3, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=4, entityType=CLIENT_CONNECTION], " + "CLIENT_CONNECTION, "
+ "EntityKey [modelId=2, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=3, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=4, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=5, entityType=CONFIGURATION_NODE], " + "CONFIGURATION_NODE, "
+ "EntityKey [modelId=1, entityType=EXAM], " + "EXAM, "
+ "EntityKey [modelId=3, entityType=EXAM_CONFIGURATION_MAP], " + "EXAM_CONFIGURATION_MAP, "
+ "EntityKey [modelId=1, entityType=INDICATOR], " + "INDICATOR, "
+ "EntityKey [modelId=2, entityType=INDICATOR], " + "INDICATOR, "
+ "EntityKey [modelId=9, entityType=USER]]", + "USER]",
dependencies.toString()); dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString());
final Set<ErrorEntry> errors = report.getErrors(); final Set<ErrorEntry> errors = report.getErrors();
assertNotNull(errors); assertNotNull(errors);
@ -2425,7 +2425,9 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
} }
try { try {
restServiceAdmin.getBuilder(GetExam.class) restServiceAdmin.getBuilder(GetExam.class)
.withURIVariable(API.PARAM_MODEL_ID, "1") .withURIVariable(API.PARAM_MODEL_ID,
dependencies.stream().filter(key -> key.entityType == EntityType.EXAM).findFirst()
.get().modelId)
.call() .call()
.getOrThrow(); .getOrThrow();
fail("no resource found exception expected here"); fail("no resource found exception expected here");

14
src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java
View file

@ -265,7 +265,7 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
assertNotNull(report); assertNotNull(report);
assertEquals( assertEquals(
"EntityProcessingReport [source=[EntityKey [modelId=4, entityType=INSTITUTION]], dependencies=[], errors=[]]", "EntityProcessingReport [source=[EntityKey [modelId=4, entityType=INSTITUTION]], results=[EntityKey [modelId=4, entityType=INSTITUTION]], errors=[]]",
report.toString()); report.toString());
// get // get
@ -292,9 +292,9 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
}); });
assertNotNull(report); assertNotNull(report);
assertEquals("EntityProcessingReport " assertEquals("EntityProcessingReport ["
+ "[source=[EntityKey [modelId=4, entityType=INSTITUTION]], " + "source=[EntityKey [modelId=4, entityType=INSTITUTION]], "
+ "dependencies=[], " + "results=[EntityKey [modelId=4, entityType=INSTITUTION]], "
+ "errors=[]]", + "errors=[]]",
report.toString()); report.toString());
// get // get
@ -321,9 +321,9 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
}); });
assertNotNull(report); assertNotNull(report);
assertEquals("EntityProcessingReport " assertEquals("EntityProcessingReport ["
+ "[source=[EntityKey [modelId=4, entityType=INSTITUTION]], " + "source=[EntityKey [modelId=4, entityType=INSTITUTION]], "
+ "dependencies=[], " + "results=[EntityKey [modelId=4, entityType=INSTITUTION]], "
+ "errors=[]]", + "errors=[]]",
report.toString()); report.toString());

6
src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java
View file

@ -103,7 +103,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester {
assertNotNull(report.source); assertNotNull(report.source);
assertTrue(report.source.size() == 1); assertTrue(report.source.size() == 1);
assertEquals(String.valueOf(lmsSetup.id), report.source.iterator().next().modelId); assertEquals(String.valueOf(lmsSetup.id), report.source.iterator().next().modelId);
assertEquals("[]", report.results.toString()); assertEquals("[EntityKey [modelId=1, entityType=LMS_SETUP]]", report.results.toString());
assertEquals("[]", report.errors.toString()); assertEquals("[]", report.errors.toString());
// get // get
@ -133,7 +133,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester {
assertNotNull(report.source); assertNotNull(report.source);
assertTrue(report.source.size() == 1); assertTrue(report.source.size() == 1);
assertEquals(String.valueOf(lmsSetup.id), report.source.iterator().next().modelId); assertEquals(String.valueOf(lmsSetup.id), report.source.iterator().next().modelId);
assertEquals("[]", report.results.toString()); assertEquals("[EntityKey [modelId=1, entityType=LMS_SETUP]]", report.results.toString());
assertEquals("[]", report.errors.toString()); assertEquals("[]", report.errors.toString());
lmsSetup = new RestAPITestHelper() lmsSetup = new RestAPITestHelper()
@ -162,7 +162,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester {
assertNotNull(report.source); assertNotNull(report.source);
assertTrue(report.source.size() == 1); assertTrue(report.source.size() == 1);
assertEquals(String.valueOf(lmsSetup.id), report.source.iterator().next().modelId); assertEquals(String.valueOf(lmsSetup.id), report.source.iterator().next().modelId);
assertEquals("[]", report.results.toString()); assertEquals("[EntityKey [modelId=1, entityType=LMS_SETUP]]", report.results.toString());
assertEquals("[]", report.errors.toString()); assertEquals("[]", report.errors.toString());
// get // get

4
src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java
View file

@ -930,7 +930,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
assertNotNull(report); assertNotNull(report);
assertNotNull(report.source); assertNotNull(report.source);
assertTrue(report.results.isEmpty()); // TODO assertFalse(report.results.isEmpty());
assertTrue(report.errors.isEmpty()); assertTrue(report.errors.isEmpty());
assertTrue(report.source.size() == 1); assertTrue(report.source.size() == 1);
@ -993,7 +993,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
assertNotNull(report); assertNotNull(report);
assertNotNull(report.source); assertNotNull(report.source);
assertTrue(report.results.isEmpty()); // TODO assertFalse(report.results.isEmpty());
assertTrue(report.errors.isEmpty()); assertTrue(report.errors.isEmpty());
assertTrue(report.source.size() == 1); assertTrue(report.source.size() == 1);