CollectionService.findSeriesWithPricesBySlug(): add unit tests.

Fix #890

Author: php-coder

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

@@ -169,7 +169,6 @@ public List<SeriesInCollectionDto> findSeriesInCollection(Integer collectionId,
 		return collectionDao.findSeriesByCollectionId(collectionId, lang);
 	}
 
-	// @todo #884 CollectionService.findSeriesWithPricesBySlug(): add unit tests
 	@Override
 	@Transactional(readOnly = true)
 	@PreAuthorize(HasAuthority.ADD_SERIES_PRICE_AND_COLLECTION_OWNER)

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

@@ -31,6 +31,7 @@ import ru.mystamps.web.dao.dto.AddCollectionDbDto
 import ru.mystamps.web.dao.dto.AddToCollectionDbDto
 import ru.mystamps.web.dao.dto.CollectionInfoDto
 import ru.mystamps.web.dao.dto.Currency
+import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.tests.Random
 import ru.mystamps.web.util.SlugUtils
@@ -390,6 +391,34 @@ class CollectionServiceImplTest extends Specification {
 			1 * collectionDao.findSeriesByCollectionId(expectedCollectionId, expectedLang) >> []
 	}
 
+	//
+	// Tests for findSeriesWithPricesBySlug()
+	//
+	
+	def 'findSeriesWithPricesBySlug() should throw exception when collection slug is null'() {
+		when:
+			service.findSeriesWithPricesBySlug(null, Random.lang())
+		then:
+			IllegalArgumentException ex = thrown()
+			ex.message == 'Collection slug must be non null'
+	}
+	
+	def 'findSeriesWithPricesBySlug() should invoke dao, pass argument and return result from dao'() {
+		given:
+			String expectedSlug = Random.collectionSlug()
+			String expectedLang = Random.lang()
+		and:
+			List<SeriesInCollectionWithPriceDto> expectedResult = [
+				TestObjects.createSeriesInCollectionWithPriceDto(),
+			]
+		when:
+			List<SeriesInCollectionWithPriceDto> result = service.findSeriesWithPricesBySlug(expectedSlug, expectedLang)
+		then:
+			1 * collectionDao.findSeriesWithPricesBySlug(expectedSlug, expectedLang) >> expectedResult
+		and:
+			result == expectedResult
+	}
+	
 	//
 	// Tests for findBySlug()
 	//

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

@@ -160,6 +160,19 @@ public static CollectionInfoDto createCollectionInfoDto() {
 		return new CollectionInfoDto(Random.id(), "test-user", "Test User");
 	}
 
+	public static SeriesInCollectionWithPriceDto createSeriesInCollectionWithPriceDto() {
+		return new SeriesInCollectionWithPriceDto(
+			Random.id(),
+			Random.issueYear(),
+			Random.quantity(),
+			Random.quantity(),
+			Random.perforated(),
+			Random.countryName(),
+			Random.price(),
+			Random.currency()
+		);
+	}
+	
 	public static SuspiciousActivityDto createSuspiciousActivityDto() {
 		return new SuspiciousActivityDto(
 			TEST_ACTIVITY_TYPE,

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

@@ -40,6 +40,7 @@
 import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.service.TestObjects;
+import ru.mystamps.web.util.SlugUtils;
 import ru.mystamps.web.validation.ValidationRules;
 
 import static io.qala.datagen.RandomShortApi.bool;
@@ -90,6 +91,25 @@ public static BigDecimal price() {
 		return new BigDecimal("17");
 	}
 
+	public static String login() {
+		String login = between(
+			ValidationRules.LOGIN_MIN_LENGTH,
+			ValidationRules.LOGIN_MAX_LENGTH
+		)
+			.with(multipleOf(" -_"))
+			.alphanumeric();
+		
+		if (StringUtils.containsAny(login, "  ", "--", "__")) {
+			return login();
+		}
+		
+		return login;
+	}
+	
+	public static String collectionSlug() {
+		return SlugUtils.slugify(login());
+	}
+	
 	public static Currency currency() {
 		return sample(Currency.values());
 	}