[portal-commits] JBoss Portal SVN: r13084 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.

[portal-commits at lists.jboss.org]

Author: vrockai
Date: 2009-03-25 12:01:29 -0400 (Wed, 25 Mar 2009)
New Revision: 13084

Modified:
   branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java
   branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
[JBPORTAL-2313] javascript test locators fix

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java	2009-03-25 15:04:09 UTC (rev 13083)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java	2009-03-25 16:01:29 UTC (rev 13084)
@@ -60,8 +60,8 @@
 	private final String MINS_DIV_CON = getProp(casePfx+"mins.div.con","content-container");
 	private final String MINS_LNK = getProp(casePfx+"mins.lnk","link=Missing instance");
 	private final String JS_LNK_SUBMIT = getProp(casePfx+"js.lnk.submit","link=submit");
-	private final String JS_OPT_3 = getProp(casePfx+"js.opt.3","//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[3]");
-	private final String JS_OPT_2 = getProp(casePfx+"js.opt.2","//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[2]");
+	private final String JS_OPT_3 = getProp(casePfx+"js.opt.3","//form[contains(@id,'_the_form')]/select/option[3]");
+	private final String JS_OPT_2 = getProp(casePfx+"js.opt.2","//form[contains(@id,'_the_form')]/select/option[2]");
 	private final String JS_OPT_1 = getProp(casePfx+"js.opt.1","//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[1]");
 	private final String JS_LAB_C = getProp(casePfx+"js.lab.c","label=C");
 	private final String JS_LAB_B = getProp(casePfx+"js.lab.b","label=B");

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties	2009-03-25 15:04:09 UTC (rev 13083)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties	2009-03-25 16:01:29 UTC (rev 13084)
@@ -481,9 +481,9 @@
 samples.mins.div.con=content-container
 samples.mins.lnk=link=Missing instance
 samples.js.lnk.submit=link=submit
-samples.js.opt.3=//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[3]
-samples.js.opt.2=//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[2]
-samples.js.opt.1=//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[1]
+samples.js.opt.3=//form[contains(@id,'_the_form')]/select/option[3]
+samples.js.opt.2=//form[contains(@id,'_the_form')]/select/option[2]
+samples.js.opt.1=//form[contains(@id,'_the_form')]/select/option[1]
 samples.js.lab.c=label=C
 samples.js.lab.b=label=B
 samples.js.lab.a=label=A
@@ -576,9 +576,9 @@
 samples.ajax.mins.div.con=content-container
 samples.ajax.mins.lnk=//ul[@id='tabsHeader']/li[4]/ul/li[8]/a
 samples.ajax.js.lnk.submit=link=submit
-samples.ajax.js.opt.3=//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[3]
-samples.ajax.js.opt.2=//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[2]
-samples.ajax.js.opt.1=//form[@id='jbpnsFormAutoSubmitPortletWindowsnpbj_the_form']/select/option[1]
+samples.ajax.js.opt.3=//form[contains(@id,'_the_form')]/select/option[3]
+samples.ajax.js.opt.2=//form[contains(@id,'_the_form')]/select/option[2]
+samples.ajax.js.opt.1=//form[contains(@id,'_the_form')]/select/option[1]
 samples.ajax.js.lab.c=label=C
 samples.ajax.js.lab.b=label=B
 samples.ajax.js.lab.a=label=A