From e1b3efb5ff33b1f888018c3d8139e5c3e27a1000 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Thu, 26 Jul 2018 13:14:08 +0200
Subject: [PATCH] Fixed unit test

---
 .../sonia/scm/api/v2/resources/UserToUserDtoMapper.java    | 6 ++++++
 .../java/sonia/scm/api/v2/resources/MeResourceTest.java    | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java
index 85973bab75..00aba5a700 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java
@@ -1,5 +1,6 @@
 package sonia.scm.api.v2.resources;
 
+import com.google.common.annotations.VisibleForTesting;
 import de.otto.edison.hal.Links;
 import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
@@ -21,6 +22,11 @@ public abstract class UserToUserDtoMapper extends BaseMapper<User, UserDto> {
   @Inject
   private ResourceLinks resourceLinks;
 
+  @VisibleForTesting
+  void setResourceLinks(ResourceLinks resourceLinks) {
+    this.resourceLinks = resourceLinks;
+  }
+
   @AfterMapping
   void removePassword(@MappingTarget UserDto target) {
     target.setPassword(UserResource.DUMMY_PASSWORT);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
index 8c08a433f5..56c60098fb 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
@@ -39,8 +39,6 @@ import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 @SubjectAware(
-//  username = "trillian",
-//  password = "secret",
   configuration = "classpath:sonia/scm/repository/shiro.ini"
 )
 public class MeResourceTest {
@@ -50,6 +48,8 @@ public class MeResourceTest {
 
   private Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
 
+
+  private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(URI.create("/"));
   @Mock
   private UriInfo uriInfo;
   @Mock
@@ -67,9 +67,10 @@ public class MeResourceTest {
   public void prepareEnvironment() throws IOException, UserException {
     initMocks(this);
     createDummyUser("trillian");
-    doNothing().when(userManager).create(userCaptor.capture());
+    when(userManager.create(userCaptor.capture())).thenAnswer(invocation -> invocation.getArguments()[0]);
     doNothing().when(userManager).modify(userCaptor.capture());
     doNothing().when(userManager).delete(userCaptor.capture());
+    userToDtoMapper.setResourceLinks(resourceLinks);
     MeResource meResource = new MeResource(userToDtoMapper, userManager);
     dispatcher.getRegistry().addSingletonResource(meResource);
     when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));