Author: ymartel Date: 2012-06-15 17:12:06 +0200 (Fri, 15 Jun 2012) New Revision: 3481 Url: http://chorem.org/repositories/revision/pollen/3481 Log: refs #606 : extract check of current url Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-15 15:09:26 UTC (rev 3480) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-15 15:12:06 UTC (rev 3481) @@ -147,6 +147,10 @@ return baseUrl() + "poll/create"; } + public String savePollURL() { + return baseUrl() + "poll/save"; + } + public String summaryURL() { return baseUrl() + "poll/summary"; } Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-15 15:09:26 UTC (rev 3480) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-15 15:12:06 UTC (rev 3481) @@ -95,8 +95,7 @@ submit.click(); // All good, should be on summary page ! - String currentUrl = driver.getCurrentUrl(); - Assert.assertTrue(currentUrl.startsWith(fixtures.summaryURL())); + checkCurrentUrl(fixtures.summaryURL(), false); } /** @@ -130,7 +129,7 @@ submit.click(); // Title is missing, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); // Check an error message has been displayed WebElement titleError = findElement(By.className("errorMessage")); @@ -172,7 +171,7 @@ submit.click(); // No choices, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); // Check that title field is not lost titleElement = findElement(By.name("poll.title")); @@ -230,7 +229,7 @@ submit.click(); // No choices, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); // Check an error message has been displayed WebElement dateError = findElement(By.className("errorMessage")); @@ -307,7 +306,7 @@ submit.click(); // No choices, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); // Check an error message has been displayed WebElement dateError = findElement(By.className("errorMessage")); @@ -367,7 +366,7 @@ submit.click(); // No choices, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); // Check an error message has been displayed WebElement dateError = findElement(By.className("errorMessage")); @@ -437,7 +436,7 @@ submit.click(); // No choices, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); // Check an error message has been displayed WebElement dateError = findElement(By.className("errorMessage")); @@ -473,7 +472,7 @@ submit.click(); // No choices, should stay on create poll page - Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + checkCurrentUrl(fixtures.createPollURL(), false); } Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-15 15:09:26 UTC (rev 3480) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-15 15:12:06 UTC (rev 3481) @@ -113,6 +113,16 @@ expectedUrl = fallBackUrl; } + checkCurrentUrl(expectedUrl, strict); + } + + /** + * Check that the current URL is the expected one. + * If it is a strict comparison, the URL should be the same that the wanted. + * If not, it only checks that the current URL start with the wanted url. + * + */ + protected void checkCurrentUrl(String expectedUrl, boolean strict) { if (strict) { Assert.assertEquals(expectedUrl, driver.getCurrentUrl()); } else {