diff --git a/.travis.yml b/.travis.yml index 55c3ed06cf..522e723cca 100644 --- a/.travis.yml +++ b/.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=" diff --git a/src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy b/src/test/groovy/ru/mystamps/web/common/LegacyLocaleUtilsTest.groovy similarity index 97% rename from src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy rename to src/test/groovy/ru/mystamps/web/common/LegacyLocaleUtilsTest.groovy index 08a20ede1e..a2a81ac20f 100644 --- a/src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.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/PagerTest.groovy b/src/test/groovy/ru/mystamps/web/common/LegacyPagerTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/common/PagerTest.groovy rename to src/test/groovy/ru/mystamps/web/common/LegacyPagerTest.groovy index 46390bac3c..81474fa494 100644 --- a/src/test/groovy/ru/mystamps/web/common/PagerTest.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/SlugUtilsTest.groovy b/src/test/groovy/ru/mystamps/web/common/LegacySlugUtilsTest.groovy similarity index 97% rename from src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy rename to src/test/groovy/ru/mystamps/web/common/LegacySlugUtilsTest.groovy index 8a9ef10c87..b34a9e4842 100644 --- a/src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.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/UserServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/account/LegacyUserServiceImplTest.groovy similarity index 97% rename from src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/account/LegacyUserServiceImplTest.groovy index 327682b243..9f491156f0 100644 --- a/src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.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() @@ -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( diff --git a/src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/account/LegacyUsersActivationServiceImplTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/account/LegacyUsersActivationServiceImplTest.groovy index 70598bd6fe..c491a2f0ea 100644 --- a/src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.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/CategoryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/category/LegacyCategoryServiceImplTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/category/LegacyCategoryServiceImplTest.groovy index b9dd92dd0a..2c7042cbf7 100644 --- a/src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.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/CollectionServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/collection/LegacyCollectionServiceImplTest.groovy similarity index 98% rename from src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/collection/LegacyCollectionServiceImplTest.groovy index 49be144f62..271832d74c 100644 --- a/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.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() @@ -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: diff --git a/src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/country/LegacyCountryServiceImplTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/country/LegacyCountryServiceImplTest.groovy index 8b4a079a07..42233691a7 100644 --- a/src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.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/DatabaseImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/LegacyDatabaseImagePersistenceStrategyTest.groovy similarity index 95% rename from src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/image/LegacyDatabaseImagePersistenceStrategyTest.groovy index a1d7addf90..1c29c3c597 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.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() @@ -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 } // diff --git a/src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/LegacyFilesystemImagePersistenceStrategyTest.groovy similarity index 94% rename from src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/image/LegacyFilesystemImagePersistenceStrategyTest.groovy index de4d71428b..2c14425f42 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy +++ b/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: diff --git a/src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/LegacyImageServiceImplTest.groovy similarity index 98% rename from src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/image/LegacyImageServiceImplTest.groovy index efd0f2c70d..a8651dec0b 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.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() @@ -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 } diff --git a/src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/LegacyTimedImagePreviewStrategyTest.groovy similarity index 96% rename from src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/image/LegacyTimedImagePreviewStrategyTest.groovy index de3d1c3a2e..d4e2593e3a 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.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/ParticipantServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/participant/LegacyParticipantServiceImplTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/participant/LegacyParticipantServiceImplTest.groovy index dddbadf735..8c6336ef54 100644 --- a/src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.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/CatalogUtilsTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/LegacyCatalogUtilsTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/LegacyCatalogUtilsTest.groovy index 8d4478a2a7..077ac9dac5 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.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/SeriesServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/LegacySeriesServiceImplTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/LegacySeriesServiceImplTest.groovy index 138d2793c3..68af691029 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.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() @@ -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: diff --git a/src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/LegacyStampsCatalogServiceImplTest.groovy similarity index 98% rename from src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/LegacyStampsCatalogServiceImplTest.groovy index 2c87a04301..02948505eb 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.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/SeriesImportServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesImportServiceImplTest.groovy similarity index 99% rename from src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesImportServiceImplTest.groovy index 85db022f2d..90b78a392f 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.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() @@ -329,7 +329,6 @@ class SeriesImportServiceImplTest extends Specification { assert status?.newStatus == expectedNewStatus return true }) - } // diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesInfoExtractorServiceImplTest.groovy similarity index 98% rename from src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/importing/LegacySeriesInfoExtractorServiceImplTest.groovy index 0b06d7759f..c83fdd4bd6 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.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() @@ -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: diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/LegacyTimedSeriesInfoExtractorServiceTest.groovy similarity index 96% rename from src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/importing/LegacyTimedSeriesInfoExtractorServiceTest.groovy index 28d4368eb0..5016cf8657 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.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/SeriesSalesImportServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/LegacySeriesSalesImportServiceImplTest.groovy similarity index 97% rename from src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/importing/sale/LegacySeriesSalesImportServiceImplTest.groovy index 18134ad0e1..41bd3ba71a 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.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/SeriesSalesServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/sale/LegacySeriesSalesServiceImplTest.groovy similarity index 98% rename from src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/series/sale/LegacySeriesSalesServiceImplTest.groovy index 8dd05f3a5b..b70baf4164 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.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/CronServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/LegacyCronServiceImplTest.groovy similarity index 90% rename from src/test/groovy/ru/mystamps/web/feature/site/CronServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/site/LegacyCronServiceImplTest.groovy index 00165911db..611615155b 100644 --- a/src/test/groovy/ru/mystamps/web/feature/site/CronServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/site/LegacyCronServiceImplTest.groovy @@ -17,6 +17,12 @@ */ package ru.mystamps.web.feature.site +import static org.assertj.core.util.DateUtil.yesterday + +@SuppressWarnings('UnnecessaryGroovyImport') +import java.util.Date + +import org.assertj.core.api.WithAssertions import org.slf4j.helpers.NOPLogger import ru.mystamps.web.feature.account.UserService import ru.mystamps.web.feature.account.UsersActivationFullDto @@ -30,7 +36,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 implements WithAssertions { private final CategoryService categoryService = Mock() private final CountryService countryService = Mock() @@ -53,28 +59,23 @@ class CronServiceImplTest extends Specification { mailService ) - private static void assertMidnight(Date date) { - assert date[Calendar.HOUR_OF_DAY] == 0 - assert date[Calendar.MINUTE] == 0 - assert date[Calendar.SECOND] == 0 - assert date[Calendar.MILLISECOND] == 0 + private void assertMidnight(Date date) { + assertThat(date) + .hasHourOfDay(0) + .hasMinute(0) + .hasSecond(0) + .hasMillisecond(0) } - private static void assertDatesEqual(Date first, Date second) { - assert first[Calendar.YEAR] == second[Calendar.YEAR] - assert first[Calendar.MONTH] == second[Calendar.MONTH] - assert first[Calendar.DAY_OF_MONTH] == second[Calendar.DAY_OF_MONTH] - } - - private static void assertMidnightOfYesterday(Date date) { - assert date != null - assertDatesEqual(date, new Date().previous()) + private void assertMidnightOfYesterday(Date date) { + assertThat(date).isNotNull() + assertThat(date).isInSameDayAs(yesterday()) assertMidnight(date) } - private static void assertMidnightOfToday(Date date) { - assert date != null - assertDatesEqual(date, new Date()) + private void assertMidnightOfToday(Date date) { + assertThat(date).isNotNull() + assertThat(date).isToday() assertMidnight(date) } @@ -231,7 +232,7 @@ class CronServiceImplTest extends Specification { def "purgeUsersActivations() should do nothing if no activations"() { given: usersActivationService.findOlderThan(_ as Integer) >> [] - when: + when: service.purgeUsersActivations() then: 0 * usersActivationService.remove(_ as String) diff --git a/src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/LegacySiteServiceImplTest.groovy similarity index 97% rename from src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/site/LegacySiteServiceImplTest.groovy index 21f4adda37..1c850644dc 100644 --- a/src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.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 @@ -210,9 +210,10 @@ class SiteServiceImplTest extends Specification { assert activity?.method == expectedMethod return true }) - where: expectedMethod | _ - 'OPTIONS' | _ - null | _ + where: + expectedMethod | _ + 'OPTIONS' | _ + null | _ } @SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword']) @@ -311,10 +312,11 @@ class SiteServiceImplTest extends Specification { assert activity?.refererPage == null return true }) - where: refererPage | _ - ' ' | _ - '' | _ - null | _ + where: + refererPage | _ + ' ' | _ + '' | _ + null | _ } @SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword']) @@ -352,10 +354,11 @@ class SiteServiceImplTest extends Specification { assert activity?.userAgent == null return true }) - where: userAgent | _ - ' ' | _ - '' | _ - null | _ + where: + userAgent | _ + ' ' | _ + '' | _ + null | _ } } diff --git a/src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/LegacySuspiciousActivityServiceImplTest.groovy similarity index 98% rename from src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.groovy rename to src/test/groovy/ru/mystamps/web/feature/site/LegacySuspiciousActivityServiceImplTest.groovy index 1583f632cc..fc86f6e9ef 100644 --- a/src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.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() diff --git a/src/test/java/ru/mystamps/web/service/TestObjects.java b/src/test/java/ru/mystamps/web/service/TestObjects.java index 780168ff54..5006d3c803 100644 --- a/src/test/java/ru/mystamps/web/service/TestObjects.java +++ b/src/test/java/ru/mystamps/web/service/TestObjects.java @@ -71,8 +71,7 @@ public final class TestObjects { public static final String TEST_EMAIL = "test@example.org"; public static final String TEST_ACTIVATION_KEY = "1234567890"; - - protected static final String TEST_PASSWORD = "secret"; + public static final String TEST_PASSWORD = "secret"; private static final String TEST_NAME = "Test Name"; private static final String TEST_URL = "test.example.org"; @@ -87,12 +86,11 @@ private TestObjects() { } public static UsersActivationFullDto createUsersActivationFullDto() { - UsersActivationFullDto activation = new UsersActivationFullDto( + return new UsersActivationFullDto( TEST_ACTIVATION_KEY, TEST_EMAIL, Random.date() ); - return activation; } public static UsersActivationDto createUsersActivationDto() {