From fb3a94cf040f3ab96331fdb4df1de688546f4bd1 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 6 Mar 2020 20:58:57 +0100 Subject: [PATCH] changed role representation to enum --- src/main/java/mops/gruppen2/domain/Admin.java | 4 ---- src/main/java/mops/gruppen2/domain/Org.java | 4 ---- src/main/java/mops/gruppen2/domain/Role.java | 4 ++-- src/test/java/mops/gruppen2/domain/GroupTest.java | 5 ++--- 4 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 src/main/java/mops/gruppen2/domain/Admin.java delete mode 100644 src/main/java/mops/gruppen2/domain/Org.java diff --git a/src/main/java/mops/gruppen2/domain/Admin.java b/src/main/java/mops/gruppen2/domain/Admin.java deleted file mode 100644 index 2b03dae..0000000 --- a/src/main/java/mops/gruppen2/domain/Admin.java +++ /dev/null @@ -1,4 +0,0 @@ -package mops.gruppen2.domain; - -public class Admin extends Role { -} diff --git a/src/main/java/mops/gruppen2/domain/Org.java b/src/main/java/mops/gruppen2/domain/Org.java deleted file mode 100644 index 4780b5b..0000000 --- a/src/main/java/mops/gruppen2/domain/Org.java +++ /dev/null @@ -1,4 +0,0 @@ -package mops.gruppen2.domain; - -public class Org extends Role { -} diff --git a/src/main/java/mops/gruppen2/domain/Role.java b/src/main/java/mops/gruppen2/domain/Role.java index c62431e..4d97579 100644 --- a/src/main/java/mops/gruppen2/domain/Role.java +++ b/src/main/java/mops/gruppen2/domain/Role.java @@ -1,5 +1,5 @@ package mops.gruppen2.domain; -public class Role { - +public enum Role { + ORGA, ADMIN } diff --git a/src/test/java/mops/gruppen2/domain/GroupTest.java b/src/test/java/mops/gruppen2/domain/GroupTest.java index 3892b9e..4541830 100644 --- a/src/test/java/mops/gruppen2/domain/GroupTest.java +++ b/src/test/java/mops/gruppen2/domain/GroupTest.java @@ -67,18 +67,17 @@ class GroupTest { void updateRoleForExistingUser() { // Arrange Group group = new Group(); - Org org = new Org(); group.applyEvent(new CreateGroupEvent(1L, 1L, "1L", "gruppe1", "Eine Testgruppe")); group.applyEvent(new AddUserEvent(1L, 1L, "5L", "Peter", "Pan", "123@mail.de")); // Act - group.applyEvent(new UpdateRoleEvent(1L, 1L, "5L", org)); + group.applyEvent(new UpdateRoleEvent(1L, 1L, "5L", Role.ORGA)); // Assert assertThat(group.getRoles()) .containsOnlyKeys(group.getMembers().get(0)) - .containsValue(org); + .containsValue(Role.ORGA); } }