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

Migrate to edison hal library for links

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-05 08:17:25 +02:00
parent 05a9cd115e
commit b25dae00d4
8 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,7 @@ public class LinkBuilderTest {
URI actual = builder
.method("sub")
.parameters("param_x")
.create()
.getHref();
.create();
assertEquals("http://example.com/base/main/param_x", actual.toString());
}
@@ -55,13 +54,12 @@ public class LinkBuilderTest {
public void shouldBuildPathOverSubResources() {
LinkBuilder builder = new LinkBuilder(uriInfo, Main.class, Sub.class);
URI actual = builder
URI actual = builder
.method("sub")
.parameters("param_x")
.method("x")
.parameters("param_y", "param_z")
.create()
.getHref();
.create();
assertEquals("http://example.com/base/main/param_x/sub/param_y/param_z", actual.toString());
}
@@ -72,8 +70,7 @@ public class LinkBuilderTest {
URI actual = builder
.method("get")
.parameters()
.create()
.getHref();
.create();
assertEquals("http://example.com/base", actual.toString());
}

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

@@ -15,7 +15,7 @@ import java.net.URISyntaxException;
import java.time.Instant;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,13 +26,12 @@ public class User2UserDtoMapperTest {
private final Subject subject = mock(Subject.class);
private ThreadState subjectThreadState = new SubjectThreadState(subject);
private URI baseUri;
private URI expextedBaseUri;
private URI expectedBaseUri;
@Before
public void init() throws URISyntaxException {
baseUri = new URI("http://example.com/base/");
expextedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
subjectThreadState.bind();
}
@@ -44,10 +43,10 @@ public class User2UserDtoMapperTest {
UserDto userDto = mapper.userToUserDto(user, uriInfo);
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());
assertEquals("expected self link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
assertEquals("expected delete link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("delete").get().getHref());
assertEquals("expected update link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("update").get().getHref());
assertEquals("expected create link", expectedBaseUri.toString(), userDto.getLinks().getLinkBy("create").get().getHref());
}
private User createDefaultUser() {
@@ -64,10 +63,10 @@ public class User2UserDtoMapperTest {
UserDto userDto = mapper.userToUserDto(user, uriInfo);
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"));
assertEquals("expected self link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
assertFalse("expected no delete link", userDto.getLinks().getLinkBy("delete").isPresent());
assertFalse("expected no update link", userDto.getLinks().getLinkBy("update").isPresent());
assertFalse("expected no create link", userDto.getLinks().getLinkBy("create").isPresent());
}
@Test