Author: mposolda(a)redhat.com Date: 2009-06-23 04:07:15 -0400 (Tue, 23 Jun 2009) New Revision: 13481 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java Log: PortalBookstoreSampleTestCase refactoring. Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java 2009-06-23 02:03:19 UTC (rev 13480) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java 2009-06-23 08:07:15 UTC (rev 13481) @@ -269,26 +269,26 @@ clickAndWait(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1001" + CATALOG_PORTLET_TABLE_TR_ADD_SUFFIX); clickAndWait(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1005" + CATALOG_PORTLET_TABLE_TR_ADD_SUFFIX); // verify 1 - Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), 149.93)); + Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), "149.93"), "Total currency value text is " + selenium.getText(CASHIER_PORTLET_AMOUNT) + " but should be 149.93."); // Add books from details portlet clickAndWait(SHOWCART_PORTLET_TABLE_TR_PREFIX + "1000" + SHOWCART_PORTLET_TABLE_TR_TITLE_SUFFIX); clickAndWait(DETAIL_PORTLET_ADD_LINK); clickAndWait(DETAIL_PORTLET_ADD_LINK); // verify 2 - Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), 229.91)); + Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), "229.91"), "Total currency value text is " + selenium.getText(CASHIER_PORTLET_AMOUNT) + " but should be 229.91."); // Remove some books clickAndWait(SHOWCART_PORTLET_TABLE_TR_PREFIX + "1005" + SHOWCART_PORTLET_TABLE_TR_REMOVE_SUFFIX); clickAndWait(SHOWCART_PORTLET_TABLE_TR_PREFIX + "1000" + SHOWCART_PORTLET_TABLE_TR_REMOVE_SUFFIX); clickAndWait(SHOWCART_PORTLET_TABLE_TR_PREFIX + "1000" + SHOWCART_PORTLET_TABLE_TR_REMOVE_SUFFIX); // verify 3 - Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), 124.93)); + Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), "124.93"), "Total currency value text is " + selenium.getText(CASHIER_PORTLET_AMOUNT) + " but should be 124.93."); // Clear card clickAndWait(SHOWCART_PORTLET_CLEAR_CART_LINK); // verify 4 - Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), 0.00)); + Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), "0.0"), "Total currency value text is " + selenium.getText(CASHIER_PORTLET_AMOUNT) + " but should be 0.0"); } /** @@ -304,7 +304,7 @@ clickAndWait(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1004" + CATALOG_PORTLET_TABLE_TR_ADD_SUFFIX); clickAndWait(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1004" + CATALOG_PORTLET_TABLE_TR_ADD_SUFFIX); Assert.assertEquals(SHOWCART_PORTLET_CARD_ITEMS_PREFIX + "5" + SHOWCART_PORTLET_CARD_ITEMS_SUFFIX, selenium.getText(SHOWCART_PORTLET_HEADER)); - Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), 214.83)); + Assert.assertTrue(valueEqualsCurrency(selenium.getText(CASHIER_PORTLET_AMOUNT), "214.83"), "Total currency value text is " + selenium.getText(CASHIER_PORTLET_AMOUNT) + " but should be 214.83."); Assert.assertEquals("3", selenium.getText(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1000" + CATALOG_PORTLET_TABLE_TR_COUNT_SUFFIX)); Assert.assertEquals("4", selenium.getText(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1001" + CATALOG_PORTLET_TABLE_TR_COUNT_SUFFIX)); Assert.assertEquals("9", selenium.getText(CATALOG_PORTLET_TABLE_TR_PREFFIX + "1004" + CATALOG_PORTLET_TABLE_TR_COUNT_SUFFIX)); @@ -360,26 +360,17 @@ /** * Test if given currency String equals to given value. For example: - * Params: ("$39.99", 39.99) - true - * Params: ("¤ 281,79", 281.79) - true - * Params: ("¤ 281,79", 18.15) - false + * Params: ("$39.99", "39.99") - true + * Params: ("¤ 281,79", "281.79") - true + * Params: ("¤ 281,79", "18.15") - false * * @param currencyString * @param value * @return */ - private boolean valueEqualsCurrency(String currencyString, double value) { + private boolean valueEqualsCurrency(String currencyString, String valueString) { String s = currencyString.replace(',', '.'); - for (int i=0 ; i<s.length(); i++) { - if (("0".compareTo(currencyString) < -1) && ((s.compareTo("9") <= 1) || (s.charAt(0) == '9'))) { - double d = Double.parseDouble(s); - return d == value; - } - else { - s = s.substring(1); - } - } - return false; + return s.contains(valueString); } }