Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

Replace static access to ResourceLinks with injection

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-28 11:58:48 +02:00
parent 8eb544c966
commit dd72a00308
15 changed files with 128 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
View File

@@ -30,11 +30,12 @@ public class GroupCollectionToDtoMapperTest {
private final UriInfo uriInfo = mock(UriInfo.class);
private final UriInfoStore uriInfoStore = new UriInfoStore();
private final ResourceLinks resourceLinks = new ResourceLinks(uriInfoStore);
private final GroupToGroupDtoMapper groupToDtoMapper = mock(GroupToGroupDtoMapper.class);
private final Subject subject = mock(Subject.class);
private final ThreadState subjectThreadState = new SubjectThreadState(subject);
private final GroupCollectionToDtoMapper mapper = new GroupCollectionToDtoMapper(groupToDtoMapper, uriInfoStore);
private final GroupCollectionToDtoMapper mapper = new GroupCollectionToDtoMapper(groupToDtoMapper, resourceLinks);
private URI expectedBaseUri;

21
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
View File

@@ -10,6 +10,7 @@ import org.jboss.resteasy.mock.MockHttpResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -20,7 +21,6 @@ import sonia.scm.group.GroupManager;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -28,7 +28,9 @@ import java.net.URL;
import java.util.Collections;
import static java.util.Collections.singletonList;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doNothing;
@@ -47,10 +49,8 @@ public class GroupRootResourceTest {
private Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
@Mock
private UriInfo uriInfo;
@Mock
private UriInfoStore uriInfoStore;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ResourceLinks resourceLinks;
@Mock
private GroupManager groupManager;
@@ -70,15 +70,14 @@ public class GroupRootResourceTest {
when(groupManager.getPage(any(), eq(0), eq(10))).thenReturn(new PageResult<>(singletonList(group), 1));
when(groupManager.get("admin")).thenReturn(group);
GroupCollectionToDtoMapper groupCollectionToDtoMapper = new GroupCollectionToDtoMapper(groupToDtoMapper, uriInfoStore);
GroupCollectionResource groupCollectionResource = new GroupCollectionResource(groupManager, dtoToGroupMapper, groupCollectionToDtoMapper);
ResourceLinksMock.initMock(resourceLinks, URI.create("/"));
GroupCollectionToDtoMapper groupCollectionToDtoMapper = new GroupCollectionToDtoMapper(groupToDtoMapper, resourceLinks);
GroupCollectionResource groupCollectionResource = new GroupCollectionResource(groupManager, dtoToGroupMapper, groupCollectionToDtoMapper, resourceLinks);
GroupResource groupResource = new GroupResource(groupManager, groupToDtoMapper, dtoToGroupMapper);
GroupRootResource groupRootResource = new GroupRootResource(MockProvider.of(groupCollectionResource), MockProvider.of(groupResource));
dispatcher.getRegistry().addSingletonResource(groupRootResource);
when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));
when(uriInfoStore.get()).thenReturn(uriInfo);
}
@Test

13
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java
View File

