Author: ppitonak(a)redhat.com Date: 2009-11-04 03:43:52 -0500 (Wed, 04 Nov 2009) New Revision: 15821 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/messages.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelBar/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/messages.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/progressBar/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/separator/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/simpleTogglePanel/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/spacer/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/tabPanel/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/togglePanel/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/toolBar/locators.properties Log: * Xpath locator changed to jQuery Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -46,8 +46,7 @@ private final String MSG_CUST_THIRD_CLASS_2 = getMsg("CUST_THIRD_CLASS_2"); private final String MSG_CUST_FOURTH_HEADER = getMsg("CUST_FOURTH_HEADER"); private final String MSG_CUST_FOURTH_CLASS = getMsg("CUST_FOURTH_CLASS"); - private final int MSG_CUST_FIFTH_COUNT = Integer.parseInt(getMsg("CUST_FIFTH_COUNT")); - + // locators private final String LOC_CUST_FIRST_PANEL_HEADER = getLoc("CUST_FIRST_PANEL_HEADER"); private final String LOC_CUST_SECOND_PANEL_HEADER = getLoc("CUST_SECOND_PANEL_HEADER"); @@ -55,7 +54,8 @@ private final String LOC_CUST_THIRD_PANEL_BODY = getLoc("CUST_THIRD_PANEL_BODY"); private final String LOC_CUST_FOURTH_PANEL_BODY = getLoc("CUST_FOURTH_PANEL_BODY"); private final String LOC_CUST_FOURTH_PANEL_HEADER = getLoc("CUST_FOURTH_PANEL_HEADER"); - private final String LOC_CUST_FIFTH_PANEL_PARTS = getLoc("CUST_FIFTH_PANEL_PARTS"); + private final String LOC_CUST_FIFTH_PANEL_BODY = getLoc("CUST_FIFTH_PANEL_BODY"); + private final String LOC_CUST_FIFTH_PANEL_HEADER = getLoc("CUST_FIFTH_PANEL_HEADER"); /** * Tests first panel. It checks panel header's text and class attribute. @@ -106,8 +106,11 @@ */ @Test public void testFifthPanel() { - int count = selenium.getXpathCount(LOC_CUST_FIFTH_PANEL_PARTS).intValue(); - assertEquals(count, MSG_CUST_FIFTH_COUNT, "The fifth panel should have no header."); + boolean isPresent = selenium.isElementPresent(LOC_CUST_FIFTH_PANEL_HEADER); + assertEquals(isPresent, false, "The fifth panel should have no header."); + + isPresent = selenium.isElementPresent(LOC_CUST_FIFTH_PANEL_BODY); + assertEquals(isPresent, true, "The fifth panel should have body."); } /** Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -62,7 +62,7 @@ */ @Test public void testFirstExample() { - int count = selenium.getXpathCount(LOC_FIRST_DIVS).intValue(); + int count = getJQueryCount(LOC_FIRST_DIVS); assertEquals(count, 2, MSG_FIRST_PANEL_TWO_PARTS); String text = selenium.getText(LOC_FIRST_HEADER); @@ -74,7 +74,7 @@ */ @Test public void testSecondExample() { - int count = selenium.getXpathCount(LOC_SECOND_DIVS).intValue(); + int count = getJQueryCount(LOC_SECOND_DIVS); assertEquals(count, 1, MSG_SECOND_PANEL_NO_HEADER); } @@ -86,19 +86,19 @@ */ @Test public void testThirdExample() { - int count = selenium.getXpathCount(LOC_THIRD_DIVS).intValue(); + int count = getJQueryCount(LOC_THIRD_DIVS); assertEquals(count, 2, MSG_THIRD_PANEL_TWO_PARTS); String text = selenium.getText(LOC_THIRD_HEADER); assertEquals(text, "", MSG_THIRD_HEADER); - count = selenium.getXpathCount(LOC_THIRD_NESTED_PANELS).intValue(); + count = getJQueryCount(LOC_THIRD_NESTED_PANELS); assertEquals(count, 2, MSG_SHOULD_BE_TWO_NESTED_PANELS); - count = selenium.getXpathCount(LOC_LEFT_NESTED_PANEL_LIST_LI).intValue(); + count = getJQueryCount(LOC_LEFT_NESTED_PANEL_LIST_LI); assertEquals(count, 6, MSG_SIX_ITEMS_IN_LIST_LEFT); - count = selenium.getXpathCount(LOC_RIGHT_NESTED_PANEL_LIST_LI).intValue(); + count = getJQueryCount(LOC_RIGHT_NESTED_PANEL_LIST_LI); assertEquals(count, 6, MSG_SIX_ITEMS_IN_LIST_RIGHT); } Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -61,14 +61,14 @@ "Create a modern rich user interface look-and-feel with skins-based technology", "Test the components, actions, listeners, and pages as you are creating them" }; - String text = selenium.getText(format(LOC_HEADER_2_N, 1)); + String text = selenium.getText(format(LOC_HEADER_1_N, 0)); assertEquals(text, headers[0], format(MSG_HEADER_N, 1)); - assertTrue(isDisplayed(format(LOC_CONTENT_N, 1)), format(MSG_PANEL_N_SHOULD_BE_VISIBLE, 1)); + assertTrue(isDisplayed(format(LOC_CONTENT_N, 0)), format(MSG_PANEL_N_SHOULD_BE_VISIBLE, 1)); - for (int i = 2; i < 8; i++) { - text = selenium.getText(format(LOC_HEADER_1_N, i)); - assertEquals(text, headers[i - 1], format(MSG_HEADER_N, i)); - assertFalse(isDisplayed(format(LOC_CONTENT_N, i)), format(MSG_PANEL_N_SHOULD_NOT_BE_VISIBLE, i)); + for (int i = 1; i < 7; i++) { + text = selenium.getText(format(LOC_HEADER_2_N, i)); + assertEquals(text, headers[i], format(MSG_HEADER_N, i + 1)); + assertFalse(isDisplayed(format(LOC_CONTENT_N, i)), format(MSG_PANEL_N_SHOULD_NOT_BE_VISIBLE, i + 1)); } } @@ -78,18 +78,18 @@ */ @Test public void testExpanding() { - for (int i = 7; i > 0; i--) { + for (int i = 6; i >= 0; i--) { selenium.click(format(LOC_HEADER_1_N, i)); // check that clicked panel is visible - assertTrue(isDisplayed(format(LOC_CONTENT_N, i)), format(MSG_PANEL_N_SHOULD_BE_VISIBLE, i)); + assertTrue(isDisplayed(format(LOC_CONTENT_N, i)), format(MSG_PANEL_N_SHOULD_BE_VISIBLE, i + 1)); // check that other panel are not visible - for (int j = 1; j < 8; j++) { + for (int j = 0; j < 7; j++) { if (j == i) { continue; } - assertFalse(isDisplayed(format(LOC_CONTENT_N, j)), format(MSG_PANEL_N_SHOULD_NOT_BE_VISIBLE, i)); + assertFalse(isDisplayed(format(LOC_CONTENT_N, j)), format(MSG_PANEL_N_SHOULD_NOT_BE_VISIBLE, i + 1)); } } } Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -81,7 +81,7 @@ */ @Test public void testFirstGroup() { - abstractTestGroupN(1); + abstractTestGroupN(0); } /** @@ -93,7 +93,7 @@ */ @Test public void testSecondGroup() { - abstractTestGroupN(2); + abstractTestGroupN(1); } /** @@ -105,7 +105,7 @@ */ @Test public void testThirdGroup() { - abstractTestGroupN(3); + abstractTestGroupN(2); } /** @@ -119,34 +119,34 @@ public void testSubgroup() { String text = null; - selenium.click(format(LOC_GROUP_N_TEXT, 2)); + selenium.click(format(LOC_GROUP_N_TEXT, 1)); // image before subgroup name - text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_BEFORE, 2, 4)); + text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_BEFORE, 1, 3)); assertTrue(text.contains("PanelMenuIconDisc"), MSG_DISK_BEFORE_GROUP_NAME); // subgroup name - text = selenium.getText(format(LOC_ITEM_M_N_TEXT, 2, 4)); + text = selenium.getText(format(LOC_ITEM_M_N_TEXT, 1, 3)); assertEquals(text, "Group 2.4", MSG_NAME_OF_GROUP); // image after subgroup name - text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_AFTER, 2, 4)); + text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_AFTER, 1, 3)); assertTrue(text.contains("PanelMenuIconSpacer"), MSG_IMAGE_AFTER_GROUP_NAME_SPACER); - for (int i = 1; i < 4; i++) { - assertFalse(isDisplayed(format(LOC_SUBITEM_M_STYLE, i)), format(MSG_SUBITEM_M_NOT_VISIBLE, i)); + for (int i = 0; i < 3; i++) { + assertFalse(isDisplayed(format(LOC_SUBITEM_M_STYLE, i)), format(MSG_SUBITEM_M_NOT_VISIBLE, i + 1)); } // click Group 2.4 - selenium.click(format(LOC_ITEM_M_N_TEXT, 2, 4)); + selenium.click(format(LOC_ITEM_M_N_TEXT, 1, 3)); // image after subgroup name - text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_AFTER, 2, 4)); + text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_AFTER, 1, 3)); assertTrue(text.contains("PanelMenuIconSpacer"), MSG_IMAGE_AFTER_GROUP_NAME_SPACER); - for (int i = 1; i < 4; i++) { + for (int i = 0; i < 3; i++) { // check that items are not hidden - assertTrue(isDisplayed(format(LOC_SUBITEM_M_STYLE, i)), format(MSG_SUBITEM_M_VISIBLE, i)); + assertTrue(isDisplayed(format(LOC_SUBITEM_M_STYLE, i)), format(MSG_SUBITEM_M_VISIBLE, i + 1)); // check the image left of the item text = selenium.getAttribute(format(LOC_SUBITEM_M_IMAGE, i)); @@ -166,39 +166,39 @@ assertEquals(text, "Nothing selected", MSG_CONTENT_OF_PANEL_ON_LOAD); // check items on the first level (1.1, 1.2, etc.) - for (int i = 1; i < 4; i++) { + for (int i = 0; i < 3; i++) { final int newI = i; selenium.click(format(LOC_GROUP_N_TEXT, i)); - for (int j = 1; j < 4; j++) { + for (int j = 0; j < 3; j++) { final int newJ = j; selenium.click(format(LOC_ITEM_M_N_TEXT, i, j)); Wait.until(new Condition() { public boolean isTrue() { - return format("Item {0}.{1} selected", newI, newJ).equals(selenium.getText(LOC_PANEL)); + return format("Item {0}.{1} selected", newI + 1, newJ + 1).equals(selenium.getText(LOC_PANEL)); } }); text = selenium.getText(LOC_PANEL); - assertEquals(text, format("Item {0}.{1} selected", i, j), MSG_CONTENT_OF_PANEL); + assertEquals(text, format("Item {0}.{1} selected", i + 1, j + 1), MSG_CONTENT_OF_PANEL); } } // check items on the second level (2.4.1, 2.4.2, 2.4.3) - selenium.click(format(LOC_ITEM_M_N_TEXT, 2, 4)); - for (int i = 1; i < 4; i++) { + selenium.click(format(LOC_ITEM_M_N_TEXT, 1, 3)); + for (int i = 0; i < 3; i++) { final int newI = i; selenium.click(format(LOC_SUBITEM_M_TEXT, i)); Wait.until(new Condition() { public boolean isTrue() { - return format("Item 2.4.{0} selected", newI).equals(selenium.getText(LOC_PANEL)); + return format("Item 2.4.{0} selected", newI + 1).equals(selenium.getText(LOC_PANEL)); } }); text = selenium.getText(LOC_PANEL); - assertEquals(text, format("Item 2.4.{0} selected", i), MSG_CONTENT_OF_PANEL); + assertEquals(text, format("Item 2.4.{0} selected", i + 1), MSG_CONTENT_OF_PANEL); } } @@ -235,14 +235,14 @@ // group name text = selenium.getText(format(LOC_GROUP_N_TEXT, index)); - assertEquals(text, "Group " + index, MSG_NAME_OF_GROUP); + assertEquals(text, "Group " + (index + 1), MSG_NAME_OF_GROUP); // image after group name text = selenium.getAttribute(format(LOC_GROUP_N_IMAGE_AFTER, index)); assertTrue(text.contains("PanelMenuIconChevronDown"), MSG_IMAGE_AFTER_GROUP_NAME_DOWN); - for (int i = 1; i < 4; i++) { - assertFalse(isDisplayed(format(LOC_ITEM_M_N_STYLE, index, i)), format(MSG_ITEM_M_N_NOT_VISIBLE, index, i)); + for (int i = 0; i < 3; i++) { + assertFalse(isDisplayed(format(LOC_ITEM_M_N_STYLE, index, i)), format(MSG_ITEM_M_N_NOT_VISIBLE, index + 1, i + 1)); } selenium.click(format(LOC_GROUP_N_TEXT, index)); @@ -251,9 +251,9 @@ text = selenium.getAttribute(format(LOC_GROUP_N_IMAGE_AFTER, index)); assertTrue(text.contains("PanelMenuIconChevronUp"), MSG_IMAGE_AFTER_GROUP_NAME_UP); - for (int i = 1; i < 4; i++) { + for (int i = 0; i < 3; i++) { // check that items are not hidden - assertTrue(isDisplayed(format(LOC_ITEM_M_N_STYLE, index, i)), format(MSG_ITEM_M_N_VISIBLE, index, i)); + assertTrue(isDisplayed(format(LOC_ITEM_M_N_STYLE, index, i)), format(MSG_ITEM_M_N_VISIBLE, index + 1, i + 1)); // check the image left of the item text = selenium.getAttribute(format(LOC_ITEM_M_N_IMAGE_BEFORE, index, i)); Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -64,10 +64,10 @@ */ @Test public void testFirstSeparator() { - String text = getStyle(format(LOC_SEPARATOR_N, 1), "height"); + String text = getStyle(format(LOC_SEPARATOR_N, 0), "height"); assertEquals(text, MSG_FIRST_HEIGHT, "Height of the separator."); - text = getSeparatorHash(format(LOC_SEPARATOR_N, 1)); + text = getSeparatorHash(format(LOC_SEPARATOR_N, 0)); assertEquals(text, MSG_FIRST_HASH, "Hash code of the image that makes the separator."); } @@ -77,15 +77,15 @@ */ @Test public void testSecondSeparator() { - String text = getStyle(format(LOC_SEPARATOR_N, 2), "height"); + String text = getStyle(format(LOC_SEPARATOR_N, 1), "height"); assertEquals(text, MSG_SECOND_HEIGHT, "Height of the separator."); - double widthFull = Double.parseDouble(getStyle(format(LOC_SEPARATOR_N, 1), "width").replace("px", "")); - double width75 = Double.parseDouble(getStyle(format(LOC_SEPARATOR_N, 2), "width").replace("px", "")); + double widthFull = Double.parseDouble(getStyle(format(LOC_SEPARATOR_N, 0), "width").replace("px", "")); + double width75 = Double.parseDouble(getStyle(format(LOC_SEPARATOR_N, 1), "width").replace("px", "")); assertEquals(width75, widthFull * 0.75, "Width of the separator."); - text = getSeparatorHash(format(LOC_SEPARATOR_N, 2)); + text = getSeparatorHash(format(LOC_SEPARATOR_N, 1)); assertEquals(text, MSG_SECOND_HASH, "Hash code of the image that makes the separator."); } @@ -95,10 +95,10 @@ */ @Test public void testThirdSeparator() { - String text = getStyle(format(LOC_SEPARATOR_N, 3), "height"); + String text = getStyle(format(LOC_SEPARATOR_N, 2), "height"); assertEquals(text, MSG_THIRD_HEIGHT, "Height of the separator."); - text = getSeparatorHash(format(LOC_SEPARATOR_N, 3)); + text = getSeparatorHash(format(LOC_SEPARATOR_N, 2)); assertEquals(text, MSG_THIRD_HASH, "Hash code of the image that makes the separator."); } @@ -108,10 +108,10 @@ */ @Test public void testFourthSeparator() { - String text = getStyle(format(LOC_SEPARATOR_N, 4), "height"); + String text = getStyle(format(LOC_SEPARATOR_N, 3), "height"); assertEquals(text, MSG_FOURTH_HEIGHT, "Height of the separator."); - text = getSeparatorHash(format(LOC_SEPARATOR_N, 4)); + text = getSeparatorHash(format(LOC_SEPARATOR_N, 3)); assertEquals(text, MSG_FOURTH_HASH, "Hash code of the image that makes the separator."); } @@ -121,10 +121,10 @@ */ @Test public void testFifthSeparator() { - String text = getStyle(format(LOC_SEPARATOR_N, 5), "height"); + String text = getStyle(format(LOC_SEPARATOR_N, 4), "height"); assertEquals(text, MSG_FIFTH_HEIGHT, "Height of the separator."); - text = getSeparatorHash(format(LOC_SEPARATOR_N, 5)); + text = getSeparatorHash(format(LOC_SEPARATOR_N, 4)); assertEquals(text, MSG_FIFTH_HASH, "Hash code of the image that makes the separator."); } @@ -134,10 +134,10 @@ */ @Test public void testSixthSeparator() { - String text = getStyle(format(LOC_SEPARATOR_N, 6), "height"); + String text = getStyle(format(LOC_SEPARATOR_N, 5), "height"); assertEquals(text, MSG_SIXTH_HEIGHT, "Height of the separator."); - text = getSeparatorHash(format(LOC_SEPARATOR_N, 6)); + text = getSeparatorHash(format(LOC_SEPARATOR_N, 5)); assertEquals(text, MSG_SIXTH_HASH, "Hash code of the image that makes the separator."); } Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -92,7 +92,7 @@ */ @Test public void testSecondExampleServerSwitch() { - abstractTestPanelInSecondExample(1, "Server Switch Type"); + abstractTestPanelInSecondExample(0, "Server Switch Type"); } /** @@ -104,7 +104,7 @@ */ @Test public void testSecondExampleAjaxSwitch() { - abstractTestPanelInSecondExample(2, "Ajax Switch Type"); + abstractTestPanelInSecondExample(1, "Ajax Switch Type"); } /** @@ -116,7 +116,7 @@ */ @Test public void testSecondExampleClientSwitch() { - abstractTestPanelInSecondExample(3, "Client Switch Type"); + abstractTestPanelInSecondExample(2, "Client Switch Type"); } /** Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -71,47 +71,46 @@ String text; // test the first tab panel - for (int i = 3; i > 0; i--) { + for (int i = 2; i >= 0; i--) { scrollIntoView(LOC_USAGE_EXAMPLE_HEADER, true); // scrolling is // forgotten after // page reload - selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 1, i)); + selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 0, i)); waitFor(2000); - text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 1)); - assertEquals(text, "Here is tab #" + i, format(MSG_USAGE_CONTENT_OF_PANEL_PREFORMATTED, 1)); + text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 0)); + assertEquals(text, "Here is tab #" + (i+1), format(MSG_USAGE_CONTENT_OF_PANEL_PREFORMATTED, 1)); } // test the second tab panel scrollIntoView(LOC_USAGE_EXAMPLE_HEADER, true); - selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 2, 3)); + selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 1, 2)); waitFor(2000); - text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 2)); + text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 1)); assertEquals(text, "Here is tab #" + 3, format(MSG_USAGE_CONTENT_OF_PANEL_PREFORMATTED, 2)); - - selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 2, 1)); + selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 1, 0)); waitFor(2000); - text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 2)); + text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 1)); assertEquals(text, "Here is tab #" + 1, format(MSG_USAGE_CONTENT_OF_PANEL_PREFORMATTED, 2)); // test the disabled tab boolean isEnabled = true; try { - isEnabled = belongsClass("rich-tab-diabled", format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 2, 2)); + isEnabled = belongsClass("rich-tab-diabled", format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 1, 1)); assertFalse(isEnabled, MSG_USAGE_SECOND_TAB_SHOULD_BE_DISABLED); } catch (Exception e) { // OK - there is no class attribute } - selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 2, 2)); + selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 1, 1)); waitFor(2000); - text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 2)); + text = selenium.getText(format(LOC_USAGE_PANEL_TEXT_PREFORMATTED, 1)); assertEquals(text, "Here is tab #1", format(MSG_USAGE_CONTENT_OF_PANEL_PREFORMATTED, 2)); // test the third tab panel -- client type work different scrollIntoView(LOC_USAGE_EXAMPLE_HEADER, true); - for (int i = 3; i > 0; i--) { - selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 3, i)); + for (int i = 2; i >= 0; i--) { + selenium.click(format(LOC_USAGE_PANEL_TAB_PREFORMATTED, 2, i)); waitFor(2000); - for (int j = 1; j < 4; j++) { + for (int j = 0; j < 3; j++) { if (i == j) { assertTrue(isDisplayed(format(LOC_USAGE_PANEL_3_TEXT_PREFORMATTED, j))); } else { @@ -132,17 +131,16 @@ scrollIntoView(LOC_CUST_EXAMPLE_HEADER, true); String text; - for (int i = 3; i > 0; i--) { + for (int i = 2; i >= 0; i--) { selenium.click(format(LOC_CUST_PANEL_TAB_PREFORMATTED, i)); waitFor(2000); - for (int j = 1; j < 4; j++) { + for (int j = 0; j < 3; j++) { if (i == j) { - waitFor(5000); assertTrue(isDisplayed(format(LOC_CUST_PANEL_TEXT_PREFORMATTED, j)), format( - "Tab nr. {0} should be open.", j)); + "Tab nr. {0} should be open.", j+1)); } else { assertFalse(isDisplayed(format(LOC_CUST_PANEL_TEXT_PREFORMATTED, j)), format( - "Tab nr. {0} should not be open.", j)); + "Tab nr. {0} should not be open.", j+1)); } } } @@ -162,20 +160,20 @@ openTab("Tabs Deletion"); scrollIntoView(LOC_DELET_EXAMPLE_HEADER, true); - int count = selenium.getXpathCount(LOC_DELET_PANEL_TABS).intValue(); - assertEquals(count - 4, 3, MSG_DELET_NUMBER_OF_TABS); + int count = getJQueryCount(LOC_DELET_PANEL_TABS); + assertEquals(count, 3, MSG_DELET_NUMBER_OF_TABS); - for (int i = 3; i > 0; i--) { - selenium.click(format(LOC_DELET_PANEL_TAB_CLOSE_PREFORMATTED, i)); + for (int i = 2; i >= 0; i--) { + selenium.click(format(LOC_DELET_PANEL_TAB_CLOSE_PREFORMATTED, i+1)); waitFor(2000); - count = selenium.getXpathCount(LOC_DELET_PANEL_TABS).intValue(); - assertEquals(count / 2, i - 1, MSG_DELET_NUMBER_OF_TABS); + count = getJQueryCount(LOC_DELET_PANEL_TABS); + assertEquals(count, i, MSG_DELET_NUMBER_OF_TABS); } selenium.click(LOC_DELET_RESET_BUTTON); waitFor(2000); - count = selenium.getXpathCount(LOC_DELET_PANEL_TABS).intValue(); - assertEquals(count - 4, 3, MSG_DELET_NUMBER_OF_TABS); + count = getJQueryCount(LOC_DELET_PANEL_TABS); + assertEquals(count, 3, MSG_DELET_NUMBER_OF_TABS); } /** Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java 2009-11-04 08:43:52 UTC (rev 15821) @@ -66,22 +66,22 @@ */ @Test public void testFirstToolBar() { - scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 1), true); + scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 0), true); - assertTrue(belongsClass("rich-toolbar-item", format(LOC_FIRST_TOOLBAR_ITEM_N, 1)), MSG_ITEM_CLASS_ATTRIBUTE); - assertTrue(belongsClass("rich-toolbar-item", format(LOC_FIRST_TOOLBAR_ITEM_N, 5)), MSG_ITEM_CLASS_ATTRIBUTE); - assertTrue(belongsClass("rich-toolbar-item", format(LOC_FIRST_TOOLBAR_ITEM_N, 9)), MSG_ITEM_CLASS_ATTRIBUTE); + assertTrue(belongsClass("rich-toolbar-item", format(LOC_FIRST_TOOLBAR_ITEM_N, 0)), MSG_ITEM_CLASS_ATTRIBUTE); + assertTrue(belongsClass("rich-toolbar-item", format(LOC_FIRST_TOOLBAR_ITEM_N, 4)), MSG_ITEM_CLASS_ATTRIBUTE); + assertTrue(belongsClass("rich-toolbar-item", format(LOC_FIRST_TOOLBAR_ITEM_N, 8)), MSG_ITEM_CLASS_ATTRIBUTE); - String text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 4) + "@align"); + String text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 3) + "@align"); assertTrue(text.contains("center"), MSG_GROUP_SEPARATOR); - text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 1) + "/img@src"); + text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 0) + " > img@src"); assertTrue(text.contains("create_doc.gif"), format(MSG_ITEM_IMAGE_S, "create_doc.gif")); - text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 2) + "/img@src"); + text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 1) + " > img@src"); assertTrue(text.contains("create_folder.gif"), format(MSG_ITEM_IMAGE_S, "create_folder.gif")); - text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 6) + "/img@src"); + text = selenium.getAttribute(format(LOC_FIRST_TOOLBAR_ITEM_N, 5) + " > img@src"); assertTrue(text.contains("save_as.gif"), format(MSG_ITEM_IMAGE_S, "save_as.gif")); } @@ -93,19 +93,19 @@ */ @Test public void testSecondToolBar() { - scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 2), true); + scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 1), true); - assertTrue(belongsClass("rich-toolbar-item", format(LOC_SECOND_TOOLBAR_ITEM_N, 1)), MSG_ITEM_CLASS_ATTRIBUTE); - assertTrue(belongsClass("rich-toolbar-item", format(LOC_SECOND_TOOLBAR_ITEM_N, 4)), MSG_ITEM_CLASS_ATTRIBUTE); - assertTrue(belongsClass("rich-toolbar-item", format(LOC_SECOND_TOOLBAR_ITEM_N, 7)), MSG_ITEM_CLASS_ATTRIBUTE); + assertTrue(belongsClass("rich-toolbar-item", format(LOC_SECOND_TOOLBAR_ITEM_N, 0)), MSG_ITEM_CLASS_ATTRIBUTE); + assertTrue(belongsClass("rich-toolbar-item", format(LOC_SECOND_TOOLBAR_ITEM_N, 3)), MSG_ITEM_CLASS_ATTRIBUTE); + assertTrue(belongsClass("rich-toolbar-item", format(LOC_SECOND_TOOLBAR_ITEM_N, 6)), MSG_ITEM_CLASS_ATTRIBUTE); - String text = selenium.getAttribute(format(LOC_SECOND_TOOLBAR_ITEM_N, 3) + "@align"); + String text = selenium.getAttribute(format(LOC_SECOND_TOOLBAR_ITEM_N, 2) + "@align"); assertTrue(text.contains("center"), MSG_ITEM_SEPARATOR); - text = selenium.getAttribute(format(LOC_SECOND_TOOLBAR_ITEM_N, 1) + "/img@src"); + text = selenium.getAttribute(format(LOC_SECOND_TOOLBAR_ITEM_N, 0) + " > img@src"); assertTrue(text.contains("edit.gif"), format(MSG_ITEM_IMAGE_S, "edit.gif")); - text = selenium.getAttribute(format(LOC_SECOND_TOOLBAR_ITEM_N, 4) + "/img@src"); + text = selenium.getAttribute(format(LOC_SECOND_TOOLBAR_ITEM_N, 3) + " > img@src"); assertTrue(text.contains("find.gif"), format(MSG_ITEM_IMAGE_S, "find.gif")); } @@ -114,7 +114,7 @@ */ @Test public void testThirdToolBarGroupSeparators() { - scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 3), true); + scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 2), true); // select line selenium.click(format(LOC_THIRD_TOOLBAR_GROUP_SEPARATOR_N, 1)); @@ -174,7 +174,7 @@ */ @Test public void testToolBarItemSeparators() { - scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 3), true); + scrollIntoView(format(LOC_EXAMPLE_N_HEADER, 2), true); // select line selenium.click(format(LOC_THIRD_TOOLBAR_ITEM_SEPARATOR_N, 1)); Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,17 +1,18 @@ -FIRST_DIVS=//fieldset[1]/div/div[1]/div -FIRST_HEADER=//fieldset[1]/div/div[1]/div[1] -SECOND_DIVS=//fieldset[2]/div/div[1]/div -THIRD_DIVS=//fieldset[3]/div/div[1]/div -THIRD_HEADER=//fieldset[3]/div/div[1]/div[1] -THIRD_NESTED_PANELS=//fieldset[3]/div/div[1]/div[2]/table/tbody/tr/td/div[contains(@class, 'rich-panel')] -LEFT_NESTED_PANEL_LIST_LI=//fieldset[3]//div/div[1]/div[2]/table//td[1]//ul/li -RIGHT_NESTED_PANEL_LIST_LI=//fieldset[3]//div/div[1]/div[2]/table//td[2]//ul/li +FIRST_DIVS=jquery=fieldset:eq(0) > div > div:eq(0) > div +FIRST_HEADER=jquery=fieldset:eq(0) > div > div:eq(0) > div.rich-panel-header +SECOND_DIVS=jquery=fieldset:eq(1) > div > div:eq(0) > div +THIRD_DIVS=jquery=fieldset:eq(2) > div > div:eq(0) > div +THIRD_HEADER=jquery=fieldset:eq(2) div.rich-panel-header.outpanelHeader +THIRD_NESTED_PANELS=jquery=fieldset:eq(2) div.rich-panel-body div.rich-panel +LEFT_NESTED_PANEL_LIST_LI=jquery=fieldset:eq(2) div.rich-panel-body div.rich-panel:eq(0) li +RIGHT_NESTED_PANEL_LIST_LI=jquery=fieldset:eq(2) div.rich-panel-body div.rich-panel:eq(1) li # second tab -CUST_FIRST_PANEL_HEADER=//table[contains(@class, 'rich-tabpanel-content-position')]//table[1]//td[1]/div/div[1] -CUST_SECOND_PANEL_HEADER=//table[contains(@class, 'rich-tabpanel-content-position')]//table[1]//td[2]/div/div[1] -CUST_THIRD_PANEL_HEADER=//table[contains(@class, 'rich-tabpanel-content-position')]//table[2]//td[1]/div/div[1] -CUST_THIRD_PANEL_BODY=//table[contains(@class, 'rich-tabpanel-content-position')]//table[2]//td[1]/div/div[2] -CUST_FOURTH_PANEL_BODY=//table[contains(@class, 'rich-tabpanel-content-position')]//table[2]//td[2]/div/div[2] -CUST_FOURTH_PANEL_HEADER=//table[contains(@class, 'rich-tabpanel-content-position')]//table[2]//td[2]/div/div[1] -CUST_FIFTH_PANEL_PARTS=//table[contains(@class, 'rich-tabpanel-content-position')]//table[2]//td[3]/div/div \ No newline at end of file +CUST_FIRST_PANEL_HEADER=jquery=td.rich-tabpanel-content table:eq(0) td:eq(0) div.rich-panel-header +CUST_SECOND_PANEL_HEADER=jquery=td.rich-tabpanel-content table:eq(0) td:eq(1) div.rich-panel-header +CUST_THIRD_PANEL_HEADER=jquery=td.rich-tabpanel-content table:eq(1) td:eq(0) div.rich-panel-header +CUST_THIRD_PANEL_BODY=jquery=td.rich-tabpanel-content table:eq(1) td:eq(0) div.rich-panel-body +CUST_FOURTH_PANEL_BODY=jquery=td.rich-tabpanel-content table:eq(1) td:eq(1) div.rich-panel-body +CUST_FOURTH_PANEL_HEADER=jquery=td.rich-tabpanel-content table:eq(1) td:eq(1) div.rich-panel-header +CUST_FIFTH_PANEL_BODY=jquery=td.rich-tabpanel-content table:eq(1) td:eq(2) div.rich-panel-body +CUST_FIFTH_PANEL_HEADER=jquery=td.rich-tabpanel-content table:eq(1) td:eq(2) div.rich-panel-header \ No newline at end of file Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/messages.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/messages.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panel/messages.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -16,4 +16,3 @@ CUST_THIRD_CLASS_2=body3 CUST_FOURTH_HEADER=Scrolling Text Panel CUST_FOURTH_CLASS=body3 -CUST_FIFTH_COUNT=1 \ No newline at end of file Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelBar/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelBar/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelBar/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,7 +1,7 @@ -EXAMPLE_HEADER=//fieldset/legend -HEADER_1_N=//fieldset/div/div[1]/div[{0}]/div[1] -HEADER_2_N=//fieldset/div/div[1]/div[{0}]/div[2] -CONTENT_N=//fieldset/div/div[1]/div[{0}]/div[3] +EXAMPLE_HEADER=jquery=fieldset > legend +HEADER_1_N=jquery=fieldset div.rich-panelbar-header-act:eq({0}) +HEADER_2_N=jquery=fieldset div.rich-panelbar-header:eq({0}) +CONTENT_N=jquery=fieldset div.rich-panelbar-content-exterior:eq({0}) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,18 +1,18 @@ -EXAMPLE_HEADER=//fieldset/legend -PANEL=//span[@id='form:current'] +EXAMPLE_HEADER=jquery=fieldset > legend +PANEL=jquery=fieldset span[id=form\\:current] -GROUP_N_IMAGE_BEFORE=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/table/tbody/tr/td[1]/img@src -GROUP_N_IMAGE_AFTER=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/table/tbody/tr/td[3]/img@src -GROUP_N_TEXT=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/table/tbody/tr/td[2] +GROUP_N_IMAGE_BEFORE=jquery=fieldset table.rich-pmenu-top-group:eq({0}) td:eq(0) img@src +GROUP_N_IMAGE_AFTER=jquery=fieldset table.rich-pmenu-top-group:eq({0}) td:eq(2) img@src +GROUP_N_TEXT=jquery=fieldset table.rich-pmenu-top-group:eq({0}) td:eq(1) -ITEM_M_N_IMAGE_BEFORE=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/div[{1}]/table/tbody/tr/td[1]/img[2]@src -ITEM_M_N_IMAGE_AFTER=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/div[{1}]/table/tbody/tr/td[3]/img@src -ITEM_M_N_TEXT=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/div[{1}]/table/tbody/tr/td[2] -ITEM_M_N_STYLE=//form[@id='form']/table/tbody/tr/td[1]/div/div[{0}]/div[{1}] +ITEM_M_N_IMAGE_BEFORE=jquery=fieldset div.rich-pmenu-top-group-div:eq({0}) div:eq({1}) td:eq(0) img:eq(1)@src +ITEM_M_N_IMAGE_AFTER=jquery=fieldset div.rich-pmenu-top-group-div:eq({0}) div:eq({1}) td:eq(2) img@src +ITEM_M_N_TEXT=jquery=fieldset div.rich-pmenu-top-group-div:eq({0}) div:eq({1}) td:eq(1) +ITEM_M_N_STYLE=jquery=fieldset div.rich-pmenu-top-group-div:eq({0}) div:eq({1}) -SUBITEM_M_IMAGE=//fieldset//div[contains(@class,'rich-pmenu')]/div[2]/div[4]/div[{0}]/table/tbody/tr/td[1]/img[3]@src -SUBITEM_M_TEXT=//fieldset//div[contains(@class,'rich-pmenu')]/div[2]/div[4]/div[{0}]/table/tbody/tr/td[2] -SUBITEM_M_STYLE=//fieldset//div[contains(@class,'rich-pmenu')]/div[2]/div[4]/div[{0}] +SUBITEM_M_IMAGE=jquery=fieldset div.rich-pmenu-top-group-div:eq(1) div:eq(3) div:eq({0}) td.rich-pmenu-item-icon > img:eq(2)@src +SUBITEM_M_TEXT=jquery=fieldset div.rich-pmenu-top-group-div:eq(1) div:eq(3) div:eq({0}) td.rich-pmenu-item-label +SUBITEM_M_STYLE=jquery=fieldset div.rich-pmenu-top-group-div:eq(1) div:eq(3) div:eq({0}) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/messages.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/messages.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/panelMenu/messages.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -6,11 +6,11 @@ IMAGE_AFTER_GROUP_NAME_DOWN=There should be arrows down right of group name. IMAGE_AFTER_GROUP_NAME_UP=There should be arrows up right of group name. IMAGE_AFTER_GROUP_NAME_SPACER=There should be spacer right of group name. -ITEM_M_N_NOT_VISIBLE=Item %d.%d should not be visible. -ITEM_M_N_VISIBLE=Item %d.%d should be visible. +ITEM_M_N_NOT_VISIBLE=Item {0}.{1} should not be visible. +ITEM_M_N_VISIBLE=Item {0}.{1} should be visible. IMAGE_BEFORE_ITEM_GRID=There should be an image with grid left of item name. -SUBITEM_M_NOT_VISIBLE=Item 2.4.%d should not be visible. -SUBITEM_M_VISIBLE=Item 2.4.%d should be visible. +SUBITEM_M_NOT_VISIBLE=Item 2.4.{0} should not be visible. +SUBITEM_M_VISIBLE=Item 2.4.{0} should be visible. Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/progressBar/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/progressBar/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/progressBar/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,13 +1,13 @@ -EXAMPLE_1_HEADER=//fieldset[1]/legend -EXAMPLE_2_HEADER=//fieldset[2]/legend +EXAMPLE_1_HEADER=jquery=fieldset:eq(0) > legend +EXAMPLE_2_HEADER=jquery=fieldset:eq(0) > legend -FIRST_BUTTON=//fieldset[1]/div/form/span/div/input -FIRST_PROGRESS_BAR_STYLE=//fieldset[1]/div/form/span/div/div[2] +FIRST_BUTTON=jquery=fieldset:eq(0) input[value=Start Process] +FIRST_PROGRESS_BAR_STYLE=jquery=fieldset:eq(0) div[id$=upload] -SECOND_BUTTON=//button[@id='button'] -SECOND_LABEL_FINISHED=//fieldset[2]/div/form/div/div[3] -SECOND_LABEL_INITIAL=//fieldset[2]/div/form/div/div[1] -SECOND_PROGRESS_BAR_STYLE=//fieldset[2]/div/form/div/div[2]/div +SECOND_BUTTON=jquery=fieldset:eq(1) button +SECOND_LABEL_FINISHED=jquery=fieldset:eq(1) div[id=form\\:progressBar\\:completeState] +SECOND_LABEL_INITIAL=jquery=fieldset:eq(1) div[id=form\\:progressBar\\:initialState] +SECOND_PROGRESS_BAR_STYLE=jquery=fieldset:eq(1) div[id=form\\:progressBar\\:upload] Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/separator/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/separator/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/separator/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,5 +1,5 @@ -EXAMPLE_HEADER=//fieldset/legend -SEPARATOR_N=//fieldset/div/div[{0}]/div +EXAMPLE_HEADER=jquery=fieldset > legend +SEPARATOR_N=jquery=fieldset > div div.rich-separator:eq({0}) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/simpleTogglePanel/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/simpleTogglePanel/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/simpleTogglePanel/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,12 +1,12 @@ -EXAMPLE_1_HEADER=//fieldset[1]/legend -EXAMPLE_2_HEADER=//fieldset[2]/legend +EXAMPLE_1_HEADER=jquery=fieldset:eq(0) > legend +EXAMPLE_2_HEADER=jquery=fieldset:eq(1) > legend -FIRST_EXAMPLE_HEADER=//fieldset[1]//form/div -FIRST_EXAMPLE_ARROWS_LEFT=//fieldset[1]//div[@class='rich-stglpnl-marker' and contains(@id,'switch_on')] -FIRST_EXAMPLE_ARROWS_RIGHT=//fieldset[1]//div[@class='rich-stglpnl-marker' and contains(@id,'switch_off')] -FIRST_EXAMPLE_BODY=//fieldset[1]/div/div[1]/div +FIRST_EXAMPLE_HEADER=jquery=fieldset:eq(0) form > div +FIRST_EXAMPLE_ARROWS_LEFT=jquery=fieldset:eq(0) div[id$=switch_on] +FIRST_EXAMPLE_ARROWS_RIGHT=jquery=fieldset:eq(0) div[id$=switch_off] +FIRST_EXAMPLE_BODY=jquery=fieldset:eq(0) div.rich-stglpanel-body -SECOND_EXAMPLE_N_HEADER=//fieldset[2]//td[{0}]/div/div[1] -SECOND_EXAMPLE_N_ARROWS_LEFT=//fieldset[2]//td[{0}]//div[@class\='rich-stglpnl-marker' and contains(@id,'switch_on')] -SECOND_EXAMPLE_N_ARROWS_RIGHT=//fieldset[2]//td[{0}]//div[@class\='rich-stglpnl-marker' and contains(@id,'switch_off')] -SECOND_EXAMPLE_N_BODY=//fieldset[2]//td[{0}]/div/div[contains(@class, 'rich-stglpanel-body')] +SECOND_EXAMPLE_N_HEADER=jquery=fieldset:eq(1) td:eq({0}) > div > div:eq(0) +SECOND_EXAMPLE_N_ARROWS_LEFT=jquery=fieldset:eq(1) td:eq({0}) div[id$=switch_on] +SECOND_EXAMPLE_N_ARROWS_RIGHT=jquery=fieldset:eq(1) td:eq({0}) div[id$=switch_off] +SECOND_EXAMPLE_N_BODY=jquery=fieldset:eq(1) td:eq({0}) div[id$=body] Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/spacer/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/spacer/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/spacer/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,6 +1,6 @@ -EXAMPLE_HEADER=//fieldset[1]/legend -FIRST_SPACER_HEIGHT=//fieldset/div/p[1]/img@height -FIRST_SPACER_WIDTH=//fieldset/div/p[1]/img@width -SECOND_SPACER_HEIGHT=//fieldset/div/img@height -SECOND_SPACER_WIDTH=//fieldset/div/img@width +EXAMPLE_HEADER=jquery=fieldset > legend +FIRST_SPACER_HEIGHT=jquery=fieldset img.rich-spacer:eq(0)@height +FIRST_SPACER_WIDTH=jquery=fieldset img.rich-spacer:eq(0)@width +SECOND_SPACER_HEIGHT=jquery=fieldset img.rich-spacer:eq(1)@height +SECOND_SPACER_WIDTH=jquery=fieldset img.rich-spacer:eq(1)@width Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/tabPanel/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/tabPanel/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/tabPanel/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,17 +1,17 @@ # first tab -USAGE_EXAMPLE_HEADER=//fieldset/legend -USAGE_PANEL_TEXT_PREFORMATTED=//fieldset/div/table[{0}]/tbody/tr[2]/td/table/tbody/tr/td -USAGE_PANEL_3_TEXT_PREFORMATTED=//fieldset/div/table[3]/tbody/tr[2]/td[{0}] -USAGE_PANEL_TAB_PREFORMATTED=//fieldset/div/table[{0}]/tbody/tr[1]/td/form/table/tbody/tr/td[{1}*2]/table +USAGE_EXAMPLE_HEADER=jquery=fieldset > legend +USAGE_PANEL_TEXT_PREFORMATTED=jquery=fieldset > div > table:eq({0}) > tbody > tr:eq(1) +USAGE_PANEL_3_TEXT_PREFORMATTED=jquery=fieldset > div > table:eq(2) td:has(table.rich-tabpanel-content-position):eq({0}) +USAGE_PANEL_TAB_PREFORMATTED=jquery=fieldset > div > table:eq({0}) td[id$=lbl]:eq({1}) # second tab -CUST_EXAMPLE_HEADER=//div[@id='itme']/p -CUST_TABS_ALIGN=//div[@id='itme']//table[contains(@class,'rich-tabpanel')]/tbody/tr[1]/td@align -CUST_PANEL_TEXT_PREFORMATTED=//div[@id='itme']//table[contains(@class,'rich-tabpanel')]/tbody/tr[2]/td[{0}] -CUST_PANEL_TAB_PREFORMATTED=//div[@id='itme']//table[contains(@class,'rich-tabpanel')]/tbody/tr[1]/td/form/table/tbody/tr/td[{0}*2]/table +CUST_EXAMPLE_HEADER=jquery=div#itme > p +CUST_TABS_ALIGN=jquery=div#itme > table.rich-tabpanel td.rich-tab-bottom-line@align +CUST_PANEL_TEXT_PREFORMATTED=jquery=div#itme > table.rich-tabpanel > tbody > tr:eq(1) > td:eq({0}) +CUST_PANEL_TAB_PREFORMATTED=jquery=div#itme > table.rich-tabpanel > tbody form td[id$=cell]:eq({0}) > table # third tab -DELET_EXAMPLE_HEADER=//form[@id='tabs_form']/../../p -DELET_PANEL_TABS=//table[@id='tabs_form:RemoveAbleTabPanel']/tbody/tr[1]/td/table/tbody/tr/td -DELET_PANEL_TAB_CLOSE_PREFORMATTED=//img[@id='tabs_form:hidelink{0}'] -DELET_RESET_BUTTON=//form[@id\='tabs_form']/input[2] \ No newline at end of file +DELET_EXAMPLE_HEADER=jquery=td.content_tab +DELET_PANEL_TABS=jquery=table[id$=RemoveAbleTabPanel] td[id$=cell] +DELET_PANEL_TAB_CLOSE_PREFORMATTED=jquery=img[id=tabs_form\:hidelink{0}] +DELET_RESET_BUTTON=jquery=input[value=Reset Tabs] \ No newline at end of file Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/togglePanel/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/togglePanel/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/togglePanel/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,8 +1,8 @@ -EXAMPLE_HEADER=//fieldset[1]/legend -CLICK_ME_BUTTON=//fieldset[1]/div/div[1]/div[1] -CLICK_ME_BUTTON_A=//fieldset[1]/div/div[1]/div[1]/a -CLOSE_BUTTON=//fieldset[1]//div[contains(@class,'rich-toggle-panel')]//div[contains(@id,'tip1')]//a[text()\='x Close'] -PANEL_PREFORMATTED=//fieldset[1]//div[contains(@class,'rich-toggle-panel')]//div[contains(@id,'tip{0}')] -PREVIOUS_BUTTON_PREFORMATTED=//fieldset[1]//div[contains(@class,'rich-toggle-panel')]//div[contains(@id,'tip{0}')]//a[text()\='\u00AB Previous'] -NEXT_BUTTON_PREFORMATTED=//fieldset[1]//div[contains(@class,'rich-toggle-panel')]//div[contains(@id,'tip{0}')]//a[text()\='Next \u00BB'] +EXAMPLE_HEADER=jquery=fieldset > legend +CLICK_ME_BUTTON=jquery=fieldset div[id$=closed] +CLICK_ME_BUTTON_A=jquery=fieldset div[id$=closed] > a +CLOSE_BUTTON=jquery=fieldset div[id$=tip1] td.col td:eq(0) > a +PANEL_PREFORMATTED=jquery=fieldset div[id$=tip{0}] +PREVIOUS_BUTTON_PREFORMATTED=jquery=fieldset div[id$=tip{0}] td.col td:eq(1) > a +NEXT_BUTTON_PREFORMATTED=jquery=fieldset div[id$=tip{0}] td.col td:eq(2) > a Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/toolBar/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/toolBar/locators.properties 2009-11-04 08:36:06 UTC (rev 15820) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/toolBar/locators.properties 2009-11-04 08:43:52 UTC (rev 15821) @@ -1,7 +1,7 @@ -EXAMPLE_N_HEADER=//fieldset[{0}]/legend -FIRST_TOOLBAR_ITEM_N=//fieldset[1]//td[{0}] -SECOND_TOOLBAR_ITEM_N=//fieldset[2]//td[{0}] -THIRD_TOOLBAR_GROUP_SEPARATOR_N=//fieldset[3]//form/table/tbody/tr/td[1]//td[1+{0}]/a -THIRD_TOOLBAR_ITEM_SEPARATOR_N=//fieldset[3]//form/table/tbody/tr/td[3]//td[1+{0}]/a -GROUP_SEPARATOR_IMG=//table[@id='bar']/tbody/tr/td[4]/img -ITEM_SEPARATOR_IMG=//table[@id='bar']/tbody/tr/td[2]/img +EXAMPLE_N_HEADER=jquery=fieldset:eq({0}) > legend +FIRST_TOOLBAR_ITEM_N=jquery=fieldset:eq(0) td:eq({0}) +SECOND_TOOLBAR_ITEM_N=jquery=fieldset:eq(1) td:eq({0}) +THIRD_TOOLBAR_GROUP_SEPARATOR_N=jquery=fieldset:eq(2) div.rich-panel:eq(0) td:eq({0}) > a +THIRD_TOOLBAR_ITEM_SEPARATOR_N=jquery=fieldset:eq(2) div.rich-panel:eq(1) td:eq({0}) > a +GROUP_SEPARATOR_IMG=jquery=fieldset:eq(2) table#bar td:eq(3) > img +ITEM_SEPARATOR_IMG=jquery=fieldset:eq(2) table#bar td:eq(1) > img