Skip to content

Commit b4ae722

Browse files
committed
WhenAdminAddSeries,WhenUserAddSeries: combine together test cases for catalog prices.
-michelPriceShouldRejectInvalidValues -scottPriceShouldRejectInvalidValues -yvertPriceShouldRejectInvalidValues -gibbonsPriceShouldRejectInvalidValues +catalogPricesShouldRejectInvalidValues No functional changes.
1 parent 94de55f commit b4ae722

File tree

2 files changed

+10
-56
lines changed

2 files changed

+10
-56
lines changed

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

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -198,42 +198,19 @@ public void catalogNumbersShouldRejectInvalidValues(String numbers, String msg)
198198
}
199199

200200
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
201-
public void michelPriceShouldRejectInvalidValues(String price, String msg) {
201+
public void catalogPricesShouldRejectInvalidValues(String price, String msg) {
202202
page.showCatalogNumbers();
203-
page.fillMichelPrice(price);
204-
205-
page.submit();
206203

207-
assertThat(page).field("michelPrice").hasError(msg);
208-
}
209-
210-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
211-
public void scottPriceShouldRejectInvalidValues(String price, String msg) {
212-
page.showCatalogNumbers();
204+
page.fillMichelPrice(price);
213205
page.fillScottPrice(price);
214-
215-
page.submit();
216-
217-
assertThat(page).field("scottPrice").hasError(msg);
218-
}
219-
220-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
221-
public void yvertPriceShouldRejectInvalidValues(String price, String msg) {
222-
page.showCatalogNumbers();
223206
page.fillYvertPrice(price);
224-
225-
page.submit();
226-
227-
assertThat(page).field("yvertPrice").hasError(msg);
228-
}
229-
230-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
231-
public void gibbonsPriceShouldRejectInvalidValues(String price, String msg) {
232-
page.showCatalogNumbers();
233207
page.fillGibbonsPrice(price);
234208

235209
page.submit();
236210

211+
assertThat(page).field("michelPrice").hasError(msg);
212+
assertThat(page).field("scottPrice").hasError(msg);
213+
assertThat(page).field("yvertPrice").hasError(msg);
237214
assertThat(page).field("gibbonsPrice").hasError(msg);
238215
}
239216

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

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -193,42 +193,19 @@ public void catalogNumbersShouldRejectInvalidValues(String numbers, String msg)
193193
}
194194

195195
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
196-
public void michelPriceShouldRejectInvalidValues(String price, String msg) {
196+
public void catalogPricesShouldRejectInvalidValues(String price, String msg) {
197197
page.showCatalogNumbers();
198-
page.fillMichelPrice(price);
199-
200-
page.submit();
201198

202-
assertThat(page).field("michelPrice").hasError(msg);
203-
}
204-
205-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
206-
public void scottPriceShouldRejectInvalidValues(String price, String msg) {
207-
page.showCatalogNumbers();
199+
page.fillMichelPrice(price);
208200
page.fillScottPrice(price);
209-
210-
page.submit();
211-
212-
assertThat(page).field("scottPrice").hasError(msg);
213-
}
214-
215-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
216-
public void yvertPriceShouldRejectInvalidValues(String price, String msg) {
217-
page.showCatalogNumbers();
218201
page.fillYvertPrice(price);
219-
220-
page.submit();
221-
222-
assertThat(page).field("yvertPrice").hasError(msg);
223-
}
224-
225-
@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidCatalogPrices")
226-
public void gibbonsPriceShouldRejectInvalidValues(String price, String msg) {
227-
page.showCatalogNumbers();
228202
page.fillGibbonsPrice(price);
229203

230204
page.submit();
231205

206+
assertThat(page).field("michelPrice").hasError(msg);
207+
assertThat(page).field("scottPrice").hasError(msg);
208+
assertThat(page).field("yvertPrice").hasError(msg);
232209
assertThat(page).field("gibbonsPrice").hasError(msg);
233210
}
234211

0 commit comments

Comments
 (0)