refactor: rename tests on Groovy and add Legacy prefix to their names.

php-coder · php-coder · commit ad1bbf9ea847 · 2020-01-27T21:21:20.000Z
The renaming is required as tests on Java and Groovy can't have the same class names. The original
names (without Legacy prefix) will be used by new tests on Java.

Part of 1246
diff --git a/src/test/groovy/ru/mystamps/web/common/LegacyLocaleUtilsTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/common/LegacyPagerTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/common/LegacySlugUtilsTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/account/LegacyUserServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/account/LegacyUsersActivationServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/category/LegacyCategoryServiceImplTest.groovy b/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)
diff --git a/src/test/groovy/ru/mystamps/web/feature/collection/LegacyCollectionServiceImplTest.groovy b/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()
 	
diff --git a/src/test/groovy/ru/mystamps/web/feature/country/LegacyCountryServiceImplTest.groovy b/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)
diff --git a/src/test/groovy/ru/mystamps/web/feature/image/LegacyDatabaseImagePersistenceStrategyTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/image/LegacyFilesystemImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/LegacyFilesystemImagePersistenceStrategyTest.groovy
@@ -25,7 +25,7 @@ import spock.lang.Specification
 import java.nio.file.Path
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class FilesystemImagePersistenceStrategyTest extends Specification {
+class LegacyFilesystemImagePersistenceStrategyTest extends Specification {
 	private static final STORAGE_DIR = File.separator + 'tmp'
 	private static final PREVIEW_DIR = File.separator + 'tmp'
 	
diff --git a/src/test/groovy/ru/mystamps/web/feature/image/LegacyImageServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/image/LegacyTimedImagePreviewStrategyTest.groovy b/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()
 	
diff --git a/src/test/groovy/ru/mystamps/web/feature/participant/LegacyParticipantServiceImplTest.groovy b/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(
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/LegacyCatalogUtilsTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/LegacySeriesServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/LegacyStampsCatalogServiceImplTest.groovy b/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()
 	
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesImportServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesInfoExtractorServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/LegacyTimedSeriesInfoExtractorServiceTest.groovy b/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()
 	
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/LegacySeriesSalesImportServiceImplTest.groovy b/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()
diff --git a/src/test/groovy/ru/mystamps/web/feature/series/sale/LegacySeriesSalesServiceImplTest.groovy b/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(
diff --git a/src/test/groovy/ru/mystamps/web/feature/site/LegacyCronServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/LegacyCronServiceImplTest.groovy
@@ -30,7 +30,7 @@ import ru.mystamps.web.service.TestObjects
 import spock.lang.Specification
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class CronServiceImplTest extends Specification {
+class LegacyCronServiceImplTest extends Specification {
 	
 	private final CategoryService categoryService = Mock()
 	private final CountryService countryService = Mock()
diff --git a/src/test/groovy/ru/mystamps/web/feature/site/LegacySiteServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/LegacySiteServiceImplTest.groovy
@@ -26,7 +26,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class SiteServiceImplTest extends Specification {
+class LegacySiteServiceImplTest extends Specification {
 	private static final String TEST_TYPE         = TestObjects.TEST_ACTIVITY_TYPE
 	private static final String TEST_PAGE         = TestObjects.TEST_ACTIVITY_PAGE
 	private static final String TEST_IP           = TestObjects.TEST_ACTIVITY_IP
diff --git a/src/test/groovy/ru/mystamps/web/feature/site/LegacySuspiciousActivityServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/LegacySuspiciousActivityServiceImplTest.groovy
@@ -22,7 +22,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class SuspiciousActivityServiceImplTest extends Specification {
+class LegacySuspiciousActivityServiceImplTest extends Specification {
 	
 	private final SuspiciousActivityDao suspiciousActivityDao = Mock()
 	
