Skip to content

Commit 06efb06

Browse files
php-coderphp-coder
committed
AbstractPageWithFormAssert: rename to properly fix CheckStyle warning.
No functional changes.
1 parent dab95f1 commit 06efb06

8 files changed

+16
-17
lines changed

‎src/main/config/checkstyle-suppressions.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<suppress checks="HideUtilityClassConstructor" files="ru.mystamps.web.tests.page.element.Form" />
1212

1313
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.WebDriverFactory" />
14-
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.fest.AbstractPageWithFormAssert" />
1514
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPage" />
1615
<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenAnyUserAtAnyPageWithForm" />
1716

‎src/test/java/ru/mystamps/web/tests/cases/WhenAdminAddCategory.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.AddSeriesPage;
3535

3636
import static ru.mystamps.web.tests.TranslationUtils.tr;
37-
import static ru.mystamps.web.tests.fest.AbstractPageWithFormAssert.assertThat;
37+
import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
3838
import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_MAX_LENGTH;
3939
import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_MIN_LENGTH;
4040

‎src/test/java/ru/mystamps/web/tests/cases/WhenAdminAddCountry.java

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

3535
import static ru.mystamps.web.tests.TranslationUtils.tr;
36-
import static ru.mystamps.web.tests.fest.AbstractPageWithFormAssert.assertThat;
36+
import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
3737
import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MAX_LENGTH;
3838
import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MIN_LENGTH;
3939

‎src/test/java/ru/mystamps/web/tests/cases/WhenAdminAddSeries.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import ru.mystamps.web.tests.page.InfoSeriesPage;
4242

4343
import static ru.mystamps.web.tests.TranslationUtils.tr;
44-
import static ru.mystamps.web.tests.fest.AbstractPageWithFormAssert.assertThat;
44+
import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
4545
import static ru.mystamps.web.validation.ValidationRules.MAX_SERIES_COMMENT_LENGTH;
4646
import static ru.mystamps.web.validation.ValidationRules.MAX_STAMPS_IN_SERIES;
4747
import static ru.mystamps.web.validation.ValidationRules.MIN_STAMPS_IN_SERIES;

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

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

3333
import static ru.mystamps.web.tests.TranslationUtils.stripHtmlTags;
3434
import static ru.mystamps.web.tests.TranslationUtils.tr;
35-
import static ru.mystamps.web.tests.fest.AbstractPageWithFormAssert.assertThat;
35+
import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
3636
import static ru.mystamps.web.validation.ValidationRules.LOGIN_MIN_LENGTH;
3737
import static ru.mystamps.web.validation.ValidationRules.LOGIN_MAX_LENGTH;
3838
import static ru.mystamps.web.validation.ValidationRules.NAME_MAX_LENGTH;

‎src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.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
import static ru.mystamps.web.tests.TranslationUtils.stripHtmlTags;
30-
import static ru.mystamps.web.tests.fest.AbstractPageWithFormAssert.assertThat;
30+
import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
3131
import static ru.mystamps.web.validation.ValidationRules.EMAIL_MAX_LENGTH;
3232

3333
import org.apache.commons.lang3.StringUtils;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import ru.mystamps.web.tests.page.InfoSeriesPage;
4141
import ru.mystamps.web.Url;
4242

43-
import static ru.mystamps.web.tests.fest.AbstractPageWithFormAssert.assertThat;
43+
import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
4444
import static ru.mystamps.web.tests.TranslationUtils.tr;
4545
import static ru.mystamps.web.validation.ValidationRules.MAX_STAMPS_IN_SERIES;
4646
import static ru.mystamps.web.validation.ValidationRules.MIN_STAMPS_IN_SERIES;

‎src/test/java/ru/mystamps/web/tests/fest/AbstractPageWithFormAssert.java renamed to ‎src/test/java/ru/mystamps/web/tests/fest/PageWithFormAssert.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@
2929
*
3030
* @see https://github.com/alexruiz/fest-assert-2.x/wiki/Creating-specific-assertions
3131
**/
32-
public final class AbstractPageWithFormAssert
33-
extends AbstractAssert<AbstractPageWithFormAssert, AbstractPageWithForm> {
32+
public final class PageWithFormAssert
33+
extends AbstractAssert<PageWithFormAssert, AbstractPageWithForm> {
3434

3535
private String fieldName;
3636

37-
private AbstractPageWithFormAssert(AbstractPageWithForm actual) {
38-
super(actual, AbstractPageWithFormAssert.class);
37+
private PageWithFormAssert(AbstractPageWithForm actual) {
38+
super(actual, PageWithFormAssert.class);
3939
}
4040

41-
public static AbstractPageWithFormAssert assertThat(AbstractPageWithForm actual) {
42-
return new AbstractPageWithFormAssert(actual);
41+
public static PageWithFormAssert assertThat(AbstractPageWithForm actual) {
42+
return new PageWithFormAssert(actual);
4343
}
4444

45-
public AbstractPageWithFormAssert field(String fieldName) {
45+
public PageWithFormAssert field(String fieldName) {
4646
this.fieldName = fieldName;
4747
return this;
4848
}
4949

50-
public AbstractPageWithFormAssert hasError(String expectedErrorMessage) {
50+
public PageWithFormAssert hasError(String expectedErrorMessage) {
5151
isNotNull();
5252
Validate.validState(
5353
fieldName != null,
@@ -70,7 +70,7 @@ public AbstractPageWithFormAssert hasError(String expectedErrorMessage) {
7070
return this;
7171
}
7272

73-
public AbstractPageWithFormAssert hasNoError() {
73+
public PageWithFormAssert hasNoError() {
7474
isNotNull();
7575
Validate.validState(
7676
fieldName != null,
@@ -89,7 +89,7 @@ public AbstractPageWithFormAssert hasNoError() {
8989
return this;
9090
}
9191

92-
public AbstractPageWithFormAssert hasValue(String expectedValue) {
92+
public PageWithFormAssert hasValue(String expectedValue) {
9393
isNotNull();
9494
Validate.validState(
9595
fieldName != null,

0 commit comments

Comments
 (0)