Extracted method UserServiceTest.getValidUser() -> TestObjects.createUser()

No functional changes.

Author: php-coder

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

@@ -62,7 +62,7 @@ public void setUp() {
 		form = new AddCountryForm();
 		form.setName("Any country name");
 
-		user = UserServiceTest.getValidUser();
+		user = TestObjects.createUser();
 
 		service = new CountryServiceImpl(countryDao);
 	}

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

@@ -88,7 +88,7 @@ public void setUp() {
 		form.setQuantity(2);
 		form.setPerforated(false);
 
-		user = UserServiceTest.getValidUser();
+		user = TestObjects.createUser();
 
 		when(imageService.save(any(MultipartFile.class))).thenReturn("/fake/path/to/image");
 

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

@@ -21,6 +21,7 @@
 
 import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.SuspiciousActivityType;
+import ru.mystamps.web.entity.User;
 import ru.mystamps.web.entity.UsersActivation;
 
 final class TestObjects {
@@ -30,7 +31,15 @@ final class TestObjects {
 
 	private static final String TEST_EMAIL          = "test@example.org";
 	private static final String TEST_ACTIVATION_KEY = "1234567890";
-	
+
+	private static final String TEST_NAME           = "Test Name";
+	private static final String TEST_LOGIN          = "test";
+	private static final String TEST_SALT           = "salt";
+	protected static final String TEST_PASSWORD     = "secret";
+
+	// sha1(TEST_SALT + "{" + TEST_PASSWORD + "}")
+	private static final String TEST_HASH           = "b0dd94c84e784ddb1e9a83c8a2e8f403846647b9";
+
 	private TestObjects() {
 	}
 
@@ -52,6 +61,21 @@ public static UsersActivation createUsersActivation() {
 		return activation;
 	}
 
+	public static User createUser() {
+		final Integer anyId = 777;
+		User user = new User();
+		user.setId(anyId);
+		user.setLogin(TEST_LOGIN);
+		user.setName(TEST_NAME);
+		user.setEmail(TEST_EMAIL);
+		user.setRegisteredAt(new Date());
+		user.setActivatedAt(new Date());
+		user.setHash(TEST_HASH);
+		user.setSalt(TEST_SALT);
+
+		return user;
+	}
+	
 	public static SuspiciousActivityType createPageNotFoundActivityType() {
 		SuspiciousActivityType type = new SuspiciousActivityType();
 		type.setId(1);

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

@@ -51,16 +51,6 @@
 @RunWith(MockitoJUnitRunner.class)
 public class UserServiceTest {
 
-	private static final String TEST_NAME           = "Test Name";
-	private static final String TEST_LOGIN          = "test";
-	private static final String TEST_PASSWORD       = "secret";
-	private static final String TEST_SALT           = "salt";
-	
-	// sha1(TEST_SALT + "{" + TEST_PASSWORD + "}")
-	private static final String TEST_HASH           = "b0dd94c84e784ddb1e9a83c8a2e8f403846647b9";
-	
-	private static final String TEST_EMAIL          = "test@example.org";
-	
 	@Mock
 	private UserDao userDao;
 
@@ -82,7 +72,7 @@ public class UserServiceTest {
 
 	@Before
 	public void setUp() {
-		User user = getValidUser();
+		User user = TestObjects.createUser();
 
 		when(encoder.encodePassword(anyString(), anyString())).thenReturn(user.getHash());
 
@@ -94,7 +84,7 @@ public void setUp() {
 
 		activationForm = new ActivateAccountForm();
 		activationForm.setLogin(user.getLogin());
-		activationForm.setPassword(TEST_PASSWORD);
+		activationForm.setPassword(TestObjects.TEST_PASSWORD);
 		activationForm.setName(user.getName());
 		activationForm.setActivationKey(activation.getActivationKey());
 
@@ -332,14 +322,14 @@ public void registerUserShouldThrowExceptionWhenPasswordIsNull() {
 
 	@Test
 	public void registerUserShouldGetsHashFromEncoder() {
-		String expectedHash = getValidUser().getHash();
+		String expectedHash = TestObjects.createUser().getHash();
 
 		when(encoder.encodePassword(anyString(), anyString())).thenReturn(expectedHash);
 
 		service.registerUser(activationForm);
 
 		verify(userDao).save(userCaptor.capture());
-		verify(encoder).encodePassword(eq(TEST_PASSWORD), anyString());
+		verify(encoder).encodePassword(eq(TestObjects.TEST_PASSWORD), anyString());
 
 		String actualHash = userCaptor.getValue().getHash();
 		assertThat(actualHash).isEqualTo(expectedHash);
@@ -390,7 +380,7 @@ public void findByLoginShouldThrowExceptionWhenLoginIsNull() {
 
 	@Test
 	public void findByLoginShouldCallDao() {
-		User expectedUser = getValidUser();
+		User expectedUser = TestObjects.createUser();
 		when(userDao.findByLogin(anyString())).thenReturn(expectedUser);
 
 		User user = service.findByLogin("any-login");
@@ -405,19 +395,4 @@ public void findByLoginShouldPassLoginToDao() {
 		verify(userDao).findByLogin("john");
 	}
 
-	static User getValidUser() {
-		final Integer anyId = 777;
-		User user = new User();
-		user.setId(anyId);
-		user.setLogin(TEST_LOGIN);
-		user.setName(TEST_NAME);
-		user.setEmail(TEST_EMAIL);
-		user.setRegisteredAt(new Date());
-		user.setActivatedAt(new Date());
-		user.setHash(TEST_HASH);
-		user.setSalt(TEST_SALT);
-		
-		return user;
-	}
-	
 }