diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java index 5b72ed3094..6eeb7a8cc6 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java @@ -6,9 +6,10 @@ import com.google.inject.Singleton; import javax.ws.rs.Path; @Singleton -@Path("v2/users") +@Path(UserNewResource.USERS_PATH_V2) public class UserNewResource { + public static final String USERS_PATH_V2 = "v2/users/"; private final UserCollectionResource userCollectionResource; private final UserSubResource userSubResource; diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java index a5fb671121..c9b8ea36c9 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java @@ -26,10 +26,12 @@ public class User2UserDtoMapperTest { private ThreadState subjectThreadState = new SubjectThreadState(subject); private URI baseUri; + private URI expextedBaseUri; @Before public void init() throws URISyntaxException { baseUri = new URI("http://example.com/base/"); + expextedBaseUri = baseUri.resolve(UserNewResource.USERS_PATH_V2 + "/"); when(uriInfo.getBaseUri()).thenReturn(baseUri); subjectThreadState.bind(); } @@ -42,10 +44,10 @@ public class User2UserDtoMapperTest { 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 delete baseUri", baseUri.resolve("v2/users/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 create baseUri", baseUri.resolve("v2/users"), userDto.getLinks().get("create").getHref()); + assertEquals("expected map with self baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("self").getHref()); + assertEquals("expected map with delete baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("delete").getHref()); + assertEquals("expected map with update baseUri", expextedBaseUri.resolve("abc"), userDto.getLinks().get("update").getHref()); + assertEquals("expected map with create baseUri", expextedBaseUri, userDto.getLinks().get("create").getHref()); } @Test @@ -56,7 +58,7 @@ public class User2UserDtoMapperTest { 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 update baseUri", userDto.getLinks().get("update")); assertNull("expected map without create baseUri", userDto.getLinks().get("create"));