Skip to content

Commit 3961bb6

Browse files
committed
SiteServiceTest: replaced own method to using TestObjects.createUser()
No functional changes.
1 parent 48e66d2 commit 3961bb6

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

src/test/java/ru/mystamps/web/service/SiteServiceTest.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
package ru.mystamps.web.service;
1919

20-
import java.util.Date;
21-
2220
import org.junit.Before;
2321
import org.junit.Test;
2422
import org.junit.runner.RunWith;
@@ -144,7 +142,7 @@ public void logAboutAbsentPageShouldPassNullToDaoForUnknownUser() {
144142

145143
@Test
146144
public void logAboutAbsentPageShouldPassUserToDao() {
147-
User user = getUser();
145+
User user = TestObjects.createUser();
148146
when(suspiciousActivityTypeDao.findByName(anyString()))
149147
.thenReturn(TestObjects.createPageNotFoundActivityType());
150148

@@ -306,7 +304,7 @@ public void logAboutFailedAuthenticationShouldPassNullToDaoForUnknownUser() {
306304

307305
@Test
308306
public void logAboutFailedAuthenticationShouldPassUserToDao() {
309-
User user = getUser();
307+
User user = TestObjects.createUser();
310308
when(suspiciousActivityTypeDao.findByName(anyString()))
311309
.thenReturn(TestObjects.createAuthFailedActivityType());
312310

@@ -389,19 +387,4 @@ public void logAboutFailedAuthenticationShouldPassEmptyStringToDaoForUnknownUser
389387
assertThat(activityCaptor.getValue().getUserAgent()).isEmpty();
390388
}
391389

392-
private User getUser() {
393-
final Integer anyId = 777;
394-
User user = new User();
395-
user.setId(anyId);
396-
user.setLogin("test");
397-
user.setName("Test Name");
398-
user.setEmail("test@example.org");
399-
user.setRegisteredAt(new Date());
400-
user.setActivatedAt(new Date());
401-
user.setHash("da00ec2e6ff9ed4d342b24a16e262c82f3c8b10b");
402-
user.setSalt("salt");
403-
404-
return user;
405-
}
406-
407390
}

0 commit comments

Comments
 (0)