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

-shouldIgnoreDuplicatedMichelNumbers
-shouldIgnoreDuplicatedScottNumbers
-shouldIgnoreDuplicatedYvertNumbers
-shouldIgnoreDuplicatedGibbonsNumbers
+shouldIgnoreDuplicatedCatalogNumbers

No functional changes.

Author: php-coder

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

@@ -367,62 +367,24 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
 	}
 
 	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedMichelNumbers() {
+	public void shouldIgnoreDuplicatedCatalogNumbers() {
 		page.fillCategory(validCategoryName);
 		page.fillQuantity("2");
 		page.fillImage(SAMPLE_IMAGE_PATH);
 		page.showCatalogNumbers();
-		page.fillMichelNumbers("104,105,104");
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
 
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#104, 105");
-	}
-	
-	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedScottNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
+		page.fillMichelNumbers("104,105,104");
 		page.fillScottNumbers("114,115,114");
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
-		
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#114, 115");
-	}
-	
-	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedYvertNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
 		page.fillYvertNumbers("124,125,124");
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
-		
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#124, 125");
-	}
-	
-	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedGibbonsNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
 		page.fillGibbonsNumbers("134,135,134");
 
 		AbstractPage next = page.submit();
 		assertThat(next).isInstanceOf(InfoSeriesPage.class);
 
 		InfoSeriesPage nextPage = (InfoSeriesPage)next;
+		assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#104, 105");
+		assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#114, 115");
+		assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#124, 125");
 		assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#134, 135");
 	}
 

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

@@ -334,62 +334,24 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
 	}
 
 	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedMichelNumbers() {
+	public void shouldIgnoreDuplicatedCatalogNumbers() {
 		page.fillCategory(validCategoryName);
 		page.fillQuantity("2");
 		page.fillImage(SAMPLE_IMAGE_PATH);
 		page.showCatalogNumbers();
-		page.fillMichelNumbers("4,5,4");
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
 
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#4, 5");
-	}
-	
-	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedScottNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
+		page.fillMichelNumbers("4,5,4");
 		page.fillScottNumbers("14,15,14");
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
-		
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#14, 15");
-	}
-	
-	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedYvertNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
 		page.fillYvertNumbers("24,25,24");
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
-		
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#24, 25");
-	}
-	
-	@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
-	public void shouldIgnoreDuplicatedGibbonsNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
 		page.fillGibbonsNumbers("34,35,34");
 
 		AbstractPage next = page.submit();
 		assertThat(next).isInstanceOf(InfoSeriesPage.class);
 
 		InfoSeriesPage nextPage = (InfoSeriesPage)next;
+		assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#4, 5");
+		assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#14, 15");
+		assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#24, 25");
 		assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#34, 35");
 	}