From 775d1d364489fb0d3da7c81acfee5cbbdb47b6d2 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 4 Mar 2020 09:59:24 +0100 Subject: [PATCH] fixed tests --- .../integration/api/admin/UserAPITest.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 ceb77971..2cf8a408 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 @@ -1153,9 +1153,9 @@ public class UserAPITest extends AdministrationAPIIntegrationTester { assertNotNull(names); assertTrue(names.size() == 3); - assertEquals("[EntityName [entityType=USER, modelId=user1, name=SEBAdmin], " - + "EntityName [entityType=USER, modelId=user2, name=Institutional1 Admin], " - + "EntityName [entityType=USER, modelId=user5, name=Exam Supporter]]", names.toString()); + assertEquals("[EntityName [entityType=USER, modelId=user1, name=admin ( SEBAdmin)], " + + "EntityName [entityType=USER, modelId=user2, name=inst1Admin ( Institutional1 Admin)], " + + "EntityName [entityType=USER, modelId=user5, name=examSupporter ( Exam Supporter)]]", names.toString()); // for an institutional admin 2 final String instAdminToken = getAdminInstitution2Access(); @@ -1171,10 +1171,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester { assertNotNull(names); assertTrue(names.size() == 4); - assertEquals("[EntityName [entityType=USER, modelId=user3, name=Institutional2 Admin], " - + "EntityName [entityType=USER, modelId=user4, name=ExamAdmin1], " - + "EntityName [entityType=USER, modelId=user6, name=Deactivated], " - + "EntityName [entityType=USER, modelId=user7, name=User]]", names.toString()); + assertEquals("[EntityName [entityType=USER, modelId=user3, name=inst2Admin ( Institutional2 Admin)], " + + "EntityName [entityType=USER, modelId=user4, name=examAdmin1 ( ExamAdmin1)], " + + "EntityName [entityType=USER, modelId=user6, name=deactivatedUser ( Deactivated)], " + + "EntityName [entityType=USER, modelId=user7, name=user1 ( User)]]", names.toString()); // for an institutional admin 2 only active names = this.jsonMapper.readValue( @@ -1190,9 +1190,9 @@ public class UserAPITest extends AdministrationAPIIntegrationTester { assertNotNull(names); assertTrue(names.size() == 3); - assertEquals("[EntityName [entityType=USER, modelId=user3, name=Institutional2 Admin], " - + "EntityName [entityType=USER, modelId=user4, name=ExamAdmin1], " - + "EntityName [entityType=USER, modelId=user7, name=User]]", names.toString()); + assertEquals("[EntityName [entityType=USER, modelId=user3, name=inst2Admin ( Institutional2 Admin)], " + + "EntityName [entityType=USER, modelId=user4, name=examAdmin1 ( ExamAdmin1)], " + + "EntityName [entityType=USER, modelId=user7, name=user1 ( User)]]", names.toString()); } // @Test