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

Renames User resource classes

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-06-21 10:24:02 +02:00
parent 26b3608c5d
commit 0df7156da0
8 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,31 +22,31 @@ public class ResourceLinksTest {
@Test
public void shouldCreateCorrectUserSelfUrl() {
String url = user(uriInfo).self("ich");
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2 + "ich", url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserDeleteUrl() {
String url = user(uriInfo).delete("ich");
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2 + "ich", url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserUpdateUrl() {
String url = user(uriInfo).update("ich");
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2 + "ich", url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserCreateUrl() {
String url = userCollection(uriInfo).create();
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2, url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2, url);
}
@Test
public void shouldCreateCorrectUserCollectionUrl() {
String url = userCollection(uriInfo).self();
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2, url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2, url);
}
@Test

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

@@ -48,7 +48,7 @@ public class UserCollectionToDtoMapperTest {
public void init() throws URISyntaxException {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
expectedBaseUri = baseUri.resolve(UserRootResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
subjectThreadState.bind();

18
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserV2ResourceTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
View File

@@ -43,7 +43,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
password = "secret",
configuration = "classpath:sonia/scm/repository/shiro.ini"
)
public class UserV2ResourceTest {
public class UserRootResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
@@ -78,17 +78,17 @@ public class UserV2ResourceTest {
userCollectionToDtoMapper = new UserCollectionToDtoMapper(userToDtoMapper, uriInfoStore);
UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper, userToDtoMapper, userCollectionToDtoMapper);
UserSubResource userSubResource = new UserSubResource(dtoToUserMapper, userToDtoMapper, userManager);
UserV2Resource userV2Resource = new UserV2Resource(userCollectionResource, userSubResource);
UserResource userResource = new UserResource(dtoToUserMapper, userToDtoMapper, userManager);
UserRootResource userRootResource = new UserRootResource(userCollectionResource, userResource);
dispatcher.getRegistry().addSingletonResource(userV2Resource);
dispatcher.getRegistry().addSingletonResource(userRootResource);
when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));
when(uriInfoStore.get()).thenReturn(uriInfo);
}
@Test
public void shouldCreateFullResponseForAdmin() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest.get("/" + UserV2Resource.USERS_PATH_V2 + "Neo");
MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
@@ -104,7 +104,7 @@ public class UserV2ResourceTest {
@Test
@SubjectAware(username = "unpriv")
public void shouldCreateLimitedResponseForSimpleUser() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest.get("/" + UserV2Resource.USERS_PATH_V2);
MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2);
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
@@ -119,7 +119,7 @@ public class UserV2ResourceTest {
@Test
@SubjectAware(username = "unpriv")
public void shouldNotGetSingleUserForSimpleUser() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest.get("/" + UserV2Resource.USERS_PATH_V2 + "Neo");
MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
@@ -133,7 +133,7 @@ public class UserV2ResourceTest {
byte[] userJson = Resources.toByteArray(url);
MockHttpRequest request = MockHttpRequest
.post("/" + UserV2Resource.USERS_PATH_V2)
.post("/" + UserRootResource.USERS_PATH_V2)
.contentType(VndMediaType.USER)
.content(userJson);
MockHttpResponse response = new MockHttpResponse();
@@ -150,7 +150,7 @@ public class UserV2ResourceTest {
@Test
public void shouldFailForMissingContent() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest
.post("/" + UserV2Resource.USERS_PATH_V2)
.post("/" + UserRootResource.USERS_PATH_V2)
.contentType(VndMediaType.USER)
.content(new byte[] {});
MockHttpResponse response = new MockHttpResponse();

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

@@ -42,7 +42,7 @@ public class UserToUserDtoMapperTest {
public void init() throws URISyntaxException {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
expectedBaseUri = baseUri.resolve(UserRootResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
subjectThreadState.bind();