SeriesImportServiceImpl.findAll(): add unit test.

Fix #764

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/service/SeriesImportServiceImpl.java

@@ -212,7 +212,6 @@ public ImportRequestInfo findRequestInfo(Integer seriesId) {
 		return seriesImportDao.findRequestInfo(seriesId);
 	}
 
-	// @todo #692 SeriesImportServiceImpl.findAll(): add unit tests
 	@Override
 	@Transactional(readOnly = true)
 	@PreAuthorize(HasAuthority.IMPORT_SERIES)

src/test/groovy/ru/mystamps/web/service/SeriesImportServiceImplTest.groovy

@@ -36,6 +36,7 @@ import ru.mystamps.web.dao.dto.ParsedDataDto
 import ru.mystamps.web.dao.SeriesImportDao
 import ru.mystamps.web.dao.dto.ImportRequestInfo
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto
+import ru.mystamps.web.dao.dto.ImportRequestFullInfo
 import ru.mystamps.web.dao.dto.SaveParsedDataDbDto
 import ru.mystamps.web.service.dto.AddSeriesDto
 import ru.mystamps.web.service.dto.RawParsedDataDto
@@ -517,4 +518,19 @@ class SeriesImportServiceImplTest extends Specification {
 			result == expectedResult
 	}
 
+	//
+	// Tests for findAll()
+	//
+	
+	def 'findAll() should invoke dao and return its result'() {
+		given:
+			List<ImportRequestFullInfo> expectedResult = Random.listOfImportRequestFullInfo()
+		when:
+			List<ImportRequestFullInfo> result = service.findAll()
+		then:
+			1 * seriesImportDao.findAll() >> expectedResult
+		and:
+			result == expectedResult
+	}
+	
 }

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

@@ -229,4 +229,13 @@ public static ImportRequestInfo createImportRequestInfo() {
 		return new ImportRequestInfo(Random.id(), Random.url());
 	}
 
+	public static ImportRequestFullInfo createImportRequestFullInfo() {
+		return new ImportRequestFullInfo(
+			Random.id(),
+			Random.url(),
+			Random.importRequestStatus(),
+			Random.date()
+		);
+	}
+	
 }

src/test/java/ru/mystamps/web/tests/Random.java

@@ -17,8 +17,11 @@
  */
 package ru.mystamps.web.tests;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.Year;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -30,6 +33,7 @@
 import ru.mystamps.web.Db.SeriesImportRequestStatus;
 import ru.mystamps.web.dao.dto.EntityWithIdDto;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
+import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
 import ru.mystamps.web.service.TestObjects;
 import ru.mystamps.web.validation.ValidationRules;
 
@@ -63,6 +67,17 @@ public static Integer userId() {
 		return RandomShortApi.positiveInteger();
 	}
 
+	public static Date date() {
+		try {
+			
+			SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+			return between(fmt.parse("2017-01-01"), fmt.parse("2017-21-20")).date();
+		
+		} catch (ParseException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
 	public static String url() {
 		final long minLength = 5;
 		final long maxLength = 15;
@@ -168,6 +183,18 @@ public static List<EntityWithParentDto> listOfEntityWithParentDto() {
 		);
 	}
 
+	public static List<ImportRequestFullInfo> listOfImportRequestFullInfo() {
+		final int minSize = 1;
+		final int maxSize = 3;
+		int size = integer(minSize, maxSize);
+		return sampleMultiple(
+			size,
+			TestObjects.createImportRequestFullInfo(),
+			TestObjects.createImportRequestFullInfo(),
+			TestObjects.createImportRequestFullInfo()
+		);
+	}
+	
 	public static String jsoupLocator() {
 		List<String> locators = Arrays.asList("#id", "a[href]", "img[src$=.png]", "div#logo");
 		return sample(locators);