Extracted method: SiteServiceTest.getPageNotFoundType() -> TestObjects.createPageNotFoundActivityType()

No functional changes.

Author: php-coder

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

@@ -71,7 +71,8 @@ public void setUp() {
 
 	@Test
 	public void logAboutAbsentPageShouldCallDao() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -87,7 +88,7 @@ public void logAboutAbsentPageShouldThrowExceptionWhenActivityTypeNotFound() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassActivityTypeToDao() {
-		SuspiciousActivityType expectedType = getPageNotFoundType();
+		SuspiciousActivityType expectedType = TestObjects.createPageNotFoundActivityType();
 		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(expectedType);
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
@@ -99,7 +100,8 @@ public void logAboutAbsentPageShouldPassActivityTypeToDao() {
 
 	@Test
 	public void logAboutAbsentPageShouldAssignOccuredAtToCurrentDate() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -110,14 +112,16 @@ public void logAboutAbsentPageShouldAssignOccuredAtToCurrentDate() {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void logAboutAbsentPageShouldThrowExceptionWhenPageIsNull() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(null, null, null, null, null);
 	}
 
 	@Test
 	public void logAboutAbsentPageShouldPassPageToDao() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -128,7 +132,8 @@ public void logAboutAbsentPageShouldPassPageToDao() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassNullToDaoForUnknownUser() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -140,7 +145,8 @@ public void logAboutAbsentPageShouldPassNullToDaoForUnknownUser() {
 	@Test
 	public void logAboutAbsentPageShouldPassUserToDao() {
 		User user = getUser();
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, user, null, null, null);
 
@@ -151,7 +157,8 @@ public void logAboutAbsentPageShouldPassUserToDao() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassIpToDao() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, TEST_IP, null, null);
 
@@ -162,7 +169,8 @@ public void logAboutAbsentPageShouldPassIpToDao() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassEmptyStringToDaoForUnknownIp() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -173,7 +181,8 @@ public void logAboutAbsentPageShouldPassEmptyStringToDaoForUnknownIp() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassRefererToDao() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, TEST_REFERER_PAGE, null);
 
@@ -184,7 +193,8 @@ public void logAboutAbsentPageShouldPassRefererToDao() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassEmptyStringToDaoForUnknownReferer() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -195,7 +205,8 @@ public void logAboutAbsentPageShouldPassEmptyStringToDaoForUnknownReferer() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassUserAgentToDao() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, TEST_USER_AGENT);
 
@@ -206,7 +217,8 @@ public void logAboutAbsentPageShouldPassUserAgentToDao() {
 
 	@Test
 	public void logAboutAbsentPageShouldPassEmptyStringToDaoForUnknownUserAgent() {
-		when(suspiciousActivityTypeDao.findByName(anyString())).thenReturn(getPageNotFoundType());
+		when(suspiciousActivityTypeDao.findByName(anyString()))
+			.thenReturn(TestObjects.createPageNotFoundActivityType());
 
 		service.logAboutAbsentPage(TEST_PAGE, null, null, null, null);
 
@@ -365,13 +377,6 @@ public void logAboutFailedAuthenticationShouldPassEmptyStringToDaoForUnknownUser
 		assertThat(activityCaptor.getValue().getUserAgent()).isEmpty();
 	}
 
-	private SuspiciousActivityType getPageNotFoundType() {
-		SuspiciousActivityType type = new SuspiciousActivityType();
-		type.setId(1);
-		type.setName("PageNotFound");
-		return type;
-	}
-	
 	private SuspiciousActivityType getAuthFailedType() {
 		SuspiciousActivityType type = new SuspiciousActivityType();
 		type.setId(2);

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

@@ -20,6 +20,7 @@
 import java.util.Date;
 
 import ru.mystamps.web.entity.Country;
+import ru.mystamps.web.entity.SuspiciousActivityType;
 import ru.mystamps.web.entity.UsersActivation;
 
 final class TestObjects {
@@ -51,4 +52,11 @@ public static UsersActivation createUsersActivation() {
 		return activation;
 	}
 
+	public static SuspiciousActivityType createPageNotFoundActivityType() {
+		SuspiciousActivityType type = new SuspiciousActivityType();
+		type.setId(1);
+		type.setName("PageNotFound");
+		return type;
+	}
+	
 }