Extracted method: UserServiceTest.getUsersActivation() -> TestObjects.createUsersActivation()

No functional changes.

Author: php-coder

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

@@ -105,7 +105,7 @@ public void purgeUsersActivationsShouldThrowExceptionWhenNullActivationsWasRetur
 	@Test
 	public void purgeUsersActivationsShouldDeleteExpiredActivations() {
 		List<UsersActivation> expectedActivations =
-			Collections.singletonList(UserServiceTest.getUsersActivation());
+			Collections.singletonList(TestObjects.createUsersActivation());
 		when(usersActivationDao.findByCreatedAtLessThan(any(Date.class)))
 			.thenReturn(expectedActivations);
 

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

@@ -20,12 +20,16 @@
 import java.util.Date;
 
 import ru.mystamps.web.entity.Country;
+import ru.mystamps.web.entity.UsersActivation;
 
 final class TestObjects {
 
 	private static final Integer TEST_COUNTRY_ID = 1;
 	private static final String TEST_COUNTRY_NAME = "Somewhere";
 
+	private static final String TEST_EMAIL          = "test@example.org";
+	private static final String TEST_ACTIVATION_KEY = "1234567890";
+	
 	private TestObjects() {
 	}
 
@@ -39,4 +43,12 @@ public static Country createCountry() {
 		return country;
 	}
 
+	public static UsersActivation createUsersActivation() {
+		UsersActivation activation = new UsersActivation();
+		activation.setActivationKey(TEST_ACTIVATION_KEY);
+		activation.setEmail(TEST_EMAIL);
+		activation.setCreatedAt(new Date());
+		return activation;
+	}
+	
 }

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

@@ -60,7 +60,6 @@ public class UserServiceTest {
 	private static final String TEST_HASH           = "b0dd94c84e784ddb1e9a83c8a2e8f403846647b9";
 
 	private static final String TEST_EMAIL          = "test@example.org";
-	private static final String TEST_ACTIVATION_KEY = "1234567890";
 
 	@Mock
 	private UserDao userDao;
@@ -85,7 +84,7 @@ public class UserServiceTest {
 	public void setUp() {
 		when(encoder.encodePassword(anyString(), anyString())).thenReturn(TEST_HASH);
 
-		UsersActivation activation = getUsersActivation();
+		UsersActivation activation = TestObjects.createUsersActivation();
 		when(usersActivationDao.findOne(anyString())).thenReturn(activation);
 
 		registrationForm = new RegisterAccountForm();
@@ -180,7 +179,7 @@ public void findRegistrationRequestByActivationKeyShouldThrowExceptionWhenKeyIsN
 
 	@Test
 	public void findRegistrationRequestByActivationKeyShouldCallDao() {
-		UsersActivation expectedActivation = getUsersActivation();
+		UsersActivation expectedActivation = TestObjects.createUsersActivation();
 		when(usersActivationDao.findOne(anyString())).thenReturn(expectedActivation);
 
 		UsersActivation activation =
@@ -214,7 +213,7 @@ public void registerUserShouldCreateUser() {
 
 	@Test
 	public void registerUserShouldDeleteRegistrationRequest() {
-		UsersActivation activation = getUsersActivation();
+		UsersActivation activation = TestObjects.createUsersActivation();
 		when(usersActivationDao.findOne(anyString())).thenReturn(activation);
 
 		service.registerUser(activationForm);
@@ -272,7 +271,7 @@ public void registerUserShouldPassLoginInsteadOfNameWhenNameIsEmpty() {
 
 	@Test
 	public void registerUserShouldUseEmailFromRegistrationRequest() {
-		UsersActivation activation = getUsersActivation();
+		UsersActivation activation = TestObjects.createUsersActivation();
 		when(usersActivationDao.findOne(anyString())).thenReturn(activation);
 
 		service.registerUser(activationForm);
@@ -284,7 +283,7 @@ public void registerUserShouldUseEmailFromRegistrationRequest() {
 
 	@Test
 	public void registerUserShouldUseRegistrationDateFromRegistrationRequest() {
-		UsersActivation activation = getUsersActivation();
+		UsersActivation activation = TestObjects.createUsersActivation();
 		when(usersActivationDao.findOne(anyString())).thenReturn(activation);
 
 		service.registerUser(activationForm);
@@ -412,12 +411,4 @@ static User getValidUser() {
 		return user;
 	}
 
-	static UsersActivation getUsersActivation() {
-		UsersActivation activation = new UsersActivation();
-		activation.setActivationKey(TEST_ACTIVATION_KEY);
-		activation.setEmail(TEST_EMAIL);
-		activation.setCreatedAt(new Date());
-		return activation;
-	}
-	
 }