WhenAdminAddSeries,WhenUserAddSeries: combine together test cases for catalog numbers.

-michelNumbersShouldAcceptValidValues
-scottNumbersShouldAcceptValidValues
-yvertNumbersShouldAcceptValidValues
-gibbonsNumbersShouldAcceptValidValues
+catalogNumbersShouldAcceptValidValues

No functional changes.

Author: php-coder

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

@@ -133,42 +133,19 @@ public void shouldHaveStandardStructure() {
 	}
 
 	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void michelNumbersShouldAcceptValidValues(String numbers, Object whatever) {
+	public void catalogNumbersShouldAcceptValidValues(String numbers, Object whatever) {
 		page.showCatalogNumbers();
-		page.fillMichelNumbers(numbers);
-		
-		page.submit();
 
-		assertThat(page).field("michelNumbers").hasNoError();
-	}
-	
-	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void scottNumbersShouldAcceptValidValues(String numbers, Object whatever) {
-		page.showCatalogNumbers();
+		page.fillMichelNumbers(numbers);
 		page.fillScottNumbers(numbers);
-		
-		page.submit();
-		
-		assertThat(page).field("scottNumbers").hasNoError();
-	}
-	
-	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void yvertNumbersShouldAcceptValidValues(String numbers, Object whatever) {
-		page.showCatalogNumbers();
 		page.fillYvertNumbers(numbers);
-		
-		page.submit();
-		
-		assertThat(page).field("yvertNumbers").hasNoError();
-	}
-	
-	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void gibbonsNumbersShouldAcceptValidValues(String numbers, Object whatever) {
-		page.showCatalogNumbers();
 		page.fillGibbonsNumbers(numbers);
 
 		page.submit();
 
+		assertThat(page).field("michelNumbers").hasNoError();
+		assertThat(page).field("scottNumbers").hasNoError();
+		assertThat(page).field("yvertNumbers").hasNoError();
 		assertThat(page).field("gibbonsNumbers").hasNoError();
 	}
 

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

@@ -128,42 +128,19 @@ public void shouldHaveStandardStructure() {
 	}
 
 	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void michelNumbersShouldAcceptValidValues(String numbers, Object whatever) {
+	public void catalogNumbersShouldAcceptValidValues(String numbers, Object whatever) {
 		page.showCatalogNumbers();
-		page.fillMichelNumbers(numbers);
-		
-		page.submit();
 
-		assertThat(page).field("michelNumbers").hasNoError();
-	}
-	
-	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void scottNumbersShouldAcceptValidValues(String numbers, Object whatever) {
-		page.showCatalogNumbers();
+		page.fillMichelNumbers(numbers);
 		page.fillScottNumbers(numbers);
-		
-		page.submit();
-		
-		assertThat(page).field("scottNumbers").hasNoError();
-	}
-	
-	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void yvertNumbersShouldAcceptValidValues(String numbers, Object whatever) {
-		page.showCatalogNumbers();
 		page.fillYvertNumbers(numbers);
-		
-		page.submit();
-		
-		assertThat(page).field("yvertNumbers").hasNoError();
-	}
-	
-	@Test(groups = "valid", dependsOnGroups = "std", dataProvider = "validCatalogNumbers")
-	public void gibbonsNumbersShouldAcceptValidValues(String numbers, Object whatever) {
-		page.showCatalogNumbers();
 		page.fillGibbonsNumbers(numbers);
 
 		page.submit();
 
+		assertThat(page).field("michelNumbers").hasNoError();
+		assertThat(page).field("scottNumbers").hasNoError();
+		assertThat(page).field("yvertNumbers").hasNoError();
 		assertThat(page).field("gibbonsNumbers").hasNoError();
 	}