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

Merge branch 2.0.0-M3 into bugfix_illegal_sortby

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-07-04 13:17:19 +02:00
parent d26f4bb265 ad60bae74e
commit 537006e455
5 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserDtoToUserMapperTest.java
View File

@@ -8,7 +8,6 @@ import org.mockito.Mock;
import sonia.scm.user.User;
import java.time.Instant;
import java.util.Optional;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
@@ -47,7 +46,7 @@ public class UserDtoToUserMapperTest {
UserDto dto = new UserDto();
dto.setName("abc");
dto.setCreationDate(Instant.now());
dto.setLastModified(Optional.empty());
dto.setLastModified(null);
return dto;
}
}

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

@@ -122,6 +122,6 @@ public class UserToUserDtoMapperTest {
UserDto userDto = mapper.map(user);
assertEquals(expectedCreationDate, userDto.getCreationDate());
assertEquals(expectedModificationDate, userDto.getLastModified().get());
assertEquals(expectedModificationDate, userDto.getLastModified());
}
}