Extracted method: CountryServiceTest.getCountry() -> TestObjects.createCountry()

No functional changes.

Author: php-coder

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

@@ -17,7 +17,6 @@
  */
 package ru.mystamps.web.service;
 
-import java.util.Date;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,9 +47,6 @@
 @RunWith(MockitoJUnitRunner.class)
 public class CountryServiceTest {
 
-	private static final Integer TEST_COUNTRY_ID = 1;
-	private static final String TEST_COUNTRY_NAME = "Somewhere";
-	
 	@Mock
 	private CountryDao countryDao;
 
@@ -94,7 +90,7 @@ public void addShouldThrowExceptionWhenUserIsNull() {
 
 	@Test
 	public void addShouldCallDao() {
-		Country expected = getCountry();
+		Country expected = TestObjects.createCountry();
 		when(countryDao.save(any(Country.class))).thenReturn(expected);
 
 		Country actual = service.add(form, user);
@@ -164,11 +160,11 @@ public void addShouldAssignUpdatedByToUser() {
 	public void findAllShouldCallDao() {
 		List<Country> expectedCountries = new ArrayList<Country>();
 
-		Country country1 = getCountry();
+		Country country1 = TestObjects.createCountry();
 		country1.setName("First Country");
 		expectedCountries.add(country1);
 
-		Country country2 = getCountry();
+		Country country2 = TestObjects.createCountry();
 		country2.setName("Second Country");
 		expectedCountries.add(country2);
 
@@ -190,7 +186,7 @@ public void findByNameShouldThrowExceptionWhenNameIsNull() {
 
 	@Test
 	public void findByNameShouldCallDao() {
-		Country expectedCountry = getCountry();
+		Country expectedCountry = TestObjects.createCountry();
 		when(countryDao.findByName(anyString())).thenReturn(expectedCountry);
 
 		Country country = service.findByName("Any name here");
@@ -205,14 +201,4 @@ public void findByNameShouldPassCountryNameToDao() {
 		verify(countryDao).findByName(eq("Canada"));
 	}
 
-	static Country getCountry() {
-		Country country = new Country();
-		country.setId(TEST_COUNTRY_ID);
-		country.setName(TEST_COUNTRY_NAME);
-		Date now = new Date();
-		country.getMetaInfo().setCreatedAt(now);
-		country.getMetaInfo().setUpdatedAt(now);
-		return country;
-	}
-	
 }

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

@@ -132,7 +132,7 @@ public void addShouldPassEntityToSeriesDao() {
 
 	@Test
 	public void addShouldLoadAndPassCountryToSeriesDaoIfCountryPresent() {
-		Country expectedCountry = CountryServiceTest.getCountry();
+		Country expectedCountry = TestObjects.createCountry();
 
 		form.setCountry(expectedCountry);
 

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2009-2013 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.service;
+
+import java.util.Date;
+
+import ru.mystamps.web.entity.Country;
+
+final class TestObjects {
+	
+	private static final Integer TEST_COUNTRY_ID = 1;
+	private static final String TEST_COUNTRY_NAME = "Somewhere";
+	
+	private TestObjects() {
+	}
+	
+	public static Country createCountry() {
+		Country country = new Country();
+		country.setId(TEST_COUNTRY_ID);
+		country.setName(TEST_COUNTRY_NAME);
+		Date now = new Date();
+		country.getMetaInfo().setCreatedAt(now);
+		country.getMetaInfo().setUpdatedAt(now);
+		return country;
+	}
+	
+}