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

Mob review

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-14 08:05:29 +02:00
parent b9f1a200fa
commit 838777b403
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ public class User2UserDtoMapperTest {
User user = createDefaultUser();
when(subject.isPermitted("user:modify:abc")).thenReturn(true);
UserDto userDto = mapper.userToUserDto(user, uriInfo);
UserDto userDto = mapper.map(user, uriInfo);
assertEquals("expected self link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
assertEquals("expected update link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("update").get().getHref());
@@ -60,7 +60,7 @@ public class User2UserDtoMapperTest {
User user = createDefaultUser();
when(subject.isPermitted("user:delete:abc")).thenReturn(true);
UserDto userDto = mapper.userToUserDto(user, uriInfo);
UserDto userDto = mapper.map(user, uriInfo);
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());
@@ -78,7 +78,7 @@ public class User2UserDtoMapperTest {
User user = createDefaultUser();
when(subject.hasRole("user")).thenReturn(true);
UserDto userDto = mapper.userToUserDto(user, uriInfo);
UserDto userDto = mapper.map(user, uriInfo);
assertEquals("expected self link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
assertFalse("expected no delete link", userDto.getLinks().getLinkBy("delete").isPresent());
@@ -89,7 +89,7 @@ public class User2UserDtoMapperTest {
public void shouldMapFields() {
User user = createDefaultUser();
UserDto userDto = mapper.userToUserDto(user, uriInfo);
UserDto userDto = mapper.map(user, uriInfo);
assertEquals("abc", userDto.getName());
}
@@ -99,7 +99,7 @@ public class User2UserDtoMapperTest {
User user = createDefaultUser();
user.setPassword("password");
UserDto userDto = mapper.userToUserDto(user, uriInfo);
UserDto userDto = mapper.map(user, uriInfo);
assertEquals(UserResource.DUMMY_PASSWORT, userDto.getPassword());
}
@@ -112,7 +112,7 @@ public class User2UserDtoMapperTest {
user.setCreationDate(expectedCreationDate.toEpochMilli());
user.setLastModified(expectedModificationDate.toEpochMilli());
UserDto userDto = mapper.userToUserDto(user, uriInfo);
UserDto userDto = mapper.map(user, uriInfo);
assertEquals(expectedCreationDate, userDto.getCreationDate());
assertEquals(expectedModificationDate, userDto.getLastModified().get());

20
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollection2DtoMapperTest.java
View File

@@ -19,7 +19,9 @@ import java.util.Collection;
import java.util.List;
import static java.util.stream.Collectors.toList;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -51,28 +53,28 @@ public class UserCollection2DtoMapperTest {
@Test
public void shouldSetPageNumber() {
PageResult<User> pageResult = mockPageResult(true, "Hannes");
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 1, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
assertEquals(1, userCollectionDto.getPage());
}
@Test
public void shouldHaveSelfLink() {
PageResult<User> pageResult = mockPageResult(true, "Hannes");
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 1, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
assertTrue(userCollectionDto.getLinks().getLinkBy("self").get().getHref().startsWith(expectedBaseUri.toString()));
}
@Test
public void shouldCreateNextPageLink_whenHasMore() {
PageResult<User> pageResult = mockPageResult(true, "Hannes");
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 1, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
assertTrue(userCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=2"));
}
@Test
public void shouldNotCreateNextPageLink_whenNoMore() {
PageResult<User> pageResult = mockPageResult(false, "Hannes");
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 1, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
assertFalse(userCollectionDto.getLinks().stream().anyMatch(link -> link.getHref().contains("page=2")));
}
@@ -81,7 +83,7 @@ public class UserCollection2DtoMapperTest {
PageResult<User> pageResult = mockPageResult(false, "Hannes");
when(subject.isPermitted("user:create")).thenReturn(true);
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 1, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
assertTrue(userCollectionDto.getLinks().getLinkBy("create").isPresent());
}
@@ -91,7 +93,7 @@ public class UserCollection2DtoMapperTest {
PageResult<User> pageResult = mockPageResult(false, "Hannes");
when(subject.isPermitted("user:create")).thenReturn(false);
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 1, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
assertFalse(userCollectionDto.getLinks().getLinkBy("create").isPresent());
}
@@ -99,7 +101,7 @@ public class UserCollection2DtoMapperTest {
@Test
public void shouldMapUsers() {
PageResult<User> pageResult = mockPageResult(false, "Hannes", "Wurst");
UserCollectionDto userCollectionDto = mapper.userCollectionToDto(uriInfo, 1, 2, pageResult);
UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 2, pageResult);
List<HalRepresentation> users = userCollectionDto.getEmbedded().getItemsBy("users");
assertEquals(2, users.size());
assertEquals("Hannes", ((UserDto) users.get(0)).getName());
@@ -114,7 +116,7 @@ public class UserCollection2DtoMapperTest {
private User mockUserWithDto(String userName) {
User user = new User();
user.setName(userName);
when(userToDtoMapper.userToUserDto(user, uriInfo)).thenReturn(createUserDto(user));
when(userToDtoMapper.map(user, uriInfo)).thenReturn(createUserDto(user));
return user;
}

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserDto2UserMapperTest.java
View File

@@ -24,7 +24,7 @@ public class UserDto2UserMapperTest {
@Test
public void shouldMapFields() {
UserDto dto = createDefaultDto();
User user = mapper.userDtoToUser(dto, "original password");
User user = mapper.map(dto, "original password");
assertEquals("abc" , user.getName());
}
@@ -34,7 +34,7 @@ public class UserDto2UserMapperTest {
UserDto dto = createDefaultDto();
dto.setPassword("unencrypted");
User user = mapper.userDtoToUser(dto, "original password");
User user = mapper.map(dto, "original password");
assertEquals("encrypted" , user.getPassword());
}