From e5025e1c47a66a9542855562ae05ff8bb974e838 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 9 Jul 2020 16:07:08 +0200 Subject: [PATCH] fixed tests --- .../integration/UseCasesIntegrationTest.java | 112 +++++++++--------- .../api/admin/InstitutionAPITest.java | 14 +-- .../api/admin/LmsSetupAPITest.java | 6 +- .../integration/api/admin/UserAPITest.java | 4 +- 4 files changed, 69 insertions(+), 67 deletions(-) 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 295f7580..cb385db4 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 @@ -2226,19 +2226,19 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .collect(Collectors.toList()); assertEquals( - "[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()); + "[CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "EXAM, " + + "EXAM_CONFIGURATION_MAP, " + + "INDICATOR, " + + "INDICATOR]", + dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString()); // check that the user is owner of all depending exams and configurations dependencies.stream() @@ -2275,15 +2275,15 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .collect(Collectors.toList()); assertEquals( - "[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()); + "[CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "EXAM, " + + "EXAM_CONFIGURATION_MAP, " + + "INDICATOR, " + + "INDICATOR]", + dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString()); // only with configuration dependencies dependencies = restService.getBuilder(GetUserDependency.class) @@ -2297,11 +2297,11 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .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]]", - dependencies.toString()); + "[CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE]", + dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString()); // only with exam and configuration dependencies dependencies = restService.getBuilder(GetUserDependency.class) @@ -2316,19 +2316,19 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .collect(Collectors.toList()); assertEquals( - "[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()); + "[CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "EXAM, " + + "EXAM_CONFIGURATION_MAP, " + + "INDICATOR, " + + "INDICATOR]", + dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString()); } @Test @@ -2392,20 +2392,20 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { .sorted() .collect(Collectors.toList()); assertEquals( - "[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], " - + "EntityKey [modelId=9, entityType=USER]]", - dependencies.toString()); + "[CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CLIENT_CONNECTION, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "CONFIGURATION_NODE, " + + "EXAM, " + + "EXAM_CONFIGURATION_MAP, " + + "INDICATOR, " + + "INDICATOR, " + + "USER]", + dependencies.stream().map(EntityKey::getEntityType).collect(Collectors.toList()).toString()); final Set errors = report.getErrors(); assertNotNull(errors); @@ -2425,7 +2425,9 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { } try { 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() .getOrThrow(); fail("no resource found exception expected here"); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java index 72c17491..0b70275d 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java @@ -265,7 +265,7 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester { assertNotNull(report); 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()); // get @@ -292,9 +292,9 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester { }); assertNotNull(report); - assertEquals("EntityProcessingReport " - + "[source=[EntityKey [modelId=4, entityType=INSTITUTION]], " - + "dependencies=[], " + assertEquals("EntityProcessingReport [" + + "source=[EntityKey [modelId=4, entityType=INSTITUTION]], " + + "results=[EntityKey [modelId=4, entityType=INSTITUTION]], " + "errors=[]]", report.toString()); // get @@ -321,9 +321,9 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester { }); assertNotNull(report); - assertEquals("EntityProcessingReport " - + "[source=[EntityKey [modelId=4, entityType=INSTITUTION]], " - + "dependencies=[], " + assertEquals("EntityProcessingReport [" + + "source=[EntityKey [modelId=4, entityType=INSTITUTION]], " + + "results=[EntityKey [modelId=4, entityType=INSTITUTION]], " + "errors=[]]", report.toString()); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java index ca9e65d3..e88e42b4 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java @@ -103,7 +103,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { assertNotNull(report.source); assertTrue(report.source.size() == 1); 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()); // get @@ -133,7 +133,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { assertNotNull(report.source); assertTrue(report.source.size() == 1); 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()); lmsSetup = new RestAPITestHelper() @@ -162,7 +162,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { assertNotNull(report.source); assertTrue(report.source.size() == 1); 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()); // get diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java index e60d5351..4b1bda32 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java @@ -930,7 +930,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester { assertNotNull(report); assertNotNull(report.source); - assertTrue(report.results.isEmpty()); // TODO + assertFalse(report.results.isEmpty()); assertTrue(report.errors.isEmpty()); assertTrue(report.source.size() == 1); @@ -993,7 +993,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester { assertNotNull(report); assertNotNull(report.source); - assertTrue(report.results.isEmpty()); // TODO + assertFalse(report.results.isEmpty()); assertTrue(report.errors.isEmpty()); assertTrue(report.source.size() == 1);