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

Correct resource path

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-01 11:21:13 +02:00
parent 9ac4c6744a
commit f614ee3bb4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java
View File

@@ -6,9 +6,10 @@ import com.google.inject.Singleton;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@Singleton @Singleton
@Path("v2/users") @Path(UserNewResource.USERS_PATH_V2)
public class UserNewResource { public class UserNewResource {
public static final String USERS_PATH_V2 = "v2/users/";
private final UserCollectionResource userCollectionResource; private final UserCollectionResource userCollectionResource;
private final UserSubResource userSubResource; private final UserSubResource userSubResource;

12
scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java
View File

@@ -26,10 +26,12 @@ public class User2UserDtoMapperTest {
private ThreadState subjectThreadState = new SubjectThreadState(subject); private ThreadState subjectThreadState = new SubjectThreadState(subject);
private URI baseUri; private URI baseUri;
private URI expextedBaseUri;
@Before @Before
public void init() throws URISyntaxException { public void init() throws URISyntaxException {
baseUri = new URI("http://example.com/base/"); baseUri = new URI("http://example.com/base/");
expextedBaseUri = baseUri.resolve(UserNewResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri); when(uriInfo.getBaseUri()).thenReturn(baseUri);
subjectThreadState.bind(); subjectThreadState.bind();
} }
@@ -42,10 +44,10 @@ public class User2UserDtoMapperTest {
UserDto userDto = mapper.userToUserDto(user, uriInfo); UserDto userDto = mapper.userToUserDto(user, uriInfo);
assertEquals("expected map with self baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("self").getHref()); assertEquals("expected map with self baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("self").getHref());
assertEquals("expected map with delete baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("delete").getHref()); assertEquals("expected map with delete baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("delete").getHref());
assertEquals("expected map with update baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("update").getHref()); assertEquals("expected map with update baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("update").getHref());
assertEquals("expected map with create baseUri", baseUri.resolve("v2/users"), userDto.getLinks().get("create").getHref()); assertEquals("expected map with create baseUri", expextedBaseUri, userDto.getLinks().get("create").getHref());
} }
@Test @Test
@@ -56,7 +58,7 @@ public class User2UserDtoMapperTest {
UserDto userDto = mapper.userToUserDto(user, uriInfo); UserDto userDto = mapper.userToUserDto(user, uriInfo);
assertEquals("expected map with self baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("self").getHref()); assertEquals("expected map with self baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("self").getHref());
assertNull("expected map without delete baseUri", userDto.getLinks().get("delete")); assertNull("expected map without delete baseUri", userDto.getLinks().get("delete"));
assertNull("expected map without update baseUri", userDto.getLinks().get("update")); assertNull("expected map without update baseUri", userDto.getLinks().get("update"));
assertNull("expected map without create baseUri", userDto.getLinks().get("create")); assertNull("expected map without create baseUri", userDto.getLinks().get("create"));