[WIP] Spock to JUnit migration

.travis.yml

@@ -3,9 +3,7 @@ language: java
 
 env:
   matrix:
-    - SPRING_PROFILES_ACTIVE=test
     - SPRING_PROFILES_ACTIVE=travis
-    - SPRING_PROFILES_ACTIVE=postgres
   global:
     - MAVEN_OPTS='-Xss256k'
     - secure: "fBav56BzY+A+Vs1g9YSfo1oLDCO1rFrXl49lJkOA5/XpnsKEEs4lI2RcOzz0wiJKXFNgcliiAJWoYMI8Esqz+lkyFWan4ij5Co0UzJcytDuY+2o+jaqwx45DuDYPogABzT+hWjLCxQLLG46gUkChzT8kcvOOn6JxC7Ff8q5MnoM="

src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy → src/test/groovy/ru/mystamps/web/common/LegacyLocaleUtilsTest.groovy

@@ -21,7 +21,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class LocaleUtilsTest extends Specification {
+class LegacyLocaleUtilsTest extends Specification {
 
 	//
 	// Tests for getLanguageOrNull()

src/test/groovy/ru/mystamps/web/common/PagerTest.groovy → src/test/groovy/ru/mystamps/web/common/LegacyPagerTest.groovy

@@ -21,7 +21,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class PagerTest extends Specification {
+class LegacyPagerTest extends Specification {
 
 	//
 	// Tests for Pager()

src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy → src/test/groovy/ru/mystamps/web/common/LegacySlugUtilsTest.groovy

@@ -21,7 +21,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class SlugUtilsTest extends Specification {
+class LegacySlugUtilsTest extends Specification {
 
 	//
 	// Tests for slugify()

src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/account/LegacyUserServiceImplTest.groovy

@@ -26,7 +26,7 @@ import ru.mystamps.web.tests.Random
 import spock.lang.Specification
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class UserServiceImplTest extends Specification {
+class LegacyUserServiceImplTest extends Specification {
 
 	private final UserDao userDao = Mock()
 	private final UsersActivationService usersActivationService = Mock()
@@ -36,18 +36,19 @@ class UserServiceImplTest extends Specification {
 	private UserService service
 	private ActivateAccountForm activationForm
 
+	@SuppressWarnings('UnnecessaryGetter')
 	def setup() {
 		AddUserDbDto user = TestObjects.createAddUserDbDto()
 
-		encoder.encode(_ as String) >> user.hash
+		encoder.encode(_ as String) >> user.getHash()
 
 		UsersActivationDto activation = TestObjects.createUsersActivationDto()
 		usersActivationService.findByActivationKey(_ as String) >> activation
 
 		activationForm = new ActivateAccountForm()
-		activationForm.setLogin(user.login)
+		activationForm.setLogin(user.getLogin())
 		activationForm.setPassword(TestObjects.TEST_PASSWORD)
-		activationForm.setName(user.name)
+		activationForm.setName(user.getName())
 		activationForm.setActivationKey(TestObjects.TEST_ACTIVATION_KEY)
 
 		service = new UserServiceImpl(

src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/account/LegacyUsersActivationServiceImplTest.groovy

@@ -25,7 +25,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class UsersActivationServiceImplTest extends Specification {
+class LegacyUsersActivationServiceImplTest extends Specification {
 
 	private final UsersActivationDao usersActivationDao = Mock()
 	private final MailService mailService = Mock()

src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/category/LegacyCategoryServiceImplTest.groovy

@@ -41,7 +41,7 @@ import static io.qala.datagen.StringModifier.Impls.oneOf
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class CategoryServiceImplTest extends Specification {
+class LegacyCategoryServiceImplTest extends Specification {
 
 	private final CategoryDao categoryDao = Mock()
 	private final CategoryService service = new CategoryServiceImpl(NOPLogger.NOP_LOGGER, categoryDao)

src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/collection/LegacyCollectionServiceImplTest.groovy

@@ -37,7 +37,7 @@ import static io.qala.datagen.RandomShortApi.positiveLong
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class CollectionServiceImplTest extends Specification {
+class LegacyCollectionServiceImplTest extends Specification {
 
 	private final CollectionDao collectionDao = Mock()
 
@@ -70,7 +70,7 @@ class CollectionServiceImplTest extends Specification {
 	}
 
 	@SuppressWarnings('FactoryMethodName')
-	def 'createCollection() should throw exception when owner login can\'t be converted to slug'() {
+	def "createCollection() should throw exception when owner login can't be converted to slug"() {
 		when:
 			service.createCollection(Random.userId(), '')
 		then:

src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/country/LegacyCountryServiceImplTest.groovy

@@ -40,7 +40,7 @@ import static io.qala.datagen.StringModifier.Impls.oneOf
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class CountryServiceImplTest extends Specification {
+class LegacyCountryServiceImplTest extends Specification {
 
 	private final CountryDao countryDao = Mock()
 	private final CountryService service = new CountryServiceImpl(NOPLogger.NOP_LOGGER, countryDao)

src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.groovy → src/test/groovy/ru/mystamps/web/feature/image/LegacyDatabaseImagePersistenceStrategyTest.groovy

@@ -23,7 +23,7 @@ import ru.mystamps.web.service.TestObjects
 import spock.lang.Specification
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class DatabaseImagePersistenceStrategyTest extends Specification {
+class LegacyDatabaseImagePersistenceStrategyTest extends Specification {
 
 	private final ImageDataDao imageDataDao = Mock()
 	private final MultipartFile multipartFile = Mock()
@@ -32,13 +32,15 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 	private ImagePersistenceStrategy strategy
 
 	def setup() {
-		strategy = new DatabaseImagePersistenceStrategy(
+		DatabaseImagePersistenceStrategy dbStrategy = new DatabaseImagePersistenceStrategy(
 			NOPLogger.NOP_LOGGER,
 			imageDataDao
 		)
 
 		// init() does nothing except logging but by invoking it we're improving code coverage
-		strategy.init()
+		dbStrategy.init()
+
+		strategy = dbStrategy
 	}
 
 	//

src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy → src/test/groovy/ru/mystamps/web/feature/image/LegacyFilesystemImagePersistenceStrategyTest.groovy

@@ -25,9 +25,9 @@ import spock.lang.Specification
 import java.nio.file.Path
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class FilesystemImagePersistenceStrategyTest extends Specification {
-	private static final STORAGE_DIR = File.separator + 'tmp'
-	private static final PREVIEW_DIR = File.separator + 'tmp'
+class LegacyFilesystemImagePersistenceStrategyTest extends Specification {
+	private static final String STORAGE_DIR = File.separator + 'tmp'
+	private static final String PREVIEW_DIR = File.separator + 'tmp'
 
 	private final MultipartFile multipartFile = Mock()
 	private final ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
@@ -94,7 +94,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	// Tests for get()
 	//
 
-	def 'get() should return null when file doesn\'t exist'() {
+	def "get() should return null when file doesn't exist"() {
 		given:
 			strategy.exists(_ as Path) >> false
 		and:

src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/image/LegacyImageServiceImplTest.groovy

@@ -26,7 +26,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class ImageServiceImplTest extends Specification {
+class LegacyImageServiceImplTest extends Specification {
 
 	private final ImageDao imageDao = Mock()
 	private final MultipartFile multipartFile = Mock()
@@ -40,10 +40,11 @@ class ImageServiceImplTest extends Specification {
 		imageDao
 	)
 
+	@SuppressWarnings('UnnecessaryGetter')
 	def setup() {
-		multipartFile.size >> 1024L
-		multipartFile.contentType >> 'image/png'
-		multipartFile.originalFilename >> 'super-image.png'
+		multipartFile.getSize() >> 1024L
+		multipartFile.getContentType() >> 'image/png'
+		multipartFile.getOriginalFilename() >> 'super-image.png'
 		imageDao.add(_ as String, _ as String) >> 17
 	}
 

src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy → src/test/groovy/ru/mystamps/web/feature/image/LegacyTimedImagePreviewStrategyTest.groovy

@@ -22,7 +22,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class TimedImagePreviewStrategyTest extends Specification {
+class LegacyTimedImagePreviewStrategyTest extends Specification {
 
 	private final ImagePreviewStrategy origStrategy = Mock()
 

src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/participant/LegacyParticipantServiceImplTest.groovy

@@ -34,7 +34,7 @@ import static io.qala.datagen.RandomShortApi.nullOrBlank
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class ParticipantServiceImplTest extends Specification {
+class LegacyParticipantServiceImplTest extends Specification {
 
 	private final ParticipantDao participantDao = Mock()
 	private final ParticipantService service = new ParticipantServiceImpl(

src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/LegacyCatalogUtilsTest.groovy

@@ -21,7 +21,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class CatalogUtilsTest extends Specification {
+class LegacyCatalogUtilsTest extends Specification {
 
 	//
 	// Tests for toShortForm()

src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/LegacySeriesServiceImplTest.groovy

@@ -41,7 +41,7 @@ import static io.qala.datagen.RandomShortApi.positiveLong
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class SeriesServiceImplTest extends Specification {
+class LegacySeriesServiceImplTest extends Specification {
 	private final ImageService imageService = Mock()
 	private final SeriesDao seriesDao = Mock()
 	private final StampsCatalogService michelCatalogService = Mock()
@@ -758,7 +758,7 @@ class SeriesServiceImplTest extends Specification {
 			result.createdBy    == expectedInfo.createdBy
 
 			result.imageIds     == expectedImageIds
-
+			
 			result.michel?.numbers   == expectedMichelNumbers
 			result.michel?.price     == expectedInfo.michelPrice
 
@@ -955,7 +955,7 @@ class SeriesServiceImplTest extends Specification {
 			1 * solovyovCatalogService.findSeriesIdsByNumber(expectedNumber) >> []
 	}
 
-	def 'findBySolovyovNumber() shouldn\'t try to find series info if there are no series'() {
+	def "findBySolovyovNumber() shouldn't try to find series info if there are no series"() {
 		given:
 			solovyovCatalogService.findSeriesIdsByNumber(_ as String) >> []
 		when:
@@ -994,7 +994,7 @@ class SeriesServiceImplTest extends Specification {
 			1 * zagorskiCatalogService.findSeriesIdsByNumber(expectedNumber) >> []
 	}
 
-	def 'findByZagorskiNumber() shouldn\'t try to find series info if there are no series'() {
+	def "findByZagorskiNumber() shouldn't try to find series info if there are no series"() {
 		given:
 			zagorskiCatalogService.findSeriesIdsByNumber(_ as String) >> []
 		when:

src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/LegacyStampsCatalogServiceImplTest.groovy

@@ -23,7 +23,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class StampsCatalogServiceImplTest extends Specification {
+class LegacyStampsCatalogServiceImplTest extends Specification {
 
 	private final StampsCatalogDao stampsCatalogDao = Mock()
 

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesImportServiceImplTest.groovy

@@ -48,7 +48,7 @@ import static io.qala.datagen.RandomValue.between
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class SeriesImportServiceImplTest extends Specification {
+class LegacySeriesImportServiceImplTest extends Specification {
 
 	private final SeriesImportDao seriesImportDao = Mock()
 	private final SeriesService seriesService = Mock()
@@ -329,7 +329,6 @@ class SeriesImportServiceImplTest extends Specification {
 				assert status?.newStatus == expectedNewStatus
 				return true
 			})
-
 	}
 
 	//

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesInfoExtractorServiceImplTest.groovy

@@ -43,7 +43,7 @@ import static ru.mystamps.web.feature.series.importing.SeriesInfoExtractorServic
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class SeriesInfoExtractorServiceImplTest extends Specification {
+class LegacySeriesInfoExtractorServiceImplTest extends Specification {
 
 	private final CategoryService categoryService = Mock()
 	private final CountryService countryService = Mock()
@@ -327,7 +327,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 			year == expectedYear
 	}
 
-	def 'extractReleaseYear() shouldn\'t extract dates before 1840'() {
+	def "extractReleaseYear() shouldn't extract dates before 1840"() {
 		given:
 			Integer unsupportedYear = between(0, SeriesValidation.MIN_RELEASE_YEAR - 1).integer()
 			String fragment = String.valueOf(unsupportedYear)
@@ -337,7 +337,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 			year == null
 	}
 
-	def 'extractReleaseYear() shouldn\'t extract dates after 2099'() {
+	def "extractReleaseYear() shouldn't extract dates after 2099"() {
 		given:
 			Integer unsupportedYear = between(MAX_SUPPORTED_RELEASE_YEAR + 1, Integer.MAX_VALUE).integer()
 			String fragment = String.valueOf(unsupportedYear)
@@ -348,7 +348,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 	}
 
 	@Unroll
-	def 'extractReleaseYear() shouldn\'t extract date from "#fragment"'(String fragment) {
+	def "extractReleaseYear() shouldn't extract date from '#fragment'"(String fragment) {
 		when:
 			Integer year = service.extractReleaseYear(fragment)
 		then:

src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/importing/LegacyTimedSeriesInfoExtractorServiceTest.groovy

@@ -32,7 +32,7 @@ import static io.qala.datagen.RandomShortApi.nullOr
 	'NoTabCharacter',
 	'TrailingWhitespace',
 ])
-class TimedSeriesInfoExtractorServiceTest extends Specification {
+class LegacyTimedSeriesInfoExtractorServiceTest extends Specification {
 
 	private final SeriesInfoExtractorService origService = Mock()
 

src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/importing/sale/LegacySeriesSalesImportServiceImplTest.groovy

@@ -25,7 +25,7 @@ import ru.mystamps.web.tests.Random
 import spock.lang.Specification
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class SeriesSalesImportServiceImplTest extends Specification {
+class LegacySeriesSalesImportServiceImplTest extends Specification {
 
 	private final SeriesSalesImportDao seriesSalesImportDao = Mock()
 	private final DownloaderService downloaderService = Mock()

src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy → src/test/groovy/ru/mystamps/web/feature/series/sale/LegacySeriesSalesServiceImplTest.groovy

@@ -24,7 +24,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class SeriesSalesServiceImplTest extends Specification {
+class LegacySeriesSalesServiceImplTest extends Specification {
 
 	private final SeriesSalesDao seriesSalesDao = Mock()
 	private final SeriesSalesService service = new SeriesSalesServiceImpl(