Skip to content

Commit 3c0d198

Browse files
committed
Renamed abstract test case classes.
No functional changes.
1 parent de5967f commit 3c0d198

21 files changed

+30
-28
lines changed

src/main/config/checkstyle-suppressions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.WebDriverFactory" />
1717
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.fest.AbstractPageWithFormAssert" />
18-
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenUserAtAnyPage" />
19-
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenUserAtAnyPageWithForm" />
18+
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPage" />
19+
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPageWithForm" />
2020

2121
</suppressions>

src/test/config/testng.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@
6262
</classes>
6363
</test>
6464

65-
<test name="When user at any page">
65+
<test name="When any user at any page">
6666
<classes>
67-
<class name="ru.mystamps.web.tests.cases.WhenUserAtAnyPage" />
67+
<class name="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPage" />
6868
</classes>
6969
</test>
7070

71-
<test name="When user at any page with form">
71+
<test name="When any user at any page with form">
7272
<classes>
73-
<class name="ru.mystamps.web.tests.cases.WhenUserAtAnyPageWithForm" />
73+
<class name="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPageWithForm" />
7474
</classes>
7575
</test>
7676

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserActivateAccount.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import static ru.mystamps.web.validation.ValidationRules.ACT_KEY_LENGTH;
4242

4343
public class WhenAnonymousUserActivateAccount
44-
extends WhenUserAtAnyPageWithForm<ActivateAccountPage> {
44+
extends WhenAnyUserAtAnyPageWithForm<ActivateAccountPage> {
4545

4646
@Value("${valid_user_login}")
4747
private String validUserLogin;

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAddCountry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import static ru.mystamps.web.tests.TranslationUtils.tr;
3333

34-
public class WhenAnonymousUserAddCountry extends WhenUserAtAnyPage<UnauthorizedErrorPage> {
34+
public class WhenAnonymousUserAddCountry extends WhenAnyUserAtAnyPage<UnauthorizedErrorPage> {
3535

3636
public WhenAnonymousUserAddCountry() {
3737
super(UnauthorizedErrorPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAddSeries.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import static ru.mystamps.web.tests.TranslationUtils.tr;
3333

34-
public class WhenAnonymousUserAddSeries extends WhenUserAtAnyPage<UnauthorizedErrorPage> {
34+
public class WhenAnonymousUserAddSeries extends WhenAnyUserAtAnyPage<UnauthorizedErrorPage> {
3535

3636
public WhenAnonymousUserAddSeries() {
3737
super(UnauthorizedErrorPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtIndexPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static ru.mystamps.web.tests.TranslationUtils.tr;
2929

30-
public class WhenAnonymousUserAtIndexPage extends WhenUserAtAnyPage<IndexSitePage> {
30+
public class WhenAnonymousUserAtIndexPage extends WhenAnyUserAtAnyPage<IndexSitePage> {
3131

3232
public WhenAnonymousUserAtIndexPage() {
3333
super(IndexSitePage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtUnauthorizedPage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
import static ru.mystamps.web.tests.TranslationUtils.tr;
3333

34-
public class WhenAnonymousUserAtUnauthorizedPage extends WhenUserAtAnyPage<UnauthorizedErrorPage> {
34+
public class WhenAnonymousUserAtUnauthorizedPage
35+
extends WhenAnyUserAtAnyPage<UnauthorizedErrorPage> {
3536

3637
public WhenAnonymousUserAtUnauthorizedPage() {
3738
super(UnauthorizedErrorPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAuthenticates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import static ru.mystamps.web.tests.TranslationUtils.tr;
3131

32-
public class WhenAnonymousUserAuthenticates extends WhenUserAtAnyPageWithForm<AuthAccountPage> {
32+
public class WhenAnonymousUserAuthenticates extends WhenAnyUserAtAnyPageWithForm<AuthAccountPage> {
3333

3434
@Value("${valid_user_login}")
3535
private String validUserLogin;

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingCountryPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static ru.mystamps.web.tests.TranslationUtils.tr;
3131

3232
public class WhenAnonymousUserOpenNotExistingCountryPage
33-
extends WhenUserAtAnyPage<NotFoundErrorPage> {
33+
extends WhenAnyUserAtAnyPage<NotFoundErrorPage> {
3434

3535
public WhenAnonymousUserOpenNotExistingCountryPage() {
3636
super(NotFoundErrorPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import static ru.mystamps.web.tests.TranslationUtils.tr;
3131

32-
public class WhenAnonymousUserOpenNotExistingPage extends WhenUserAtAnyPage<NotFoundErrorPage> {
32+
public class WhenAnonymousUserOpenNotExistingPage extends WhenAnyUserAtAnyPage<NotFoundErrorPage> {
3333

3434
public WhenAnonymousUserOpenNotExistingPage() {
3535
super(NotFoundErrorPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingSeriesPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static ru.mystamps.web.tests.TranslationUtils.tr;
3131

3232
public class WhenAnonymousUserOpenNotExistingSeriesPage
33-
extends WhenUserAtAnyPage<NotFoundErrorPage> {
33+
extends WhenAnyUserAtAnyPage<NotFoundErrorPage> {
3434

3535
public WhenAnonymousUserOpenNotExistingSeriesPage() {
3636
super(NotFoundErrorPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import ru.mystamps.web.tests.page.RegisterAccountPage;
3535

3636
public class WhenAnonymousUserRegisterAccount
37-
extends WhenUserAtAnyPageWithForm<RegisterAccountPage> {
37+
extends WhenAnyUserAtAnyPageWithForm<RegisterAccountPage> {
3838

3939
public WhenAnonymousUserRegisterAccount() {
4040
super(RegisterAccountPage.class);

src/test/java/ru/mystamps/web/tests/cases/WhenUserAtAnyPage.java renamed to src/test/java/ru/mystamps/web/tests/cases/WhenAnyUserAtAnyPage.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
loader = AnnotationConfigContextLoader.class,
4040
classes = TestContext.class
4141
)
42-
abstract class WhenUserAtAnyPage<T extends AbstractPage> extends AbstractTestNGSpringContextTests {
42+
abstract class WhenAnyUserAtAnyPage<T extends AbstractPage>
43+
extends AbstractTestNGSpringContextTests {
4344

4445
/**
4546
* Prefix of page's title which will be prepend by hasTitle().
@@ -64,7 +65,7 @@ abstract class WhenUserAtAnyPage<T extends AbstractPage> extends AbstractTestNGS
6465
*/
6566
private String header;
6667

67-
public WhenUserAtAnyPage(final Class<T> pageClass) {
68+
public WhenAnyUserAtAnyPage(final Class<T> pageClass) {
6869
super();
6970
page = PageFactory.initElements(WebDriverFactory.getDriver(), pageClass);
7071
}

src/test/java/ru/mystamps/web/tests/cases/WhenUserAtAnyPageWithForm.java renamed to src/test/java/ru/mystamps/web/tests/cases/WhenAnyUserAtAnyPageWithForm.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
import static org.fest.assertions.api.Assertions.assertThat;
3030

31-
abstract class WhenUserAtAnyPageWithForm<T extends AbstractPageWithForm>
32-
extends WhenUserAtAnyPage<T> {
31+
abstract class WhenAnyUserAtAnyPageWithForm<T extends AbstractPageWithForm>
32+
extends WhenAnyUserAtAnyPage<T> {
3333

34-
public WhenUserAtAnyPageWithForm(final Class<T> pageClass) {
34+
public WhenAnyUserAtAnyPageWithForm(final Class<T> pageClass) {
3535
super(pageClass);
3636
}
3737

src/test/java/ru/mystamps/web/tests/cases/WhenUserAddCountry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MAX_LENGTH;
3939
import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MIN_LENGTH;
4040

41-
public class WhenUserAddCountry extends WhenUserAtAnyPageWithForm<AddCountryPage> {
41+
public class WhenUserAddCountry extends WhenAnyUserAtAnyPageWithForm<AddCountryPage> {
4242

4343
private static final String TEST_COUNTRY_NAME = "Russia";
4444

src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import static ru.mystamps.web.validation.ValidationRules.MAX_STAMPS_IN_SERIES;
4949
import static ru.mystamps.web.validation.ValidationRules.MIN_STAMPS_IN_SERIES;
5050

51-
public class WhenUserAddSeries extends WhenUserAtAnyPageWithForm<AddSeriesPage> {
51+
public class WhenUserAddSeries extends WhenAnyUserAtAnyPageWithForm<AddSeriesPage> {
5252

5353
private static final int SINCE_YEAR = 1840;
5454
private static final int CURRENT_YEAR = new GregorianCalendar().get(Calendar.YEAR);

src/test/java/ru/mystamps/web/tests/cases/WhenUserAtActivateAccountPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import ru.mystamps.web.tests.page.ActivateAccountPage;
3131

3232
public class WhenUserAtActivateAccountPage
33-
extends WhenUserAtAnyPageWithForm<ActivateAccountPage> {
33+
extends WhenAnyUserAtAnyPageWithForm<ActivateAccountPage> {
3434

3535
@Value("${valid_user_login}")
3636
private String validUserLogin;

src/test/java/ru/mystamps/web/tests/cases/WhenUserAtAuthPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import ru.mystamps.web.tests.page.AuthAccountPage;
3131

32-
public class WhenUserAtAuthPage extends WhenUserAtAnyPageWithForm<AuthAccountPage> {
32+
public class WhenUserAtAuthPage extends WhenAnyUserAtAnyPageWithForm<AuthAccountPage> {
3333

3434
@Value("${valid_user_login}")
3535
private String validUserLogin;

src/test/java/ru/mystamps/web/tests/cases/WhenUserAtIndexPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import static ru.mystamps.web.tests.TranslationUtils.tr;
3232

33-
public class WhenUserAtIndexPage extends WhenUserAtAnyPage<IndexSitePage> {
33+
public class WhenUserAtIndexPage extends WhenAnyUserAtAnyPage<IndexSitePage> {
3434

3535
@Value("${valid_user_login}")
3636
private String validUserLogin;

src/test/java/ru/mystamps/web/tests/cases/WhenUserAtRegisterAccountPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import ru.mystamps.web.tests.page.RegisterAccountPage;
3131

3232
public class WhenUserAtRegisterAccountPage
33-
extends WhenUserAtAnyPageWithForm<RegisterAccountPage> {
33+
extends WhenAnyUserAtAnyPageWithForm<RegisterAccountPage> {
3434

3535
@Value("${valid_user_login}")
3636
private String validUserLogin;

src/test/java/ru/mystamps/web/tests/cases/WhenUserLogsOut.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import static ru.mystamps.web.tests.TranslationUtils.tr;
3030

31-
public class WhenUserLogsOut extends WhenUserAtAnyPage<LogoutAccountPage> {
31+
public class WhenUserLogsOut extends WhenAnyUserAtAnyPage<LogoutAccountPage> {
3232

3333
@Value("${valid_user_login}")
3434
private String validUserLogin;

0 commit comments

Comments
 (0)