From cc4bd47c20ef0b925be723d49721ae9fd45fcfe1 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Wed, 16 Oct 2024 12:25:44 +0200
Subject: [PATCH] OZG-6897 vararg
---
.../java/de/ozgcloud/user/UserResourceMapperTest.java | 10 ++++------
.../java/de/ozgcloud/user/UserResourceTestFactory.java | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java
index 4dc12306..effcd756 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java
@@ -181,8 +181,6 @@ class UserResourceMapperTest {
@DisplayName("Map organisations einheit ids")
@Nested
class TestMapOrganisationsEinheitIds {
- private UserResource userResource;
-
static final String ORGANISATIONS_EINHEIT_ID_3 = "6287";
private final GroupRepresentation group1 = GroupRepresentationTestFactory.createByPathAndOrganisationEinheitIds(
GROUP_1_PATH, ORGANISATIONS_EINHEIT_ID_1, ORGANISATIONS_EINHEIT_ID_3);
@@ -196,7 +194,7 @@ class UserResourceMapperTest {
@Test
void shouldMapOrganisationsEinheitIdsFromSingleGroup() {
- userResource = UserResourceTestFactory.createWithGroups(List.of(group1));
+ var userResource = UserResourceTestFactory.createWithGroups(group1);
when(realm.getGroupByPath(GROUP_1_PATH)).thenReturn(group1);
var result = mapper.mapOrganisationsEinheitIds(userResource);
@@ -206,7 +204,7 @@ class UserResourceMapperTest {
@Test
void shouldMapOrganisationsEinheitIdsFromGroups() {
- userResource = UserResourceTestFactory.createWithGroups(List.of(group1, group2));
+ var userResource = UserResourceTestFactory.createWithGroups(group1, group2);
when(realm.getGroupByPath(GROUP_1_PATH)).thenReturn(group1);
when(realm.getGroupByPath(GROUP_2_PATH)).thenReturn(group2);
@@ -222,7 +220,7 @@ class UserResourceMapperTest {
@Test
void shouldMapOrganisationsEinheitIdsFromUser() {
var attributes = Map.of(ORGANISATIONS_EINHEIT_ID_KEY, List.of(ORGANISATIONS_EINHEIT_ID_1, ORGANISATIONS_EINHEIT_ID_2));
- userResource = UserResourceTestFactory.createWithAttributes(attributes);
+ var userResource = UserResourceTestFactory.createWithAttributes(attributes);
var result = mapper.mapOrganisationsEinheitIds(userResource);
@@ -231,7 +229,7 @@ class UserResourceMapperTest {
@Test
void shouldReturnEmptyIfNoOrganisationsEinheitIds() {
- userResource = UserResourceTestFactory.create();
+ var userResource = UserResourceTestFactory.create();
var result = mapper.mapOrganisationsEinheitIds(userResource);
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java
index 8de656cf..2f13398a 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java
@@ -39,7 +39,7 @@ public class UserResourceTestFactory {
return new UserResourceStub(attributes);
}
- public static UserResource createWithGroups(List<GroupRepresentation> groups) {
- return new UserResourceStub(groups);
+ public static UserResource createWithGroups(GroupRepresentation... groups) {
+ return new UserResourceStub(List.of(groups));
}
}
--
GitLab