Skip to content

Commit 5abfc5b

Browse files
php-coderphp-coder
committed
refactor(WhenAnyUserAtAnyPageWithForm): remove deprecated checkStandardStructure() method.
Follow-up to 30a1d2e commit. Related to #530 No functional changes.
1 parent 1047ec0 commit 5abfc5b

8 files changed

+20
-39
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.testng.annotations.Test;
2525
import ru.mystamps.web.tests.page.AddCategoryPage;
2626

27+
@Deprecated
2728
public class WhenAdminAddCategory extends WhenAnyUserAtAnyPageWithForm<AddCategoryPage> {
2829

2930
@Value("${valid_admin_login}")
@@ -53,7 +54,6 @@ public void tearDown() {
5354

5455
@Test(groups = "std")
5556
public void shouldHaveStandardStructure() {
56-
checkStandardStructure();
5757
}
5858

5959
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.testng.annotations.Test;
2525
import ru.mystamps.web.tests.page.AddCountryPage;
2626

27+
@Deprecated
2728
public class WhenAdminAddCountry extends WhenAnyUserAtAnyPageWithForm<AddCountryPage> {
2829

2930
@Value("${valid_admin_login}")
@@ -53,7 +54,6 @@ public void tearDown() {
5354

5455
@Test(groups = "std")
5556
public void shouldHaveStandardStructure() {
56-
checkStandardStructure();
5757
}
5858

5959
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* The main difference between this test and {@link WhenUserAddSeries} is that as admin we have
2929
* additional field for comment.
3030
*/
31+
@Deprecated
3132
public class WhenAdminAddSeries extends WhenAnyUserAtAnyPageWithForm<AddSeriesPage> {
3233

3334
@Value("${valid_admin_login}")
@@ -57,7 +58,6 @@ public void tearDown() {
5758

5859
@Test(groups = "std")
5960
public void shouldHaveStandardStructure() {
60-
checkStandardStructure();
6161
}
6262

6363
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.testng.annotations.Test;
2222
import ru.mystamps.web.tests.page.ActivateAccountPage;
2323

24+
@Deprecated
2425
public class WhenAnonymousUserActivateAccount
2526
extends WhenAnyUserAtAnyPageWithForm<ActivateAccountPage> {
2627

@@ -35,7 +36,6 @@ public void openPage() {
3536

3637
@Test(groups = "std")
3738
public void shouldHaveStandardStructure() {
38-
checkStandardStructure();
3939
}
4040

4141
}

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,23 @@ public void openPage() {
5252
page.open();
5353
}
5454

55-
@Test(groups = "std")
56-
public void shouldHaveStandardStructure() {
57-
checkStandardStructure();
58-
}
59-
60-
@Test(groups = "invalid", dependsOnGroups = "std")
55+
@Test(groups = "invalid")
6156
public void emptyValuesShouldBeConsideredAsInvalidCredentials() {
6257
page.authorizeUser("", "");
6358

6459
assertThat(page.getFormError())
6560
.isEqualTo(tr("AbstractUserDetailsAuthenticationProvider.badCredentials"));
6661
}
6762

68-
@Test(groups = "invalid", dependsOnGroups = "std")
63+
@Test(groups = "invalid")
6964
public void invalidCredentialsShouldBeRejected() {
7065
page.authorizeUser(invalidUserLogin, invalidUserPassword);
7166

7267
assertThat(page.getFormError())
7368
.isEqualTo(tr("AbstractUserDetailsAuthenticationProvider.badCredentials"));
7469
}
7570

76-
@Test(groups = "logic", dependsOnGroups = "std")
71+
@Test(groups = "logic")
7772
public void validCredentialsShouldAuthenticateUserOnSite() {
7873
page.authorizeUser(validUserLogin, validUserPassword);
7974

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,7 @@ public void openPage() {
8383
page.open();
8484
}
8585

86-
@Test(groups = "std")
87-
public void shouldHaveStandardStructure() {
88-
checkStandardStructure();
89-
}
90-
91-
@Test(groups = "misc", dependsOnGroups = "std")
86+
@Test(groups = "misc")
9287
public void shouldExistsMessageWithLinkToAuthenticationPage() {
9388
assertThat(page.getFormHints()).contains(stripHtmlTags(tr("t_if_you_already_registered")));
9489

@@ -97,7 +92,7 @@ public void shouldExistsMessageWithLinkToAuthenticationPage() {
9792
.isTrue();
9893
}
9994

100-
@Test(groups = "invalid", dependsOnGroups = "std")
95+
@Test(groups = "invalid")
10196
public void emailShouldNotBeTooLong() {
10297
page.registerUser(StringUtils.repeat("0", EMAIL_MAX_LENGTH) + "@mail.ru");
10398

@@ -106,21 +101,21 @@ public void emailShouldNotBeTooLong() {
106101
.hasError(tr("value.too-long", EMAIL_MAX_LENGTH));
107102
}
108103

109-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidEmails")
104+
@Test(groups = "invalid", dataProvider = "invalidEmails")
110105
public void emailShouldBeValid(String invalidEmail, String expectedMessage) {
111106
page.registerUser(invalidEmail);
112107

113108
assertThat(page).field("email").hasError(expectedMessage);
114109
}
115110

116-
@Test(groups = "misc", dependsOnGroups = "std")
111+
@Test(groups = "misc")
117112
public void emailShouldBeStripedFromLeadingAndTrailingSpaces() {
118113
page.registerUser(" test ");
119114

120115
assertThat(page).field("email").hasValue("test");
121116
}
122117

123-
@Test(groups = "logic", dependsOnGroups = { "std", "invalid", "misc" })
118+
@Test(groups = "logic", dependsOnGroups = { "invalid", "misc" })
124119
public void successfulMessageShouldBeShownAfterRegistration() {
125120
page.registerUser("coder@rock.home");
126121

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,4 @@ abstract class WhenAnyUserAtAnyPageWithForm<T extends AbstractPageWithForm>
2828
super(pageClass);
2929
}
3030

31-
@Deprecated
32-
protected void checkStandardStructure() {
33-
}
34-
3531
}

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,7 @@ public void tearDown() {
9898
page.logout();
9999
}
100100

101-
@Test(groups = "std")
102-
public void shouldHaveStandardStructure() {
103-
checkStandardStructure();
104-
}
105-
106-
@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
101+
@Test(groups = "valid", dataProvider = "validCatalogNumbers")
107102
public void catalogNumbersShouldAcceptValidValues(String numbers, Object whatever) {
108103
page.showCatalogNumbers();
109104

@@ -124,7 +119,7 @@ public void catalogNumbersShouldAcceptValidValues(String numbers, Object whateve
124119
assertThat(page).field("zagorskiNumbers").hasNoError();
125120
}
126121

127-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogNumbers")
122+
@Test(groups = "invalid", dataProvider = "invalidCatalogNumbers")
128123
public void catalogNumbersShouldRejectInvalidValues(
129124
String numbers,
130125
String msg,
@@ -150,7 +145,7 @@ public void catalogNumbersShouldRejectInvalidValues(
150145
assertThat(page).field("zagorskiNumbers").hasError(msg);
151146
}
152147

153-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
148+
@Test(groups = "invalid", dataProvider = "invalidCatalogPrices")
154149
public void catalogPricesShouldRejectInvalidValues(String price, String msg) {
155150
page.showCatalogNumbers();
156151

@@ -171,7 +166,7 @@ public void catalogPricesShouldRejectInvalidValues(String price, String msg) {
171166
assertThat(page).field("zagorskiPrice").hasError(msg);
172167
}
173168

174-
@Test(groups = "misc", dependsOnGroups = "std")
169+
@Test(groups = "misc")
175170
public void catalogNumbersShouldBeStripedFromSpaces() {
176171
page.showCatalogNumbers();
177172

@@ -192,7 +187,7 @@ public void catalogNumbersShouldBeStripedFromSpaces() {
192187
assertThat(page).field("zagorskiNumbers").hasValue("11,12");
193188
}
194189

195-
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
190+
@Test(groups = "logic", dependsOnGroups = { "valid", "invalid", "misc" })
196191
public void shouldCreateSeriesWithOnlyRequiredFieldsFilled() {
197192
String expectedCategoryName = validCategoryName;
198193
String expectedQuantity = "2";
@@ -219,7 +214,7 @@ public void shouldCreateSeriesWithOnlyRequiredFieldsFilled() {
219214
assertThat(nextPage.getPerforated()).isEqualTo(tr("t_yes"));
220215
}
221216

222-
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
217+
@Test(groups = "logic", dependsOnGroups = { "valid", "invalid", "misc" })
223218
public void shouldCreateSeriesWithAllFieldsFilled() {
224219
String expectedPageUrl = Url.INFO_SERIES_PAGE.replace("{id}", "\\d+");
225220
String expectedImageUrl = Url.SITE + Url.GET_IMAGE_PREVIEW_PAGE.replace("{id}", "\\d+");
@@ -289,7 +284,7 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
289284
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#50-52 (150.2 RUB)");
290285
}
291286

292-
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
287+
@Test(groups = "logic", dependsOnGroups = { "valid", "invalid", "misc" })
293288
public void shouldIgnoreDuplicatedCatalogNumbers() {
294289
page.fillCategory(validCategoryName);
295290
page.fillQuantity("2");
@@ -315,7 +310,7 @@ public void shouldIgnoreDuplicatedCatalogNumbers() {
315310
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#54, 55");
316311
}
317312

318-
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
313+
@Test(groups = "logic", dependsOnGroups = { "valid", "invalid", "misc" })
319314
public void shouldAllowExistingCatalogNumbers() {
320315
page.fillCategory(validCategoryName);
321316
page.fillQuantity("2");

0 commit comments

Comments
 (0)