WhenAdminAddSeries.shouldAllowExistingCatalogNumbers: port to Robot Framework.

Addressed to #530

No functional changes.

Author: php-coder

src/main/resources/liquibase/sql/test-series-with-catalogs-numbers.sql

@@ -6,7 +6,7 @@
 INSERT INTO users(id, login, role, name, registered_at, activated_at, hash, salt, email) VALUES
 	(4, 'test1', 'USER', 'Series Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
 
--- Used only in WhenUserAddSeries and WhenAdminAddSeries
+-- Used only in WhenUserAddSeries and src/test/robotframework/series/creation/misc.robot
 INSERT INTO images(id, type) VALUES(1, 'PNG');
 INSERT INTO series(id, quantity, perforated, image_url, created_at, created_by, updated_at, updated_by) VALUES
 	(1, 1, TRUE, '/image/1', NOW(), 4, NOW(), 4);

src/main/resources/test/spring/test-data.properties

@@ -27,15 +27,15 @@ valid_country_name_en = Italy
 valid_country_name_ru = \u0418\u0442\u0430\u043b\u0438\u044f
 
 # these catalogs' numbers should always exist
-# (used only in WhenUserAddSeries and WhenAdminAddSeries)
+# (used only in WhenUserAddSeries and src/test/robotframework/series/creation/misc.robot)
 existing_michel_number = 99
 existing_scott_number = 99
 existing_yvert_number = 99
 existing_gibbons_number = 99
 
 # this category should always exist
-# (used in WhenUserAddSeries, WhenAdminAddSeries and
-# src/test/robotframework/category/creation/validation.robot)
+# (used in WhenUserAddSeries, src/test/robotframework/category/creation/validation.robot and
+# src/test/robotframework/series/creation/misc.robot)
 valid_category_name_en = Sport
 # ATTENTION: must be encoded by native2asscii (MRESOURCES-175)
 valid_category_name_ru = \u0421\u043f\u043e\u0440\u0442

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

@@ -17,65 +17,29 @@
  */
 package ru.mystamps.web.tests.cases;
 
-import java.io.File;
-import java.net.URISyntaxException;
-
 import org.springframework.beans.factory.annotation.Value;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import ru.mystamps.web.tests.page.AbstractPage;
 import ru.mystamps.web.tests.page.AddSeriesPage;
-import ru.mystamps.web.tests.page.InfoSeriesPage;
 
 import static ru.mystamps.web.tests.fest.PageWithFormAssert.assertThat;
 
-import static org.fest.assertions.api.Assertions.assertThat;
-
 /**
  * The main difference between this test and {@link WhenUserAddSeries} is that as admin we have
  * additional field for comment.
  */
 public class WhenAdminAddSeries extends WhenAnyUserAtAnyPageWithForm<AddSeriesPage> {
 
-	private static final String SAMPLE_IMAGE_NAME = "test/test.png";
-	private static final String SAMPLE_IMAGE_PATH;
-	
-	static {
-		try {
-			SAMPLE_IMAGE_PATH = new File(
-				WhenAdminAddSeries.class.getClassLoader().getResource(SAMPLE_IMAGE_NAME).toURI()
-			).getAbsolutePath();
-			
-		} catch (URISyntaxException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	
 	@Value("${valid_admin_login}")
 	private String validAdminLogin;
 
 	@Value("${valid_admin_password}")
 	private String validAdminPassword;
 
-	@Value("${existing_michel_number}")
-	private String existingMichelNumber;
-	
-	@Value("${existing_scott_number}")
-	private String existingScottNumber;
-	
-	@Value("${existing_yvert_number}")
-	private String existingYvertNumber;
-	
-	@Value("${existing_gibbons_number}")
-	private String existingGibbonsNumber;
-	
-	@Value("${valid_category_name_en}")
-	private String validCategoryName;
-	
 	public WhenAdminAddSeries() {
 		super(AddSeriesPage.class);
 	}
@@ -127,25 +91,4 @@ public void commentShouldBeStripedFromLeadingAndTrailingSpaces() {
 		assertThat(page).field("comment").hasValue("example comment");
 	}
 
-	@Test(groups = "logic", dependsOnGroups = { "std", "misc" })
-	public void shouldAllowExistingCatalogNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
-		page.fillMichelNumbers(existingMichelNumber);
-		page.fillScottNumbers(existingScottNumber);
-		page.fillYvertNumbers(existingYvertNumber);
-		page.fillGibbonsNumbers(existingGibbonsNumber);
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
-		
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#" + existingMichelNumber);
-		assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#" + existingScottNumber);
-		assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#" + existingYvertNumber);
-		assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#" + existingGibbonsNumber);
-	}
-	
 }

src/test/robotframework/series/creation/misc.robot

@@ -33,6 +33,23 @@ Catalog numbers should ignore duplicate values
 	Element Text Should Be     id=yvert_catalog_info    \#124, 125
 	Element Text Should Be     id=gibbons_catalog_info  \#134, 135
 
+Catalog numbers should accept existing numbers
+	[Documentation]            Verify that existing catalog numbers are being accepted
+	Go To                      ${SITE_URL}/series/add
+	Select From List By Label  id=category  Sport
+	Input Text                 id=quantity  2
+	Choose File                id=image  ${MAIN_RESOURCE_DIR}${/}test.png
+	Click Element              id=add-catalog-numbers-link
+	Input Text                 id=michelNumbers   99
+	Input Text                 id=scottNumbers    99
+	Input Text                 id=yvertNumbers    99
+	Input Text                 id=gibbonsNumbers  99
+	Submit Form                id=add-series-form
+	Element Text Should Be     id=michel_catalog_info   \#99
+	Element Text Should Be     id=scott_catalog_info    \#99
+	Element Text Should Be     id=yvert_catalog_info    \#99
+	Element Text Should Be     id=gibbons_catalog_info  \#99
+
 Issue year should have options for range from 1840 to the current year
 	[Documentation]              Verify that field with year provides all valid values
 	Go To                        ${SITE_URL}/series/add