Skip to content

Move Cucumber-related classes to a separate package #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@RequiredArgsConstructor
public class SeriesInfoExtractorServiceImpl implements SeriesInfoExtractorService {

// Related to RELEASE_YEAR_REGEXP and used in unit tests.
// Related to RELEASE_YEAR_REGEXP and used in unit test.
protected static final int MAX_SUPPORTED_RELEASE_YEAR = 2099;

// Regular expression matches release year of the stamps (from 1840 till 2099).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void logAboutInvalidCsrfToken(HttpServletRequest request) {

}

// protected for using in unit tests
// protected for using in unit test
@SuppressWarnings({ "PMD.UseObjectForClearerAPI", "checkstyle:parameternumber" })
protected void logEvent(
String type,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public final class GroupByParent {

// @todo #592 GroupByParent: add unit tests
// @todo #592 GroupByParent: add unit test
private GroupByParent() {
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/ru/mystamps/web/util/Pager.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ public class Pager {

private static final int FIRST_PAGE = 1;

// this field is shown in toString() and useful when debugging unit tests
// this field is shown in toString() and useful when debugging unit test
@SuppressWarnings("PMD.SingularField")
private final int totalRecords;

// this field is shown in toString() and useful when debugging unit tests
// this field is shown in toString() and useful when debugging unit test
@SuppressWarnings("PMD.SingularField")
private final int totalPages;

// this field is shown in toString() and useful when debugging unit tests
// this field is shown in toString() and useful when debugging unit test
@SuppressWarnings({ "PMD.SingularField", "PMD.UnusedPrivateField" })
private final int recordsPerPage;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import lombok.Getter;
import lombok.Setter;

// Getters/setters are being used in unit tests
// Getters/setters are being used in unit test
@Getter(AccessLevel.PROTECTED)
@Setter(AccessLevel.PROTECTED)
public class SiteParser {
Expand Down
42 changes: 21 additions & 21 deletions src/test/config/testng.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,127 +3,127 @@

<test name="When user at register account page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserAtRegisterAccountPage" />
<class name="ru.mystamps.web.test.cases.WhenUserAtRegisterAccountPage" />
</classes>
</test>

<test name="When user at auth page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserAtAuthPage" />
<class name="ru.mystamps.web.test.cases.WhenUserAtAuthPage" />
</classes>
</test>

<test name="When user at activate account page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserAtActivateAccountPage" />
<class name="ru.mystamps.web.test.cases.WhenUserAtActivateAccountPage" />
</classes>
</test>

<test name="When anonymous user activate account">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserActivateAccount" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserActivateAccount" />
</classes>
</test>

<test name="When admin add category">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAdminAddCategory" />
<class name="ru.mystamps.web.test.cases.WhenAdminAddCategory" />
</classes>
</test>

<test name="When admin add country">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAdminAddCountry" />
<class name="ru.mystamps.web.test.cases.WhenAdminAddCountry" />
</classes>
</test>

<test name="When admin add series">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAdminAddSeries" />
<class name="ru.mystamps.web.test.cases.WhenAdminAddSeries" />
</classes>
</test>

<test name="When user add series">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserAddSeries" />
<class name="ru.mystamps.web.test.cases.WhenUserAddSeries" />
</classes>
</test>

<test name="When any user at any page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPage" />
<class name="ru.mystamps.web.test.cases.WhenAnyUserAtAnyPage" />
</classes>
</test>

<test name="When any user at any page with form">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPageWithForm" />
<class name="ru.mystamps.web.test.cases.WhenAnyUserAtAnyPageWithForm" />
</classes>
</test>

<test name="When anonymous user at index page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserAtIndexPage" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserAtIndexPage" />
</classes>
</test>

<test name="When user at index page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserAtIndexPage" />
<class name="ru.mystamps.web.test.cases.WhenUserAtIndexPage" />
</classes>
</test>

<test name="When admin at index page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAdminAtIndexPage" />
<class name="ru.mystamps.web.test.cases.WhenAdminAtIndexPage" />
</classes>
</test>

<test name="When anonymous user authenticates">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserAuthenticates" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserAuthenticates" />
</classes>
</test>

<test name="When user logs out">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserLogsOut" />
<class name="ru.mystamps.web.test.cases.WhenUserLogsOut" />
</classes>
</test>

<test name="When anonymous user open not existing page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserOpenNotExistingPage" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserOpenNotExistingPage" />
</classes>
</test>

<test name="When anonymous user at forbidden page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserAtForbiddenPage" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserAtForbiddenPage" />
</classes>
</test>

<test name="When anonymous user open Togglz console">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserOpenTogglzConsole" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserOpenTogglzConsole" />
</classes>
</test>

<test name="When user open Togglz console">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenUserOpenTogglzConsole" />
<class name="ru.mystamps.web.test.cases.WhenUserOpenTogglzConsole" />
</classes>
</test>

<test name="When anonymous user register account">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserRegisterAccount" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserRegisterAccount" />
</classes>
</test>

<test name="When anonymous user open not existing collection page">
<classes>
<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserOpenNotExistingCollectionPage" />
<class name="ru.mystamps.web.test.cases.WhenAnonymousUserOpenNotExistingCollectionPage" />
</classes>
</test>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import ru.mystamps.web.dao.dto.AddCategoryDbDto
import ru.mystamps.web.dao.dto.CategoryDto
import ru.mystamps.web.controller.dto.AddCategoryForm
import ru.mystamps.web.dao.dto.LinkEntityDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.test.Random
import ru.mystamps.web.util.SlugUtils

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.slf4j.helpers.NOPLogger
import ru.mystamps.web.dao.CollectionDao
import ru.mystamps.web.dao.dto.AddCollectionDbDto
import ru.mystamps.web.dao.dto.CollectionInfoDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.util.SlugUtils

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import ru.mystamps.web.dao.CountryDao
import ru.mystamps.web.dao.dto.AddCountryDbDto
import ru.mystamps.web.controller.dto.AddCountryForm
import ru.mystamps.web.dao.dto.LinkEntityDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.test.Random
import ru.mystamps.web.util.SlugUtils

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import ru.mystamps.web.dao.ImageDao
import ru.mystamps.web.dao.dto.ImageDto
import ru.mystamps.web.dao.dto.ImageInfoDto
import ru.mystamps.web.service.exception.ImagePersistenceException
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.Random

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class ImageServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import ru.mystamps.web.dao.dto.ImportSeriesDbDto
import ru.mystamps.web.dao.dto.SaveParsedDataDbDto
import ru.mystamps.web.service.dto.AddSeriesDto
import ru.mystamps.web.service.dto.RawParsedDataDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.test.Random

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class SeriesImportServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import org.slf4j.helpers.NOPLogger
import spock.lang.Specification
import spock.lang.Unroll

import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.Random
import ru.mystamps.web.validation.ValidationRules

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import ru.mystamps.web.dao.SeriesSalesDao
import ru.mystamps.web.dao.dto.AddSeriesSalesDbDto
import ru.mystamps.web.dao.dto.Currency
import ru.mystamps.web.controller.dto.AddSeriesSalesForm
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.test.DateUtils

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class SeriesSalesServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import ru.mystamps.web.dao.dto.PurchaseAndSaleDto
import ru.mystamps.web.dao.dto.SeriesInfoDto
import ru.mystamps.web.dao.dto.SitemapInfoDto
import ru.mystamps.web.service.dto.SeriesDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.test.Random

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class SeriesServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.slf4j.helpers.NOPLogger
import ru.mystamps.web.Db
import ru.mystamps.web.dao.SuspiciousActivityDao
import ru.mystamps.web.dao.dto.AddSuspiciousActivityDbDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.test.DateUtils

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class SiteServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import ru.mystamps.web.dao.dto.AddParticipantDbDto
import ru.mystamps.web.dao.dto.EntityWithIdDto
import ru.mystamps.web.dao.dto.TransactionParticipantDto
import ru.mystamps.web.controller.dto.AddParticipantForm
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.Random

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class TransactionParticipantServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import ru.mystamps.web.dao.dto.AddUserDbDto
import ru.mystamps.web.dao.dto.UserDetails
import ru.mystamps.web.dao.dto.UsersActivationDto
import ru.mystamps.web.controller.dto.ActivateAccountForm
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.tests.Random
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.test.Random

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
class UserServiceImplTest extends Specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import ru.mystamps.web.dao.dto.UsersActivationDto
import ru.mystamps.web.dao.dto.UsersActivationFullDto
import ru.mystamps.web.controller.dto.RegisterAccountForm
import ru.mystamps.web.service.dto.SendUsersActivationDto
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.test.DateUtils
import ru.mystamps.web.validation.ValidationRules

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/ru/mystamps/web/service/TestObjects.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import ru.mystamps.web.dao.dto.*;
import ru.mystamps.web.service.dto.AddSeriesDto;
import ru.mystamps.web.service.dto.RawParsedDataDto;
import ru.mystamps.web.tests.Random;
import ru.mystamps.web.test.Random;
import ru.mystamps.web.util.SlugUtils;

import static io.qala.datagen.RandomShortApi.bool;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ru.mystamps.web.tests;
package ru.mystamps.web.test;

import java.util.Date;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ru.mystamps.web.tests;
package ru.mystamps.web.test;

import java.time.Year;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ru.mystamps.web.tests;
package ru.mystamps.web.test;

import java.io.File;
import java.io.FileInputStream;
Expand Down Expand Up @@ -75,7 +75,7 @@ public static String tr(String key) {
return msg;
}

// TODO: add simple unit tests (#93)
// TODO: add simple unit test (#93)
public static String stripHtmlTags(String msg) {
return msg.replaceAll("\\<.*?>", "");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ru.mystamps.web.tests;
package ru.mystamps.web.test;

import com.gargoylesoftware.htmlunit.BrowserVersion;
import org.openqa.selenium.WebDriver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ru.mystamps.web.tests;
package ru.mystamps.web.test;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
Loading