JBoss Portal SVN: r13085 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-03-25 21:15:51 -0400 (Wed, 25 Mar 2009)
New Revision: 13085
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
Log:
- JBPORTAL-2355: Do not encode & in URLs as contract for toString is supposed to be non-XML encoded URLs... Needs more testing in particular with other WSRP consumers.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 2009-03-25 16:01:29 UTC (rev 13084)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 2009-03-26 01:15:51 UTC (rev 13085)
@@ -51,12 +51,14 @@
private static final Logger log = Logger.getLogger(WSRPPortletURL.class);
private static final String EQUALS = "=";
- private static final String AMPERSAND = "&";
+ private static final String ENCODED_AMPERSAND = "&";
+ private static final String AMPERSAND = "&";
private static final String PARAM_SEPARATOR = "|";
+
private static final int URL_TYPE_END = WSRPRewritingConstants.URL_TYPE_NAME.length() + EQUALS.length();
-
private boolean secure;
private Mode mode;
+
private WindowState windowState;
/** Are we using strict rewriting parameters validation mode? */
@@ -64,7 +66,6 @@
/** Holds extra parameters if we are in relaxed validation mode */
private Map<String, String> extraParams;
-
/** Remember position of extra parameters wrt end token */
private boolean extraParamsAfterEndToken = false;
@@ -173,9 +174,8 @@
}
// standardize parameter separators
- encodedURL = Tools.replace(encodedURL, "&amp;", PARAM_SEPARATOR); // sanitize doubly encoded & fix-me: should be removed?
+ encodedURL = Tools.replace(encodedURL, ENCODED_AMPERSAND, PARAM_SEPARATOR);
encodedURL = Tools.replace(encodedURL, AMPERSAND, PARAM_SEPARATOR);
- encodedURL = Tools.replace(encodedURL, "&", PARAM_SEPARATOR); // this second shouldn't be used but in case it is...
// remove url type param name and extract value
encodedURL = encodedURL.substring(URL_TYPE_END);
17 years, 1 month
JBoss Portal SVN: r13084 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠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
17 years, 1 month
JBoss Portal SVN: r13083 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium/portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-25 11:04:09 -0400 (Wed, 25 Mar 2009)
New Revision: 13083
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
Log:
[JBPORTAL-2316] selenium extension fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2009-03-24 21:21:20 UTC (rev 13082)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2009-03-25 15:04:09 UTC (rev 13083)
@@ -12,10 +12,12 @@
continue;
searchHtml = rowObj[rowNo].cells[searchCol].innerHTML;
+ searchHtml = searchHtml.replace(/(<([^>]+)>)/ig,"");
+ //alert(searchHtml);
//if (searchHtml.replace(/\n/g, " ").match(/<TD.*>.*<\/TD>/i))
// continue;
-
+
// Build the pattern to check search column
var searchPat = new RegExp(".*"+searchText+".*", "m");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-24 21:21:20 UTC (rev 13082)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-25 15:04:09 UTC (rev 13083)
@@ -15,8 +15,8 @@
private final String TBL_ALIASES = "//div[@id='aliasBindings']/form/div/table";
private final String LNK_T_ALIAS_RENAME = "//div[@id=''aliasBindings'']/form[2]/div/table/tbody/tr[{0}]/td[2]/table/tbody/tr/td[1]/a/span";
private final String LNK_T_ALIAS_DELETE = "//div[@id=''aliasBindings'']/form[2]/div/table/tbody/tr[{0}]/td[2]/table/tbody/tr/td[2]/a/span";
- private final String SUB_ALIAS_DEL_SUBMIT = "_jbpnsAdminPortletWindowsnpbj:j_id47:j_id34:j_id40:j_id41";
- private final String SUB_ALIAS_DEL_CANCEL = "_jbpnsAdminPortletWindowsnpbj:j_id47:j_id34:j_id40:j_id42";
+ private final String SUB_ALIAS_DEL_SUBMIT = "//input[contains(@name,'j_id47:j_id34:j_id40:j_id41')]";
+ private final String SUB_ALIAS_DEL_CANCEL = "//input[contains(@name,'j_id47:j_id34:j_id40:j_id42')]";
private final String CHK_EXPL_WIR = "//input[contains(@id,'useExplicitEvents')]";
private final String CHK_PARAM_BIND = "//input[contains(@id,'useExplicitBinding')]";
private final String SUB_CREATE_ALIAS = "//input[contains(@name,'create-alias-form') and @type='submit'][1]";
17 years, 1 month