@@ -7,11 +7,11 @@ import org.apache.shiro.util.ThreadState;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import sonia.scm.group.Group;
import javax.ws.rs.core.UriInfo;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.stream.IntStream;
@@ -24,10 +24,8 @@ import static org.mockito.MockitoAnnotations.initMocks;
public class GroupToGroupDtoMapperTest {
@Mock
private UriInfo uriInfo;
@Mock
private UriInfoStore uriInfoStore;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ResourceLinks resourceLinks;
@InjectMocks
private GroupToGroupDtoMapperImpl mapper;
@@ -42,9 +40,10 @@ public class GroupToGroupDtoMapperTest {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(GroupRootResource.GROUPS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
subjectThreadState.bind();
ResourceLinksMock.initMock(resourceLinks, baseUri);
ThreadContext.bind(subject);
}

26
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksMock.java Normal file
View File

@@ -0,0 +1,26 @@
package sonia.scm.api.v2.resources;
import java.net.URI;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
import static sonia.scm.api.v2.resources.GroupRootResource.GROUPS_PATH_V2;
import static sonia.scm.api.v2.resources.UserRootResource.USERS_PATH_V2;
public class ResourceLinksMock {
public static void initMock(ResourceLinks resourceLinks, URI baseUri) {
when(resourceLinks.user().self(anyString())).thenAnswer(invocation -> baseUri + USERS_PATH_V2 + invocation.getArguments()[0]);
when(resourceLinks.user().update(anyString())).thenAnswer(invocation -> baseUri + USERS_PATH_V2 + invocation.getArguments()[0]);
when(resourceLinks.user().delete(anyString())).thenAnswer(invocation -> baseUri + USERS_PATH_V2 + invocation.getArguments()[0]);
when(resourceLinks.userCollection().self()).thenAnswer(invocation -> baseUri + USERS_PATH_V2);
when(resourceLinks.userCollection().create()).thenAnswer(invocation -> baseUri + USERS_PATH_V2);
when(resourceLinks.group().self(anyString())).thenAnswer(invocation -> baseUri + GROUPS_PATH_V2 + invocation.getArguments()[0]);
when(resourceLinks.group().update(anyString())).thenAnswer(invocation -> baseUri + GROUPS_PATH_V2 + invocation.getArguments()[0]);
when(resourceLinks.group().delete(anyString())).thenAnswer(invocation -> baseUri + GROUPS_PATH_V2 + invocation.getArguments()[0]);
when(resourceLinks.groupCollection().self()).thenAnswer(invocation -> baseUri + GROUPS_PATH_V2);
when(resourceLinks.groupCollection().create()).thenAnswer(invocation -> baseUri + GROUPS_PATH_V2);
}
}

37
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java
View File

@@ -2,85 +2,92 @@ package sonia.scm.api.v2.resources;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import javax.ws.rs.core.UriInfo;
import java.net.URI;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static sonia.scm.api.v2.resources.ResourceLinks.group;
import static sonia.scm.api.v2.resources.ResourceLinks.user;
import static sonia.scm.api.v2.resources.ResourceLinks.userCollection;
import static org.mockito.MockitoAnnotations.initMocks;
public class ResourceLinksTest {
private static final String BASE_URL = "http://example.com/";
private UriInfo uriInfo = mock(UriInfo.class);
@Mock
private UriInfoStore uriInfoStore;
@Mock
private UriInfo uriInfo;
@InjectMocks
private ResourceLinks resourceLinks;
@Test
public void shouldCreateCorrectUserSelfUrl() {
String url = user(uriInfo).self("ich");
String url = resourceLinks.user().self("ich");
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserDeleteUrl() {
String url = user(uriInfo).delete("ich");
String url = resourceLinks.user().delete("ich");
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserUpdateUrl() {
String url = user(uriInfo).update("ich");
String url = resourceLinks.user().update("ich");
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserCreateUrl() {
String url = userCollection(uriInfo).create();
String url = resourceLinks.userCollection().create();
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2, url);
}
@Test
public void shouldCreateCorrectUserCollectionUrl() {
String url = userCollection(uriInfo).self();
String url = resourceLinks.userCollection().self();
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2, url);
}
@Test
public void shouldCreateCorrectGroupSelfUrl() {
String url = group(uriInfo).self("nobodies");
String url = resourceLinks.group().self("nobodies");
assertEquals(BASE_URL + GroupRootResource.GROUPS_PATH_V2 + "nobodies", url);
}
@Test
public void shouldCreateCorrectGroupDeleteUrl() {
String url = group(uriInfo).delete("nobodies");
String url = resourceLinks.group().delete("nobodies");
assertEquals(BASE_URL + GroupRootResource.GROUPS_PATH_V2 + "nobodies", url);
}
@Test
public void shouldCreateCorrectGroupUpdateUrl() {
String url = group(uriInfo).update("nobodies");
String url = resourceLinks.group().update("nobodies");
assertEquals(BASE_URL + GroupRootResource.GROUPS_PATH_V2 + "nobodies", url);
}
@Test
public void shouldCreateCorrectGroupCreateUrl() {
String url = ResourceLinks.groupCollection(uriInfo).create();
String url = resourceLinks.groupCollection().create();
assertEquals(BASE_URL + GroupRootResource.GROUPS_PATH_V2, url);
}
@Test
public void shouldCreateCorrectGroupCollectionUrl() {
String url = ResourceLinks.groupCollection(uriInfo).self();
String url = resourceLinks.groupCollection().self();
assertEquals(BASE_URL + GroupRootResource.GROUPS_PATH_V2, url);
}
@Before
public void initUriInfo() {
initMocks(this);
when(uriInfoStore.get()).thenReturn(uriInfo);
when(uriInfo.getBaseUri()).thenReturn(URI.create(BASE_URL));
}
}

15
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java
View File

@@ -7,12 +7,12 @@ import org.apache.shiro.util.ThreadContext;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import sonia.scm.PageResult;
import sonia.scm.user.User;
import javax.ws.rs.core.UriInfo;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
@@ -28,14 +28,12 @@ import static sonia.scm.PageResult.createPage;
public class UserCollectionToDtoMapperTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ResourceLinks resourceLinks;
@Mock
private UriInfo uriInfo;
private UserToUserDtoMapper userToDtoMapper;
@Mock
private UriInfoStore uriInfoStore;
@Mock
private UserToUserDtoMapper userToDtoMapper;
@Mock
private Subject subject;
private Subject subject;
@InjectMocks
private SubjectThreadState subjectThreadState;
@@ -49,8 +47,7 @@ public class UserCollectionToDtoMapperTest {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserRootResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
ResourceLinksMock.initMock(resourceLinks, baseUri);
subjectThreadState.bind();
ThreadContext.bind(subject);
}

16
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
View File

@@ -11,6 +11,7 @@ import org.jboss.resteasy.mock.MockHttpResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -21,7 +22,6 @@ import sonia.scm.user.UserManager;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -51,10 +51,8 @@ public class UserRootResourceTest {
private Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
@Mock
private UriInfo uriInfo;
@Mock
private UriInfoStore uriInfoStore;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ResourceLinks resourceLinks;
@Mock
private PasswordService passwordService;
@@ -75,16 +73,16 @@ public class UserRootResourceTest {
doNothing().when(userManager).modify(userCaptor.capture());
doNothing().when(userManager).delete(userCaptor.capture());
UserCollectionToDtoMapper userCollectionToDtoMapper = new UserCollectionToDtoMapper(userToDtoMapper, uriInfoStore);
ResourceLinksMock.initMock(resourceLinks, URI.create("/"));
UserCollectionToDtoMapper userCollectionToDtoMapper = new UserCollectionToDtoMapper(userToDtoMapper, resourceLinks);
UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper,
userCollectionToDtoMapper);
userCollectionToDtoMapper, resourceLinks);
UserResource userResource = new UserResource(dtoToUserMapper, userToDtoMapper, userManager);
UserRootResource userRootResource = new UserRootResource(MockProvider.of(userCollectionResource),
MockProvider.of(userResource));
dispatcher.getRegistry().addSingletonResource(userRootResource);
when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));
when(uriInfoStore.get()).thenReturn(uriInfo);
}
@Test

11
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
View File

@@ -7,12 +7,12 @@ import org.apache.shiro.util.ThreadState;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import sonia.scm.api.rest.resources.UserResource;
import sonia.scm.user.User;
import javax.ws.rs.core.UriInfo;
import java.net.URI;
import java.net.URISyntaxException;
import java.time.Instant;
@@ -25,10 +25,8 @@ import static org.mockito.MockitoAnnotations.initMocks;
public class UserToUserDtoMapperTest {
@Mock
private UriInfo uriInfo;
@Mock
private UriInfoStore uriInfoStore;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ResourceLinks resourceLinks;
@InjectMocks
private UserToUserDtoMapperImpl mapper;
@@ -43,9 +41,8 @@ public class UserToUserDtoMapperTest {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserRootResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
subjectThreadState.bind();
ResourceLinksMock.initMock(resourceLinks, baseUri);
ThreadContext.bind(subject);
}