JBoss Portal SVN: r13448 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-06-11 08:02:18 -0400 (Thu, 11 Jun 2009)
New Revision: 13448
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
- JBPORTAL-2409: Properly use the correct constructors (somehow this didn't make it in the last commit)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-06-10 22:17:58 UTC (rev 13447)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-06-11 12:02:18 UTC (rev 13448)
@@ -674,10 +674,8 @@
}
//
- selectedProperties = new PropertiesBean(this);
- selectedProperties.setBeanContext(beanContext);
- controlProperties = new ControlPropertiesBean(this);
- controlProperties.setBeanContext(beanContext);
+ selectedProperties = new PropertiesBean(this, beanContext);
+ controlProperties = new ControlPropertiesBean(this, beanContext);
propertyAction = new PropertyAction(this);
propertyAction.setBeanContext(beanContext);
14 years, 11 months
JBoss Portal SVN: r13447 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/main/org/jboss/portal/core/admin/ui/actions and 2 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-06-10 18:17:58 -0400 (Wed, 10 Jun 2009)
New Revision: 13447
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
Log:
- JBPORTAL-2409:
+ Properly inject bean context in PropertyBean and subclasses.
+ ManagedBean.PropertyValidator can now provide error message key to checkNameValidity for better error reporting.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -28,6 +28,7 @@
import org.jboss.portal.common.i18n.SimpleResourceBundleFactory;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.control.ControlConstants;
+import org.jboss.portal.faces.gui.BeanContext;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
@@ -62,8 +63,10 @@
private static LocalizedString REDIRECT_TO_THE_SPECIFIED_RESOURCE = null;
private static LocalizedString REMOVE_THE_RESOURCE_FROM_PAGE = null;
- public ControlPropertiesBean(PortalObjectManagerBean pomgr)
+ public ControlPropertiesBean(PortalObjectManagerBean pomgr, BeanContext beanContext)
{
+ super(beanContext);
+
this.pomgr = pomgr;
ResourceBundleManager rbm = new ResourceBundleManager(null, new SimpleResourceBundleFactory(BUNDLE_BASE_NAME, PropertiesInfoBuilder.class.getClassLoader()));
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -24,7 +24,6 @@
package org.jboss.portal.core.admin.ui;
import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.faces.gui.ManagedBean;
import javax.faces.event.ValueChangeEvent;
@@ -55,9 +54,9 @@
}
@Override
- public ParameterValidation.ValidationErrorHandler getValidationErrorHandler(String name, String targetForErrorMessage)
+ public String getErrorMessageKey()
{
- return new MessageValidationHandler(null, targetForErrorMessage, name, getObjectTypeName(), ManagedBean.INVALID_PATH);
+ return ManagedBean.INVALID_PATH;
}
});
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -24,6 +24,7 @@
import org.jboss.portal.core.admin.ui.actions.PropertyAction;
import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.faces.gui.BeanContext;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
@@ -63,8 +64,10 @@
/** . */
private String propertyActionRef;
- public PropertiesBean(PortalObjectManagerBean pomgr)
+ public PropertiesBean(PortalObjectManagerBean pomgr, BeanContext beanContext)
{
+ super(beanContext);
+
// Get the selected object
PortalObject selectedObject = pomgr.getSelectedObject();
@@ -147,7 +150,7 @@
// Add only property user can change state
if (propertyInfo.getScope() == PropertyInfo.PUBLIC_SCOPE && propertyInfo.getAccessMode() == PropertyInfo.READ_WRITE_ACCESS_MODE && !PropertiesInfo.isControlProperty(propertyName))
{
- Locale locale = FacesContext.getCurrentInstance().getExternalContext(). getRequestLocale();
+ Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale();
items.add(new SelectItem(propertyInfo.getName(), propertyInfo.getDisplayName().getString(locale, true), propertyInfo.getDescription().getDefaultString()));
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -20,8 +20,10 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui;
+import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.faces.gui.ManagedBean;
@@ -58,6 +60,21 @@
this.inherited = inherited;
this.inheritable = inheritable;
this.value = value;
+ setBeanContext(container.getBeanContext());
+ setValidator(new DefaultPropertyValidator()
+ {
+ @Override
+ public String doSimpleChecks(String name)
+ {
+ return name; // no-op as we want to allow / and . in paths
+ }
+
+ @Override
+ public String getErrorMessageKey()
+ {
+ return ManagedBean.INVALID_VALUE;
+ }
+ });
}
public boolean isInheritable()
@@ -104,8 +121,13 @@
public void setValue(Object value)
{
- // it's currently quite difficult to retrieve the correct target for error messages, send them to "status"
- String propertyValue = checkNameValidity(value.toString(), null);
+ String propertyValue = value.toString();
+ if (!ParameterValidation.isNullOrEmpty(propertyValue))
+ {
+ // it's currently quite difficult to retrieve the correct target for error messages, send them to "status"
+ propertyValue = checkNameValidity(propertyValue, null);
+ }
+
if (propertyValue != null)
{
this.value = propertyValue;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui;
import org.jboss.portal.core.model.portal.PortalObject;
@@ -33,6 +34,11 @@
{
private BeanContext beanContext;
+ protected PropertyBeanContainer(BeanContext beanContext)
+ {
+ this.beanContext = beanContext;
+ }
+
public BeanContext getBeanContext()
{
return beanContext;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -26,7 +26,6 @@
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
import org.jboss.portal.faces.gui.ManagedBean;
-import org.jboss.portal.common.util.ParameterValidation;
/**
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -86,13 +85,7 @@
public void updateProperty()
{
- String propertyName = "";
-
- //This particular property can be null and still be valid
- if(!ParameterValidation.isNullOrEmpty(otherPropertyName)){
- propertyName = checkNameValidity(otherPropertyName, "common-edit-prop-form:property");
- }
-
+ String propertyName = checkNameValidity(otherPropertyName, "common-edit-prop-form:property");
if (propertyName != null)
{
if (propertyName.length() == 0 && selectedProperty != null)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-06-10 22:17:58 UTC (rev 13447)
@@ -327,6 +327,7 @@
INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '/', '.', '\\', '<', '>', '(', ')', '=' or '%5c'
INVALID_PATH_ERROR=''{0}'' is an invalid {1} path: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c'
+INVALID_VALUE_ERROR=''{0}'' is an invalid {1} value: Cannot be contain '\\', '<', '>', '(', ')', '=' or '%5c'
NO_SELECTED_PORTLET_ERROR=No portlet was selected!
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
bean_support_unexpected_error=Unexpected error:
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-06-10 13:00:48 UTC (rev 13446)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-06-10 22:17:58 UTC (rev 13447)
@@ -42,6 +42,7 @@
public static final String INVALID_NAME = "INVALID_NAME_ERROR";
public static final String INVALID_PATH = "INVALID_PATH_ERROR";
public static final String DUPLICATE = "DUPLICATE_ERROR";
+ public static final String INVALID_VALUE = "INVALID_VALUE_ERROR";
public static interface PropertyValidator
{
@@ -56,6 +57,8 @@
ParameterValidation.ValidationErrorHandler getValidationErrorHandler(String name, String targetForErrorMessage);
Pattern getValidationPattern();
+
+ String getErrorMessageKey();
}
private PropertyValidator validator = new DefaultPropertyValidator();
@@ -82,7 +85,7 @@
String objectTypeName = validator.getObjectTypeName();
if (ParameterValidation.isNullOrEmpty(name))
{
- beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, name, getLocalizedType(objectTypeName));
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, validator.getErrorMessageKey(), name, getLocalizedType(objectTypeName));
return null;
}
else
@@ -93,7 +96,7 @@
// we got an invalid name after simple checks, fail!
if (name == null)
{
- beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, original, getLocalizedType(objectTypeName));
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, validator.getErrorMessageKey(), original, getLocalizedType(objectTypeName));
return null;
}
@@ -229,12 +232,17 @@
public ParameterValidation.ValidationErrorHandler getValidationErrorHandler(String name, String targetForErrorMessage)
{
- return new MessageValidationHandler(null, targetForErrorMessage, name, getObjectTypeName());
+ return new MessageValidationHandler(null, targetForErrorMessage, name, getObjectTypeName(), getErrorMessageKey());
}
public Pattern getValidationPattern()
{
return ParameterValidation.XSS_CHECK;
}
+
+ public String getErrorMessageKey()
+ {
+ return INVALID_NAME;
+ }
}
}
14 years, 11 months
JBoss Portal SVN: r13446 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: selenium-rc-server and 1 other directories.
by portal-commits@lists.jboss.org
Author: vrockai
Date: 2009-06-10 09:00:48 -0400 (Wed, 10 Jun 2009)
New Revision: 13446
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/lib/selenium-java-client-driver.jar
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/selenium-server.jar
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
Log:
[selenium] - selenium libs v1 update
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/lib/selenium-java-client-driver.jar
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/selenium-server.jar
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-10 10:52:37 UTC (rev 13445)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-10 13:00:48 UTC (rev 13446)
@@ -245,7 +245,7 @@
* end it enables the user. Only the appereance (or non-appereance ) of the
* "Enable" button for the user is used for assertions.
*/
- // TODO better chcecking of the user status should be reconsidered (logging
+ // TODO better checking of the user status should be reconsidered (logging
// in)
@Test(enabled = true, dependsOnMethods = { "testDisableUser" }, description = "Enabling disabled user.")
public void testEnableUser() {
@@ -273,7 +273,7 @@
searchUser(userName, userMail);
r = findTableRow(TBL_USERLIST, "Enable", 5);
Assert.assertTrue(r < 0, "No user should be disabled.");
-
+
deleteUser(userName, userMail);
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-06-10 10:52:37 UTC (rev 13445)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-06-10 13:00:48 UTC (rev 13446)
@@ -47,6 +47,7 @@
protected final String INPUT_PASSWORD = getLoc(casePfx + "input.password", "j_password");
protected final String INPUT_USERNAME = getLoc(casePfx + "input.username", "j_username");
+ /** String used as an XSS input in xss test methods */
protected final String XSS_STR1 = getMess("portal.xxs.1", "/Dave</option><script>alert(document.cookie);</script>");
protected static Properties propsLoc;
14 years, 11 months
JBoss Portal SVN: r13445 - 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-06-10 06:52:37 -0400 (Wed, 10 Jun 2009)
New Revision: 13445
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
Log:
[selenium] - identity admin new tests and javadoc
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-10 02:47:09 UTC (rev 13444)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-10 10:52:37 UTC (rev 13445)
@@ -81,7 +81,7 @@
private final String LNK_ROLETAB = getLoc(casePfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]");
private final String LNK_ROLEMAIN = getLoc(casePfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-adm-link')]");
private final String LNK_ROLEMAIN2 = getLoc(casePfx + "lnk.rolemain2", "//a[contains(@id, 'role-admin-link')]");
-
+
private final String LNK_USERMANG_MAIN = getLoc(casePfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]");
private final String LNK_USERMANG_MAIN2 = getLoc(casePfx + "lnk.usermang.main2", "//a[contains(@id,'user-temp-form1:user-mgm-link')]");
private final String LNK_CREATE_USER = getLoc(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]");
@@ -505,7 +505,7 @@
// TODO Q: password can be anystring?
// TODO Q: what about serach input?
@Test(enabled = true)
- public void testUserCreateXss() {
+ public void testXssUserCreate() {
openAndWait(ADR_PORTAL);
clickAndWait(LNK_ADMIN);
clickAndWait(LNK_MEMBERS);
@@ -532,10 +532,16 @@
}
/**
- *
+ * When creating a role, firstly the XSS string is put into role name input
+ * and "diddi" is put into role display name. After pressing the create
+ * button it is asserted, that an error message about invalid role name was
+ * printed. In the second approach, the role name is "rolee" and XSS string
+ * is used as a role display name. After pressing the create button it is
+ * asserted, that an error message about invalid role display name was
+ * printed.
*/
@Test(enabled = true)
- public void testRoleCreateXss() {
+ public void testXssRoleCreate() {
openAndWait(ADR_PORTAL);
clickIfVisible(LNK_ADMIN);
clickIfVisible(LNK_ADMIN);
@@ -568,10 +574,13 @@
}
/**
- *
+ * After creating a role (editRole/editRoleDisplay), the role is about to be
+ * edited. The role display name is changed to to XSS string and submit
+ * button is pressed. It is asserted that the error message about invalid
+ * role display name was printed.
*/
@Test(enabled = true)
- public void testRoleEditXss() {
+ public void testXssRoleEdit() {
// EDIT ROLE
final String roleName = "editRole";
@@ -608,10 +617,14 @@
}
/**
- *
+ * User (editXssMe, editXssPass, editXssMe(a)redhat.com) is created. The user
+ * is then edited. The Xss string is written to each input on the edit user
+ * screen and the submit button is pressed. Other field are left blank. It
+ * is asserted, that the error message about invalid input for each input is
+ * written on the screen after pressing the submit button.
*/
@Test(enabled = true, dependsOnMethods = { "testEditUser" })
- public void testEditUserXss() {
+ public void testXssEditUser() {
final String userName = "editXssMe";
final String userPass = "editXssPass";
final String userMail = "editXssMe(a)redhat.com";
@@ -666,6 +679,54 @@
deleteUser(userName, userMail);
}
+ /**
+ * Into the search user input a XSS string is written and search button is
+ * pressed. The presence of input validation error is asserted.
+ */
+ @Test(enabled = false, dependsOnMethods = { "testing input validation for user search input" })
+ public void testXssSearchUser() {
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LNK_ADMIN);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LNK_MEMBERS);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ clickIfVisible(LNK_USERTAB);
+ clickIfVisible(LNK_USERMAIN);
+ clickIfVisible(LNK_USERMANG_MAIN);
+
+ selenium.click(LNK_SEARCH_USER);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type(INP_SEARCH_USER, XSS_STR1);
+ selenium.click(SUB_SEARCH_USER);
+
+ waitFor(SEARCH_TIMEOUT);
+
+ Assert.assertTrue(selenium.isTextPresent("is an invalid"));
+ }
+
+ /**
+ * Into the search role members input a XSS string is written and search
+ * button is pressed. The presence of input validation error is asserted.
+ */
+ @Test(enabled = false, dependsOnMethods = { "testing input validation for role members search input" })
+ public void testXssSearchRoleMembers() {
+
+ clickUntilMembers();
+ clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLEMAIN);
+ clickIfVisible(LNK_ROLEMAIN2);
+
+ // search for the real member of current role
+ selenium.type(INP_ROLE_SEARCH_USER, XSS_STR1);
+ selenium.click(SUB_ROLE_SEARCH_USER);
+ waitFor(10000);
+
+ Assert.assertTrue(selenium.isTextPresent("is an invalid"));
+ }
+
private void goToEdit(String userName, String userMail) {
searchUser(userName, userMail);
@@ -721,6 +782,13 @@
}
+ /**
+ * User (tempUser, tempPassword, tempUser(a)redhat.com) and role (tempRole,
+ * tempRoleDisplay) are created. The role is assigned to the user and it is
+ * asserted by the checked button in user roles. The role is then deassigned
+ * and it is asserted the same way as before. At the end of the test both
+ * the user and the role are deleted.
+ */
@Test(enabled = true, dependsOnMethods = { "testCreateUser", "testCreateRole" }, description = "Assigning of the role to the user.")
public void testAssignRole2User() {
String user = "tempUser";
@@ -969,9 +1037,9 @@
selenium.click(LNK_MEMBERS);
selenium.waitForPageToLoad(PAGE_LOAD);
- clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLETAB);
clickIfVisible(LNK_ROLEMAIN);
-
+
clickIfVisible(LNK_ROLEMAIN2);
Assert.assertTrue(selenium.isTextPresent(roleName), "Role name is missing");
14 years, 11 months
JBoss Portal SVN: r13444 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes.
by portal-commits@lists.jboss.org
Author: jpviragine
Date: 2009-06-09 22:47:09 -0400 (Tue, 09 Jun 2009)
New Revision: 13444
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
Log:
minor typo
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-06-09 12:22:04 UTC (rev 13443)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-06-10 02:47:09 UTC (rev 13444)
@@ -21,139 +21,139 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-PORTLET_INSTANCES=Inst\u00e2ncias de Portlets
-INSTANCE_DELETE=excluir inst\u00e2ncia
-PORTLET_CAUSING_REFERENCING_NOT_ABLE=Janelas que referenciam essa inst\u00e2ncia de portlet n\u00e3o ser\u00e3o capazes de exibir o seu conte\u00fado
-ARE_YOU_SURE_DELETE=Tem certeza de que deseja excluir esta inst\u00e2ncia de portlet?
+PORTLET_INSTANCES=Inst\u00E2ncias de Portlets
+INSTANCE_DELETE=excluir inst\u00E2ncia
+PORTLET_CAUSING_REFERENCING_NOT_ABLE=Janelas que referenciam essa inst\u00E2ncia de portlet n\u00E3o ser\u00E3o capazes de exibir o seu conte\u00FAdo
+ARE_YOU_SURE_DELETE=Tem certeza de que deseja excluir esta inst\u00E2ncia de portlet?
DASHBOARD_THEME_PROPERTIES=Propriedades do Tema do Meu Portal
-CONFIGURE_DASHBOARD_SETTINGS=Configurar defini\u00e7\u00f5es do Meu Portal
+CONFIGURE_DASHBOARD_SETTINGS=Configurar defini\u00E7\u00F5es do Meu Portal
DASHBOARDS=Meu Portal
-ADD_DISPLAY_NAMES=Adicionar Nomes de Exibi\u00e7\u00e3o
-CURRENT_DISPLAY_NAMES=Nomes de Exibi\u00e7\u00e3o Atuais
+ADD_DISPLAY_NAMES=Adicionar Nomes de Exibi\u00E7\u00E3o
+CURRENT_DISPLAY_NAMES=Nomes de Exibi\u00E7\u00E3o Atuais
SAVE=Gravar
MANAGE=Gerenciar
PORTALS_NO_CAP=portais
PORTAL=portal
SUB_PORTALS=sub-portais
-PAGES_WITHIN=p\u00e1ginas com
+PAGES_WITHIN=p\u00E1ginas com
CREATE_PORTAL_NAMED=Criar portal denominado
-PAGE_LAYOUT=Layout de p\u00e1gina
-SECURITY=Seguran\u00e7a
+PAGE_LAYOUT=Layout de p\u00E1gina
+SECURITY=Seguran\u00E7a
THEME=Tema
RENAME=Renomear
-DISPLAY_NAMES=Nomes de Exibi\u00e7\u00e3o
-MANAGE_SUB_PAGES_WITHIN=Gerenciar sub-p\u00e1ginas dentro
-CREATE_PAGE_NAMED=Criar p\u00e1gina denominada
-SET_PAGE_PERMISSIONS=Por favor, defina as permiss\u00f5es da p\u00e1gina
-PAGE_THEME_PROPERTIES=Propriedades do tema da p\u00e1gina
-SET_PORTAL_PERMISSIONS=Por favor, defina as permiss\u00f5es do portal
+DISPLAY_NAMES=Nomes de Exibi\u00E7\u00E3o
+MANAGE_SUB_PAGES_WITHIN=Gerenciar sub-p\u00E1ginas dentro
+CREATE_PAGE_NAMED=Criar p\u00E1gina denominada
+SET_PAGE_PERMISSIONS=Por favor, defina as permiss\u00F5es da p\u00E1gina
+PAGE_THEME_PROPERTIES=Propriedades do tema da p\u00E1gina
+SET_PORTAL_PERMISSIONS=Por favor, defina as permiss\u00F5es do portal
PORTAL_THEME_PROPERTIES=Propriedades do tema do portal
-SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Essas configura\u00e7\u00f5es s\u00e3o herdadas por todas as p\u00e1ginas e janelas deste portal. Voc\u00ea pode sobrescrev\u00ea-las, selecionando o valor adequado na respectiva p\u00e1gina de defini\u00e7\u00e3o de Temas
+SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Essas configura\u00E7\u00F5es s\u00E3o herdadas por todas as p\u00E1ginas e janelas deste portal. Voc\u00EA pode sobrescrev\u00EA-las, selecionando o valor adequado na respectiva p\u00E1gina de defini\u00E7\u00E3o de Temas
EVENT_LISTENER_BINDING=Event Listener Binding
CHOOSE_ID_PORTALEVENTLISTENER=Escolha o id do PortalEventListener para vincular a este
-SET_PERMISSIONS_FOR=Por favor, defina as permiss\u00f5es para o
+SET_PERMISSIONS_FOR=Por favor, defina as permiss\u00F5es para o
WINDOW_NO_CAP=janela
WINDOW_THEME_PROPERTIES=Propriedades do tema da janela
-INSTANCE_ID=Id da inst\u00e3ncia
-INSTANCE_NAME=Nome da inst\u00e2ncia
-ACTIONS=A\u00e7\u00f5es
-PREFERENCES=Prefer\u00eancias
+INSTANCE_ID=Id da inst\u00E3ncia
+INSTANCE_NAME=Nome da inst\u00E2ncia
+ACTIONS=A\u00E7\u00F5es
+PREFERENCES=Prefer\u00EAncias
PORTLET_DETAILS=detalhes do portlet
-ASSOCIATED_PORTLET_NOT_AVAILABLE=O portlet associado n\u00e3o est\u00e1 dispon\u00edvel
-PREFERENCES_NO_CAP=prefer\u00eancias
-SECURITY_SETTINGS=configura\u00e7\u00f5es de seguran\u00e7a
-MAKE_DEFAULT=Tornar padr\u00e3o
+ASSOCIATED_PORTLET_NOT_AVAILABLE=O portlet associado n\u00E3o est\u00E1 dispon\u00EDvel
+PREFERENCES_NO_CAP=prefer\u00EAncias
+SECURITY_SETTINGS=configura\u00E7\u00F5es de seguran\u00E7a
+MAKE_DEFAULT=Tornar padr\u00E3o
MANAGE_WINDOWS_WITHIN=Gerenciar janelas com
PORTAL_OBJECTS=Objetos do Portal
PORTALS=Portais
PORTLET_NAME=Nome do portlet
-DESCRIPTION=Descri\u00e7\u00e3o
+DESCRIPTION=Descri\u00E7\u00E3o
REMOTE=Remoto
-REMOTABLE=Utiliz\u00e1vel remotamente
-CREATE_INSTANCE=Criar inst\u00e2ncia
-PORTLET_DEFINITIONS=Defini\u00e7\u00f5es de Portlets
+REMOTABLE=Utiliz\u00E1vel remotamente
+CREATE_INSTANCE=Criar inst\u00E2ncia
+PORTLET_DEFINITIONS=Defini\u00E7\u00F5es de Portlets
DETAILS=detalhes
-INSTANCE_CREATION=cria\u00e7\u00e3o de inst\u00e2ncia
-CREATE_INSTANCE_NAMED=Criar uma inst\u00e2ncia denominada
+INSTANCE_CREATION=cria\u00E7\u00E3o de inst\u00E2ncia
+CREATE_INSTANCE_NAMED=Criar uma inst\u00E2ncia denominada
RENAME_THE=Renomeie o
TO=para
-THIS_MINIMIZED_STATE=Esta janela est\u00e1 definida com um estado minimizado
-THIS_NORMAL_STATE=Esta janela est\u00e1 definida com um estado normal
-THIS_MAXIMIZED_STATE=Esta janela est\u00e1 definida com um estado maximizado
-THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Esta janela est\u00e1 com o estado padr\u00e3o para minimizado porque uma janela dentro desta p\u00e1gina est\u00e1 definida para maximizada
+THIS_MINIMIZED_STATE=Esta janela est\u00E1 definida com um estado minimizado
+THIS_NORMAL_STATE=Esta janela est\u00E1 definida com um estado normal
+THIS_MAXIMIZED_STATE=Esta janela est\u00E1 definida com um estado maximizado
+THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Esta janela est\u00E1 com o estado padr\u00E3o para minimizado porque uma janela dentro desta p\u00E1gina est\u00E1 definida para maximizada
SWITCH_TO_WIZARD_MODE=Alternar para o modo de assistente
CREATE_PORTAL=Criar portal
-CREATE_PAGE=Criar p\u00e1gina
-DEFAULT=Padr\u00e3o
+CREATE_PAGE=Criar p\u00E1gina
+DEFAULT=Padr\u00E3o
WINDOW=Janela
VIEW_PORTLETS_PROVIDED_BY=Visualizar portlets fornecidos pelo provedor de portlet denominado
VIEW_PORTLETS=Visualizar portlets
COMMON_INCONSISTENT_STATE=Estado inconsistente
COMMON_DELETE=Excluir
-COMMON_DELETING=ATEN\u00c7\u00c3O\! Voc\u00ea est\u00e1 prestes a excluir o
+COMMON_DELETING=ATEN\u00C7\u00C3O\! Voc\u00EA est\u00E1 prestes a excluir o
COMMON_FROM=a partir do
COMMON_SURE_DELETE=Tem certeza de que deseja excluir esta
-COMMON_ERROR_HANDLING=P\u00e1gina de Gerenciamento de Erro
-COMMON_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00edvel de p\u00e1gina
+COMMON_ERROR_HANDLING=P\u00E1gina de Gerenciamento de Erro
+COMMON_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00EDvel de p\u00E1gina
COMMON_CASE=Caso
-COMMON_INHERITANCE=Heran\u00e7a
-COMMON_ACTION=A\u00e7\u00e3o
-COMMON_INHERIT_ACTION=herdar a\u00e7\u00e3o dos pais
-COMMON_CONTENT_DEFINITION=Defini\u00e7\u00e3o de Conte\u00fado
-COMMON_DEFINE_NAME_WINDOW=Defina um nome para a janela de conte\u00fado (opcional)
+COMMON_INHERITANCE=Heran\u00E7a
+COMMON_ACTION=A\u00E7\u00E3o
+COMMON_INHERIT_ACTION=herdar a\u00E7\u00E3o dos pais
+COMMON_CONTENT_DEFINITION=Defini\u00E7\u00E3o de Conte\u00FAdo
+COMMON_DEFINE_NAME_WINDOW=Defina um nome para a janela de conte\u00FAdo (opcional)
COMMON_WINDOW_NAME=Nome da Janela
-COMMON_SELECT_TYPE_CONTENT=Selecione o tipo de conte\u00fado que ser\u00e1 adicionado \u00e0 p\u00e1gina
-COMMON_NO_SELECTED_CONTENT=Voc\u00ea deve selecionar um tipo de conte\u00fado\!
-COMMON_CONTENT_TYPE=Tipo de Conte\u00fado
-COMMON_SELECT_CONTENT=Selecione o conte\u00fado que ser\u00e1 adicionado \u00e0 p\u00e1gina
-COMMON_PAGE_LAYOUT=Layout da P\u00e1gina
-COMMON_REGION=Regi\u00e3o
-COMMON_UNASSIGNED_WINDOW=Janelas n\u00e3o assinadas
+COMMON_SELECT_TYPE_CONTENT=Selecione o tipo de conte\u00FAdo que ser\u00E1 adicionado \u00E0 p\u00E1gina
+COMMON_NO_SELECTED_CONTENT=Voc\u00EA deve selecionar um tipo de conte\u00FAdo\!
+COMMON_CONTENT_TYPE=Tipo de Conte\u00FAdo
+COMMON_SELECT_CONTENT=Selecione o conte\u00FAdo que ser\u00E1 adicionado \u00E0 p\u00E1gina
+COMMON_PAGE_LAYOUT=Layout da P\u00E1gina
+COMMON_REGION=Regi\u00E3o
+COMMON_UNASSIGNED_WINDOW=Janelas n\u00E3o assinadas
COMMON_PORTAL_ERROR_HANDLING=Gerenciamento de Erros do Portal
-COMMON_PORTAL_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00edvel do portal
+COMMON_PORTAL_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00EDvel do portal
COMMON_KEY=Chave
COMMON_NAME=Nome
COMMON_READONLY=Apenas leitura
COMMON_VALUE=Valor
-COMMON_NO_DEFINED_PREFERENCES=Nenhuma prefer\u00eancia definida para este portlet
+COMMON_NO_DEFINED_PREFERENCES=Nenhuma prefer\u00EAncia definida para este portlet
COMMON_EDIT_EXISTING_VALUES=Editar valores existentes
COMMON_APPEND_VALUE=Adicionar um valor
COMMON_PROPERTIES=Propriedades
COMMON_ADD_PROPERTY=Adicionar uma propriedade
-COMMON_SELECT_PREDEFINED_PROPERTY=Selecione as propriedades pr\u00e9-definidas
+COMMON_SELECT_PREDEFINED_PROPERTY=Selecione as propriedades pr\u00E9-definidas
COMMON_OR=ou
COMMON_ENTER_PROPERTY_NAME=Digite o nome da propriedade
-COMMON_MANAGE_PROPERTIES=Ger\u00eanciar propriedades atuais
-COMMON_DESCRIPTION=Descri\u00e7\u00e3o
+COMMON_MANAGE_PROPERTIES=Gerenciar propriedades atuais
+COMMON_DESCRIPTION=Descri\u00E7\u00E3o
COMMON_INHERITED=Herdado
COMMON_YES=Sim
-COMMON_NO=N\u00e3o
+COMMON_NO=N\u00E3o
COMMON_ROLES=Perfis
-COMMON_PERMISSIONS=Permiss\u00f5es
+COMMON_PERMISSIONS=Permiss\u00F5es
COMMON_ROLE=Perfil
-COMMON_SETTING=Configura\u00e7\u00e3o
+COMMON_SETTING=Configura\u00E7\u00E3o
COMMON_LAYOUT=Layout
-COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome do layout utilizado para organizar as janelas de portlets nas p\u00e1ginas
+COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome do layout utilizado para organizar as janelas de portlets nas p\u00E1ginas
COMMON_THEME=Tema
-COMMON_NAME_LOOK_AND_FEEL=Nome da apar\u00eancia
+COMMON_NAME_LOOK_AND_FEEL=Nome da apar\u00EAncia
COMMON_RENDERSET=RenderSet
-COMMON_NAME_RENDER_ENGINE_PAGES=Nome do motor de renderiza\u00e7\u00e3o utilizado para renderizar as p\u00e1ginas
+COMMON_NAME_RENDER_ENGINE_PAGES=Nome do motor de renderiza\u00E7\u00E3o utilizado para renderizar as p\u00E1ginas
COMMON_WINDOW_RENDERER=Renderizador da Janela
-COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome do motor de renderiza\u00e7\u00e3o utilizado para renderizar as janelas
-COMMON_DECORATION_RENDERER=Renderiza\u00e7\u00e3o da Decora\u00e7\u00e3o
-COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome do motor de renderiza\u00e7\u00e3o utilizado nas decora\u00e7\u00f5es da janela
+COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome do motor de renderiza\u00E7\u00E3o utilizado para renderizar as janelas
+COMMON_DECORATION_RENDERER=Renderiza\u00E7\u00E3o da Decora\u00E7\u00E3o
+COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome do motor de renderiza\u00E7\u00E3o utilizado nas decora\u00E7\u00F5es da janela
COMMON_PORTLET_RENDERER=Renderizador do Portlet
-COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome do layout utilizado para organizar janelas de portlets em p\u00e1ginas
-COMMON_PORTLET_INSTANCE_INFORMATION=Informa\u00e7\u00e3o sobre a Inst\u00e2ncia do Portlet
+COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome do layout utilizado para organizar janelas de portlets em p\u00E1ginas
+COMMON_PORTLET_INSTANCE_INFORMATION=Informa\u00E7\u00E3o sobre a Inst\u00E2ncia do Portlet
COMMON_PORTLET_NAME=Nome do portlet
-COMMON_PORTLET_DESCRIPTION=Descri\u00e7\u00e3o do portlet
-COMMON_PORTLET_TITLE=T\u00edtulo do portlet
+COMMON_PORTLET_DESCRIPTION=Descri\u00E7\u00E3o do portlet
+COMMON_PORTLET_TITLE=T\u00EDtulo do portlet
COMMON_PORTLET_KEYWORDS=Palavras-chave do portlet
COMMON_PORTLET_LOCALES=Idiomas do portlet
-COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Nomes de exibi\u00e7\u00e3o da Inst\u00e2ncia do Portlet
-COMMON_ADD_INSTANCE_DISPLAY_NAMES=Adicionar Nome de Exibi\u00e7\u00e3o para Inst\u00e2ncia
-COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nome de Exibi\u00e7\u00e3o Atual para Inst\u00e2ncia
+COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Nomes de exibi\u00E7\u00E3o da Inst\u00E2ncia do Portlet
+COMMON_ADD_INSTANCE_DISPLAY_NAMES=Adicionar Nome de Exibi\u00E7\u00E3o para Inst\u00E2ncia
+COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nome de Exibi\u00E7\u00E3o Atual para Inst\u00E2ncia
COMMON_CANCEL=Cancelar
COMMON_UPDATE=Atualizar
COMMON_ADD=Adicionar
@@ -163,37 +163,37 @@
COMMON_NEW_VALUE=Novo valor
COMMON_APPEND=Adicionar
COMMON_LOCALE=Idioma
-COMMON_DISPLAY_NAME=Nome de Exibi\u00e7\u00e3o
-COMMON_MEDIA_TYPES=Tipos de M\u00eddia
+COMMON_DISPLAY_NAME=Nome de Exibi\u00E7\u00E3o
+COMMON_MEDIA_TYPES=Tipos de M\u00EDdia
COMMON_WINDOW_STATES=Estados da Janela
COMMON_PORTLET_MODES=Modos do Portlet
-COMMON_PREFERENCES=Prefer\u00eancias
-COMMON_PUBLIC_RENDER_PARAMETERS=Par\u00e2metros de Renderiza\u00e7\u00e3o P\u00fablicos
+COMMON_PREFERENCES=Prefer\u00EAncias
+COMMON_PUBLIC_RENDER_PARAMETERS=Par\u00E2metros de Renderiza\u00E7\u00E3o P\u00FAblicos
COMMON_ID=Id
-COMMON_TITLE=T\u00edtulo
+COMMON_TITLE=T\u00EDtulo
COMMON_KEYWORDS=Palavras-chave
COMMON_LOCALES=Idiomas
COMMON_TRANSPORT_GUARANTEES=Garantias de Transporte
-COMMON_CACHE_EXPIRATION=Expira\u00e7\u00e3o do Cache
+COMMON_CACHE_EXPIRATION=Expira\u00E7\u00E3o do Cache
COMMON_SECONDS=segundos
-COMMON_PUBLIC_NAVIGATION_PARAMETERS=Par\u00e2metros de Navega\u00e7\u00e3o P\u00fablicos
+COMMON_PUBLIC_NAVIGATION_PARAMETERS=Par\u00E2metros de Navega\u00E7\u00E3o P\u00FAblicos
COMMON_CONSUMED_EVENTS=Eventos Consumidos
COMMON_PRODUCED_EVENTS=Eventos Produzidos
DASHBOARD_PERSONAL_EDITOR=Editor do Meu Portal
-DASHBOARD_CREATE_NEW_PAGE=Criar uma nova P\u00e1gina
-DASHBOARD_CREATE_PAGE=Nome da p\u00e1gina
-DASHBOARD_RENAME_THIS_PAGE=Renomear essa P\u00e1gina
-DASHBOARD_NEW_PAGE_NAME=Novo nome de p\u00e1gina
-DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Utilize esta p\u00e1gina para gerenciar o conte\u00fado e a apar\u00eancia das p\u00e1ginas do Meu Portal
-DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Voc\u00ea pode controlar os t\u00edtulos das p\u00e1ginas, layouts da colunas, p\u00e1gina de temas, e acrescentar, ordenar ou remover portlets
-DASHBOARD_CURRENTLY_EDITING_PAGE=Editando a P\u00e1gina
+DASHBOARD_CREATE_NEW_PAGE=Criar uma nova P\u00E1gina
+DASHBOARD_CREATE_PAGE=Nome da p\u00E1gina
+DASHBOARD_RENAME_THIS_PAGE=Renomear essa P\u00E1gina
+DASHBOARD_NEW_PAGE_NAME=Novo nome de p\u00E1gina
+DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Utilize esta p\u00E1gina para gerenciar o conte\u00FAdo e a apar\u00EAncia das p\u00E1ginas do Meu Portal
+DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Voc\u00EA pode controlar os t\u00EDtulos das p\u00E1ginas, layouts da colunas, p\u00E1gina de temas, e acrescentar, ordenar ou remover portlets
+DASHBOARD_CURRENTLY_EDITING_PAGE=Editando a P\u00E1gina
DASHBOARD_THEME_AND_LAYOUT=Layout e Tema
-DASHBOARD_APPLY_THEME=Aplique um tema para o Meu Portal ou selecione o n\u00famero de colunas para o layout
+DASHBOARD_APPLY_THEME=Aplique um tema para o Meu Portal ou selecione o n\u00FAmero de colunas para o layout
DASHBOARD_CHOOSE_LAYOUT=Escolha um layout
DASHBOARD_CHOOSE_THEME=Escolha um tema
-DASHBOARD_CANNOT_UNDO_ACTION=Voc\u00ea n\u00e3o pode desfazer esta a\u00e7\u00e3o
-DASHBOARD_DELETE_THIS_PAGE=Excluir essa P\u00e1gina
+DASHBOARD_CANNOT_UNDO_ACTION=Voc\u00EA n\u00E3o pode desfazer esta a\u00E7\u00E3o
+DASHBOARD_DELETE_THIS_PAGE=Excluir essa P\u00E1gina
DASHBOARD_SAVE=Gravar
DASHBOARD_SELECT=Selecionar
@@ -201,86 +201,86 @@
WIZARD_STEP=Passo
WIZARD_SELECT_PORTLET=Selecione o Portlet
WIZARD_SELECT_PORTAL=Selecione o Portal
-WIZARD_SELECT_PAGE=Selecione a P\u00e1gina
-WIZARD_SELECT_REGION=Selecione a Regi\u00e3o
+WIZARD_SELECT_PAGE=Selecione a P\u00E1gina
+WIZARD_SELECT_REGION=Selecione a Regi\u00E3o
WIZARD_CONFIRM=Confirmar
-WIZARD_CONTENT=Conte\u00fado
-WIZARD_SWITCH_ADVANCED_MODE=Alternar para o modo avan\u00e7ado
+WIZARD_CONTENT=Conte\u00FAdo
+WIZARD_SWITCH_ADVANCED_MODE=Alternar para o modo avan\u00E7ado
WIZARD_PORTLET=Portlet
WIZARD_PORTAL=Portal
-WIZARD_PAGE=P\u00e1gina
-WIZARD_REGION=Regi\u00e3o
+WIZARD_PAGE=P\u00E1gina
+WIZARD_REGION=Regi\u00E3o
WIZARD_PREVIOUS=Anterior
-WIZARD_NEXT=Pr\u00f3ximo
-WIZARD_SUB_PAGES=Sub-P\u00e1ginas
+WIZARD_NEXT=Pr\u00F3ximo
+WIZARD_SUB_PAGES=Sub-P\u00E1ginas
WIZARD_PORTLET_PROVIDER=Fornecedor de portlet
WIZARD_CHANGE=Alterar
-DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Exibir mensagem de erro padr\u00e3o
+DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Exibir mensagem de erro padr\u00E3o
REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redirecionar para o recurso especificado
-REMOVE_THE_RESOURCE_FROM_PAGE=Remover o recurso da p\u00e1gina
+REMOVE_THE_RESOURCE_FROM_PAGE=Remover o recurso da p\u00E1gina
THEME_LAYOUT_ID_NAME=Id do layout
-THEME_LAYOUT_ID_DESCRIPTION=O valor do layout formata a p\u00e1gina
+THEME_LAYOUT_ID_DESCRIPTION=O valor do layout formata a p\u00E1gina
THEME_THEME_ID_NAME=Id do tema
-THEME_THEME_ID_DESCRIPTION=O valor do tema define a apar\u00eancia da p\u00e1gina
+THEME_THEME_ID_DESCRIPTION=O valor do tema define a apar\u00EAncia da p\u00E1gina
THEME_RENDER_SET_ID_NAME=Id do renderset
THEME_RENDER_SET_ID_DESCRIPTION=O id do renderset
-THEME_RENDER_REGION_ID_NAME=Id da regi\u00e3o
-THEME_RENDER_REGION_ID_DESCRIPTION=A regi\u00e3o que ser\u00e1 a janela
-THEME_RENDER_REGION_ORDER_NAME=Ordem da regi\u00e3o
-THEME_RENDER_REGION_ORDER_DESCRIPTION=A ordem vertical ou horizontal da janela dentro de uma regi\u00e3o
-AJAX_PARTIAL_REFRESH_NAME=Atualiza\u00e7\u00e3o parcial
-AJAX_PARTIAL_REFRESH_DESCRIPTION=Permitir atualiza\u00e7\u00e3o parcial de portlets
+THEME_RENDER_REGION_ID_NAME=Id da regi\u00E3o
+THEME_RENDER_REGION_ID_DESCRIPTION=A regi\u00E3o que ser\u00E1 a janela
+THEME_RENDER_REGION_ORDER_NAME=Ordem da regi\u00E3o
+THEME_RENDER_REGION_ORDER_DESCRIPTION=A ordem vertical ou horizontal da janela dentro de uma regi\u00E3o
+AJAX_PARTIAL_REFRESH_NAME=Atualiza\u00E7\u00E3o parcial
+AJAX_PARTIAL_REFRESH_DESCRIPTION=Permitir atualiza\u00E7\u00E3o parcial de portlets
AJAX_DND_NAME=Arrastar e soltar
AJAX_DND_DESCRIPTION=Ativar arrastar e soltar para janelas
-WINDOW_CONTENT_TYPE_NAME=Tipo de conte\u00fado
-WINDOW_CONTENT_TYPE_DESCRIPTION=O tipo de conte\u00fado de uma janela
-DEFAULT_CHILD_NAME_NAME=Nome padr\u00e3o para o filho
-DEFAULT_CHILD_NAME_DESCRIPTION=O nome filho \u00e9 utilizado quando nenhum nome espec\u00edfico para o filho \u00e9 especificado
+WINDOW_CONTENT_TYPE_NAME=Tipo de conte\u00FAdo
+WINDOW_CONTENT_TYPE_DESCRIPTION=O tipo de conte\u00FAdo de uma janela
+DEFAULT_CHILD_NAME_NAME=Nome padr\u00E3o para o filho
+DEFAULT_CHILD_NAME_DESCRIPTION=O nome filho \u00E9 utilizado quando nenhum nome espec\u00EDfico para o filho \u00E9 especificado
TAB_ORDER_NAME=Ordem da aba
-TAB_ORDER_DESCRIPTION=A valor de ordena\u00e7\u00e3o para exibir p\u00e1ginas em abas
+TAB_ORDER_DESCRIPTION=A valor de ordena\u00E7\u00E3o para exibir p\u00E1ginas em abas
INITIAL_WINDOW_STATE_NAME=Modo Inicial
INITIAL_WINDOW_STATE_DESCRIPTION=O modo inicial da janela
-CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando o acesso \u00e0 janela \u00e9 negado
-CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00e0 janela \u00e9 negado
-CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando a janela est\u00e1 indispon\u00edvel
-CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando a janela est\u00e1 indispon\u00edvel
-CONTROL_POLICY_PAGE_ERROR_NAME=Quando h\u00e1 um erro na janela
-CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando h\u00e1 um erro na janela
-CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando h\u00e1 um erro dentro da janela
-CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando h\u00e1 um erro dentro da janela
-CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando a janela n\u00e3o for encontrada
-CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando a janela n\u00e3o for encontrada
+CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando o acesso \u00E0 janela \u00E9 negado
+CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00E0 janela \u00E9 negado
+CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando a janela est\u00E1 indispon\u00EDvel
+CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando a janela est\u00E1 indispon\u00EDvel
+CONTROL_POLICY_PAGE_ERROR_NAME=Quando h\u00E1 um erro na janela
+CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando h\u00E1 um erro na janela
+CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando h\u00E1 um erro dentro da janela
+CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro dentro da janela
+CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando a janela n\u00E3o for encontrada
+CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando a janela n\u00E3o for encontrada
CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=Quando ocorrer um erro, redirecionar para este recurso
CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=Quando ocorrer um erro, redirecionar para este recurso
-CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando o acesso \u00e0 p\u00e1gina \u00e9 negado
-CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00e0 p\u00e1gina \u00e9 negado
-CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando a p\u00e1gina n\u00e3o est\u00e1 dispon\u00edvel
-CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando a p\u00e1gina n\u00e3o est\u00e1 dispon\u00edvel
-CONTROL_POLICY_PORTAL_ERROR_NAME=Quando h\u00e1 um erro na p\u00e1gina
-CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando h\u00e1 um erro na p\u00e1gina
-CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando h\u00e1 um erro dentro da p\u00e1gina
-CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando h\u00e1 um erro dentro da p\u00e1gina
-CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando a p\u00e1gina n\u00e3o for encontrada
-CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando a p\u00e1gina n\u00e3o for encontrada
+CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando o acesso \u00E0 p\u00E1gina \u00E9 negado
+CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00E0 p\u00E1gina \u00E9 negado
+CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando a p\u00E1gina n\u00E3o est\u00E1 dispon\u00EDvel
+CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando a p\u00E1gina n\u00E3o est\u00E1 dispon\u00EDvel
+CONTROL_POLICY_PORTAL_ERROR_NAME=Quando h\u00E1 um erro na p\u00E1gina
+CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro na p\u00E1gina
+CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando h\u00E1 um erro dentro da p\u00E1gina
+CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro dentro da p\u00E1gina
+CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando a p\u00E1gina n\u00E3o for encontrada
+CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando a p\u00E1gina n\u00E3o for encontrada
CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=Quando ocorrer um erro, redirecionar para este recurso
CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=Quando ocorrer um erro, redirecionar para este recurso
NO_BOUND_LISTENER=nenhum listener vinculado
-COORDINATION_COORDINATION=Coordena\u00e7\u00e3o
+COORDINATION_COORDINATION=Coordena\u00E7\u00E3o
COORDINATION_PARAMETER_BINDINGS=Parameter bindings
COORDINATION_PARAMETER_EXPLICIT_MODE=Use explicit parameter binding
COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings:
COORDINATION_PARAMETER_EXISTING_NONE=No existing parameter bindings.
COORDINATION_PARAMETER_EXISTING_NAME=Nome
COORDINATION_PARAMETER_EXISTING_PAIRS=Window / parameter pairs
-COORDINATION_PARAMETER_EXISTING_ACTIONS=A\u00e7\u00f5es
-COORDINATION_PARAMETER_CREATE=Criar um novo par\u00e2metro de binding\:
-COORDINATION_PARAMETER_CREATE_NO_PAIRS=Nenhum par\u00e2metro p\u00fablico de renderiza\u00e7\u00e3o. N\u00e3o \u00e9 poss\u00edvel criar novo par\u00e2metro de bindings.
-COORDINATION_PARAMETER_CREATE_STEP1=1. Selecione par\u00e2metro p\u00fablico / window pairs\:
-COORDINATION_PARAMETER_CREATE_STEP2=2. Nome do par\u00e2metro de binding\:
+COORDINATION_PARAMETER_EXISTING_ACTIONS=A\u00E7\u00F5es
+COORDINATION_PARAMETER_CREATE=Criar um novo par\u00E2metro de binding\:
+COORDINATION_PARAMETER_CREATE_NO_PAIRS=Nenhum par\u00E2metro p\u00FAblico de renderiza\u00E7\u00E3o. N\u00E3o \u00E9 poss\u00EDvel criar novo par\u00E2metro de bindings.
+COORDINATION_PARAMETER_CREATE_STEP1=1. Selecione par\u00E2metro p\u00FAblico / window pairs\:
+COORDINATION_PARAMETER_CREATE_STEP2=2. Nome do par\u00E2metro de binding\:
COORDINATION_PARAMETER_CREATE_CREATE=Criar binding
COORDINATION_WINDOWS=Janelas
@@ -290,7 +290,7 @@
COORDINATION_ALIAS_EXISTING_NONE=No existing alias bindings.
COORDINATION_ALIAS_EXISTING_NAME=Nome
COORDINATION_ALIAS_EXISTING_ORIGINAL=QName Original
-COORDINATION_ALIAS_EXISTING_ACTIONS=A\u00e7\u00f5es
+COORDINATION_ALIAS_EXISTING_ACTIONS=A\u00E7\u00F5es
COORDINATION_ALIAS_CREATE=Create new alias binding:
COORDINATION_ALIAS_CREATE_NO_PARAMS=No available public render parameters. Cannot create new alias bindings.
COORDINATION_ALIAS_CREATE_STEP1=1. Select public render parameter:
@@ -306,7 +306,7 @@
COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=Source events
COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=Destination events
COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows
-COORDINATION_EVENT_EXISTING_ACTIONS=A\u00e7\u00f5es
+COORDINATION_EVENT_EXISTING_ACTIONS=A\u00E7\u00F5es
COORDINATION_EVENT_CREATE=Create new event wiring:
COORDINATION_EVENT_CREATE_NO_EVENTS=No available events. Cannot create new event wirings.
COORDINATION_EVENT_CREATE_STEP1=1. Select source event:
@@ -325,16 +325,16 @@
COORDINATION_PARAMETER=parameter binding
COORDINATION_ALIAS=alias binding
-INVALID_NAME_ERROR=''{0}'' \u00e9 um nome de {1} inv\u00e1lido\: N\u00e3o pode ser nulo, vazio, ou que contenha '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' \u00E9 um nome de {1} inv\u00E1lido\: N\u00E3o pode ser nulo, vazio, ou que contenha '/', '.', '\\', '<', '>', '(', ')', '\=' ou '%5c'
NO_SELECTED_PORTLET_ERROR=Nenhum portlet foi selecionado!
-DUPLICATE_ERROR=O {1} denominado ''{0}'' j\u00e1 existe\!
+DUPLICATE_ERROR=O {1} denominado ''{0}'' j\u00E1 existe\!
bean_support_unexpected_error=Erro inesperado:
bean_support_cause=Motivo:
-INSTANCE_TYPE=inst\u00e2ncia
-PAGE_TYPE=p\u00e1gina
+INSTANCE_TYPE=inst\u00E2ncia
+PAGE_TYPE=p\u00E1gina
PORTAL_TYPE=portal
-DISPLAY_NAME_TYPE=nomes de exibi\u00e7\u00e3o
+DISPLAY_NAME_TYPE=nomes de exibi\u00E7\u00E3o
PROPERTY_TYPE=propriedade
PORTAL_OBJECT_TYPE=objeto do portal
WINDOW_TYPE=janela
14 years, 11 months
JBoss Portal SVN: r13443 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits@lists.jboss.org
Author: vrockai
Date: 2009-06-09 08:22:04 -0400 (Tue, 09 Jun 2009)
New Revision: 13443
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
[selenium] - more input validation tests
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2009-06-09 11:26:29 UTC (rev 13442)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2009-06-09 12:22:04 UTC (rev 13443)
@@ -76,7 +76,16 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(propName));
}
+
+ @Test(enabled = true)
+ public void testXssPropAdd() {
+ selenium.type(INPUT_PROP_NAME, XSS_STR1);
+ selenium.click(SUBMIT_ADD_PROP);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("is an invalid property name"));
+ }
+
/**
* Testing of property update. Simple adding of "SelenValueProp" property
* and setting it the value "updatedValue". The value is then assrted to be
@@ -100,8 +109,29 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals(selenium.getValue(MessageFormat.format(T_PROPS_INPUT_VALUE, r - 1)), value, "Updated value not found.");
+ Assert.assertTrue(selenium.isTextPresent("is an invalid property value"));
}
+
+ @Test(enabled = true)
+ public void testXssPropUpdate() {
+ final String propName = "XssStrProp";
+
+
+ Assert.assertFalse(selenium.isTextPresent(propName));
+ selenium.type(INPUT_PROP_NAME, propName);
+ selenium.click(SUBMIT_ADD_PROP);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent(propName));
+ int r = findTableRow(TABLE_PROPS, propName, 1);
+
+ selenium.type(MessageFormat.format(T_PROPS_INPUT_VALUE, r - 1), XSS_STR1);
+ selenium.click(SUBMIT_UPDATE_VALUE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+
+ }
+
/**
* Testing property deletion. Property named "SelenDeleteProp" is added and
* deleted. Final assertion is about non-appearance of that property in
@@ -114,11 +144,14 @@
Assert.assertFalse(selenium.isTextPresent(propName));
selenium.type(INPUT_PROP_NAME, propName);
selenium.click(SUBMIT_ADD_PROP);
+ System.out.println("WATCH OUT!");
+ selenium.setSpeed("6000");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(propName));
int r = findTableRow(TABLE_PROPS, propName, 0);
-
+
+ System.out.println(MessageFormat.format(T_PROPS_LINK_DEL, r - 1));
selenium.click(MessageFormat.format(T_PROPS_LINK_DEL, r - 1));
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -146,6 +179,15 @@
selenium.click(T_PO_SUB_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
}
+
+ @Test(enabled = true)
+ public void testXssPortalError() {
+ selenium.type(T_PO_INP_PAGEADD, XSS_STR1);
+ selenium.click(T_PO_SUB_UPDATE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("is an invalid property path"));
+ }
/**
* Testing of page error handling. in
@@ -169,6 +211,15 @@
selenium.click(T_PA_SUB_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
}
+
+ @Test(enabled = true)
+ public void testXssPageError() {
+ selenium.type(T_PA_INP_PAGEADD, XSS_STR1);
+ selenium.click(T_PA_SUB_UPDATE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("is an invalid property path"));
+ }
/**
* Testing of dashboard theme. The layout, theme and renderset are changed,
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-06-09 11:26:29 UTC (rev 13442)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-06-09 12:22:04 UTC (rev 13443)
@@ -94,6 +94,20 @@
Assert.assertTrue(selenium.isTextPresent("str|nge|n|me"+" portlet details"));
}
+ @Test(enabled = true)
+ public void testXssCreateInstance(){
+
+ int r = findTableRow(TABLE_PORTLET, "Administration Portlet", 0);
+
+ selenium.click(MessageFormat.format(T_LINK_CREATE,r-1));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type(INPUT_INSTANCE_NAME, XSS_STR1);
+ selenium.click(SUBMIT_CREATE_INST);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("is an invalid instance name"));
+ }
+
/**
* Tests preferences screen of portlet definition. It clicks on preferences link for "Current Users Portlet" definition and asserts that the string "guestNumber"
* is appearing on the screen.
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-06-09 11:26:29 UTC (rev 13442)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-06-09 12:22:04 UTC (rev 13443)
@@ -91,7 +91,21 @@
clickAndWait(SUBMIT_MODIFY_NAME);
Assert.assertTrue(findTableRow(TABLE_DISPNAMES, name, 1) >= 0);
}
+
+ @Test(enabled = true)
+ public void testXssAddName() {
+ int r = traversePortlets(NAME_COUNTPORT, 0);
+ clickAndWait(MessageFormat.format(LNK_INSTANCE_BUTTON, r));
+ safeSelect(SELECT_LANGUAGE, "English");
+
+
+ selenium.type(INPUT_NAME, XSS_STR1);
+ clickAndWait(SUBMIT_MODIFY_NAME);
+
+ Assert.assertTrue(selenium.isTextPresent("is an invalid display name"));
+ }
+
/**
* Tests deleting a name for portlet instance.A new name "Aduminu" in
* "Japanese" language is added for CurrentUsersPortletInstance similar way
@@ -544,7 +558,41 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
+
+ @Test(enabled = true)
+ public void testXssPreferences() {
+ int r = traversePortlets(NAME_COUNTPORT, 0);
+ clickAndWait(MessageFormat.format(LNK_PREF_BUTTON, r));
+ // selenium.click(LINK_CURUSER_PREFERENCES);
+
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(SUBMIT_PREF_CANCEL);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ r = traversePortlets(NAME_COUNTPORT, 0);
+ clickAndWait(MessageFormat.format(LNK_PREF_BUTTON, r));
+
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(findTableRow(TABLE_PREF_KEY, "guestNumber", 0) >= 0);
+ selenium.click(LINK_PREF_GUESTNUM);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type(INPUT_PREF_APPEND, "xssString");
+ selenium.click(INPUT_PREF_UPDATE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type(INPUT_PREF_APPEND, XSS_STR1);
+ selenium.click(INPUT_PREF_UPDATE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("is an invalid instance name"));
+
+ selenium.type(INPUT_PREF_NEWVAL, XSS_STR1);
+ selenium.click(SUBMIT_PREF_UPDATE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("is an invalid instance name"));
+ }
+
/**
* Gets pages. acquiring link names from paginator
*
14 years, 11 months
JBoss Portal SVN: r13442 - modules/identity/branches.
by portal-commits@lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-06-09 07:26:29 -0400 (Tue, 09 Jun 2009)
New Revision: 13442
Removed:
modules/identity/branches/JBP_IDENTITY_1_1_0_JBEPP-78/
Log:
[JBEPP-78] Reverted to identity version 1.1.0.
14 years, 11 months
JBoss Portal SVN: r13441 - in branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78: core/src/main/org/jboss/portal/core/identity/cache and 1 other directories.
by portal-commits@lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-06-09 07:24:12 -0400 (Tue, 09 Jun 2009)
New Revision: 13441
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/build/build-thirdparty.xml
branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java
branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java
Log:
[JBEPP-78] Less optimal implementation of role display name duplicate checking albeit without API changes. Reverted to identity version 1.1.0.
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/build/build-thirdparty.xml 2009-06-09 08:58:05 UTC (rev 13440)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/build/build-thirdparty.xml 2009-06-09 11:24:12 UTC (rev 13441)
@@ -1,4 +1,26 @@
<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<project name="main.build" default="synchronize" basedir=".">
<!-- Property File definitions -->
@@ -45,7 +67,7 @@
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.7"/>
- <componentref name="jboss-portal/modules/identity" version="1.1.0_JBEPP-78"/>
+ <componentref name="jboss-portal/modules/identity" version="1.1.0"/>
<componentref name="jboss-portal/modules/cms" version="1.2.5"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java 2009-06-09 08:58:05 UTC (rev 13440)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java 2009-06-09 11:24:12 UTC (rev 13441)
@@ -63,18 +63,6 @@
return ldapRoleModule.findRoleByName(name);
}
- public Role findRoleByDisplayName(String displayName) throws IdentityException, IllegalArgumentException
- {
- Role role = cacheService.findRoleByDisplayName(displayName);
-
- if (role != null)
- {
- return role;
- }
-
- return ldapRoleModule.findRoleByDisplayName(displayName);
- }
-
public Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException
{
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java 2009-06-09 08:58:05 UTC (rev 13440)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java 2009-06-09 11:24:12 UTC (rev 13441)
@@ -47,8 +47,6 @@
protected ThreadLocal<Map<String, Role>> roleNameCache = new ThreadLocal<Map<String, Role>>();
- protected ThreadLocal<Map<String, Role>> roleDisplayNameCache = new ThreadLocal<Map<String, Role>>();
-
protected ThreadLocal<Map<Object, Role>> roleIdCache = new ThreadLocal<Map<Object, Role>>();
@@ -58,7 +56,6 @@
userIdCache.set(null);
profileCache.set(null);
roleNameCache.set(null);
- roleDisplayNameCache.set(null);
roleIdCache.set(null);
log.debug("Identity cache invalidated");
@@ -100,15 +97,6 @@
return roleNameCache.get();
}
- private Map<String, Role> getRoleDisplayNameCache()
- {
- if (roleDisplayNameCache.get() == null)
- {
- roleDisplayNameCache.set(new HashMap<String, Role>());
- }
- return roleDisplayNameCache.get();
- }
-
private Map<Object, Role> getRoleIdCache()
{
if (roleIdCache.get() == null)
@@ -184,7 +172,6 @@
{
getRoleIdCache().put(role.getId(), role);
getRoleNameCache().put(role.getName(), role);
- getRoleDisplayNameCache().put(role.getDisplayName(), role);
if (log.isDebugEnabled())
{
@@ -200,7 +187,6 @@
{
getRoleIdCache().put(role.getId(), null);
getRoleNameCache().put(role.getName(), null);
- getRoleDisplayNameCache().put(role.getDisplayName(), null);
if (log.isDebugEnabled())
{
@@ -257,18 +243,6 @@
return role;
}
- public Role findRoleByDisplayName(String displayName)
- {
- Role role = getRoleDisplayNameCache().get(displayName);
-
- if (role != null && log.isDebugEnabled())
- {
- log.debug("Role retrieved from cache for display name=" + role.getDisplayName());
- }
-
- return role;
- }
-
public Role findRoleById(Object id)
{
Role role = getRoleIdCache().get(id);
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-06-09 08:58:05 UTC (rev 13440)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP01_JBEPP-78/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-06-09 11:24:12 UTC (rev 13441)
@@ -27,7 +27,11 @@
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
import org.jboss.portal.faces.gui.ManagedBean;
import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+import java.util.Set;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -57,13 +61,25 @@
{
try
{
+ RoleModule roleModule = identityRoleBean.getRoleModule();
if (isDisplay)
{
- return identityRoleBean.getRoleModule().findRoleByDisplayName(objectName) != null;
+ // performance: this could potentially be costly if there are lots of roles...
+ Set roles = roleModule.findRoles();
+ for (Object o : roles)
+ {
+ Role role = (Role)o;
+ if (role.getDisplayName().equals(objectName))
+ {
+ return true;
+ }
+ }
+
+ return false;
}
else
{
- return identityRoleBean.getRoleModule().findRoleByName(objectName) != null;
+ return roleModule.findRoleByName(objectName) != null;
}
}
catch (IdentityException e)
14 years, 11 months
JBoss Portal SVN: r13440 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits@lists.jboss.org
Author: vrockai
Date: 2009-06-09 04:58:05 -0400 (Tue, 09 Jun 2009)
New Revision: 13440
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
Log:
[selenium] - portlet def uncommon name fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-06-08 13:42:36 UTC (rev 13439)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-06-09 08:58:05 UTC (rev 13440)
@@ -88,10 +88,10 @@
selenium.click(MessageFormat.format(T_LINK_CREATE,r-1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type(INPUT_INSTANCE_NAME, "str.nge.n.me");
+ selenium.type(INPUT_INSTANCE_NAME, "str|nge|n|me");
selenium.click(SUBMIT_CREATE_INST);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("str.nge.n.me"+" portlet details"));
+ Assert.assertTrue(selenium.isTextPresent("str|nge|n|me"+" portlet details"));
}
/**
14 years, 11 months
JBoss Portal SVN: r13439 - 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-06-08 09:42:36 -0400 (Mon, 08 Jun 2009)
New Revision: 13439
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
Log:
[selenium] - fixes for failing tests
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-05 15:17:37 UTC (rev 13438)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-08 13:42:36 UTC (rev 13439)
@@ -80,6 +80,8 @@
private final String LNK_ROLETAB = getLoc(casePfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]");
private final String LNK_ROLEMAIN = getLoc(casePfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-adm-link')]");
+ private final String LNK_ROLEMAIN2 = getLoc(casePfx + "lnk.rolemain2", "//a[contains(@id, 'role-admin-link')]");
+
private final String LNK_USERMANG_MAIN = getLoc(casePfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]");
private final String LNK_USERMANG_MAIN2 = getLoc(casePfx + "lnk.usermang.main2", "//a[contains(@id,'user-temp-form1:user-mgm-link')]");
private final String LNK_CREATE_USER = getLoc(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]");
@@ -410,6 +412,7 @@
clickUntilMembers();
clickIfVisible(LNK_ROLETAB);
clickIfVisible(LNK_ROLEMAIN);
+ clickIfVisible(LNK_ROLEMAIN2);
int r = findTableRow(TBL_ROLELIST, roleName, 0);
selenium.click(MessageFormat.format(LNK_T_ROLLIST_MEMBERS, r - 1));
@@ -966,9 +969,10 @@
selenium.click(LNK_MEMBERS);
selenium.waitForPageToLoad(PAGE_LOAD);
- clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLEMAIN);
- clickIfVisible(LNK_ROLEMAIN);
+ clickIfVisible(LNK_ROLEMAIN2);
Assert.assertTrue(selenium.isTextPresent(roleName), "Role name is missing");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-06-05 15:17:37 UTC (rev 13438)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-06-08 13:42:36 UTC (rev 13439)
@@ -397,7 +397,7 @@
@Test(enabled = true)
public void testXssConsumerManage() {
String beaName = "XssBeaConsumer";
-
+
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -423,34 +423,34 @@
selenium.type(INPUT_CONSWSDL, XSS_STR1);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Require a well-formed URL"));
-
+
selenium.type(INPUT_CACHEEXP, XSS_STR1);
selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("must be a number between"));
-
+
selenium.type(INP_PRODID, XSS_STR1);
selenium.type(INPUT_CACHEEXP, "600");
selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("is an invalid Consumer name"));
-
+
selenium.type(INP_PRODID, beaName);
selenium.type(INPUT_CACHEEXP, "600");
selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
selenium.type(INPUT_CONS_REGVALUE, XSS_STR1);
selenium.click(SUB_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("An unexpected error occured"));
}
@@ -461,19 +461,16 @@
public void testXssProducerManage() {
goToProducers();
- selenium.type("_WSRPConfigurationPortletWindow:j_id24:producer-form:registrationPolicy", XSS_STR1);
+ selenium.type("//input[contains(@id,'producer-form:registrationPolicy')]", XSS_STR1);
selenium.click(SUB_PROD_SAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class"));
- // goToProducers();
- // selenium.type(
- // "_WSRPConfigurationPortletWindow:j_id24:producer-form:validator"
- // ,XSS_STR1);
- // selenium.click(SUB_PROD_SAVE);
- // selenium.waitForPageToLoad(PAGE_LOAD);
- //Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class")
- // );
+ goToProducers();
+ selenium.type("//input[contains(@id,'producer-form:validator')]", XSS_STR1);
+ selenium.click(SUB_PROD_SAVE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class"));
// properties
selenium.open("/portal/");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-06-05 15:17:37 UTC (rev 13438)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-06-08 13:42:36 UTC (rev 13439)
@@ -1107,16 +1107,10 @@
selenium.click(MessageFormat.format(POR_TL_MAIN, r));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type(INP_PP_RES_INPUT, XSS_STR1);
- selenium.click(SUB_PP_ERROR_FORM_UPDATE);
+ selenium.type(INPUT_PAGENAME, XSS_STR1);
+ selenium.click(INPUT_SUBMIT_PAGECREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- Assert.assertTrue(selenium.isTextPresent("is an invalid page name"));
- selenium.type(INP_PPA_RES_SELECT, XSS_STR1);
- selenium.click(SUB_PPA_FORM_UPDATE);
- selenium.waitForPageToLoad(PAGE_LOAD);
-
Assert.assertTrue(selenium.isTextPresent("is an invalid page name"));
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-06-05 15:17:37 UTC (rev 13438)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-06-08 13:42:36 UTC (rev 13439)
@@ -271,11 +271,12 @@
r = findTableRow(TAB_PROPERTIES, "dragadrop", 0) - 1;
Assert.assertTrue(r > -1, "Previously added property drag&drop not found in the property table");
- // - add partial refresh prop
+ // - add custom partial refresh prop
selenium.type(INP_POR_PROPERTY, "partialRef");
selenium.click(SUB_POR_PROPERTY);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
+ // set it's value
r = findTableRow(TAB_PROPERTIES, "partialRef", 0) - 1;
selenium.type(MessageFormat.format(TAB_PROP_VAL, r), "partialicek");
selenium.click(SUB_POR_PROPS_UPDATE);
@@ -283,10 +284,12 @@
goToProperties();
// - assert partial refresh is added
- r = findTableRow(TAB_PROPERTIES, "partialRef", 0) - 1;
+ r = findTableRow(TAB_PROPERTIES, "partialRef", 0) - 1;
+
Assert.assertTrue(r > -1, "Previously added property partial refresh not found in the property table");
- r = findTableRow(TAB_PROPERTIES, "partialicek", 0) - 1;
- Assert.assertTrue(r > -1, "Previously added property partial refresh not found in the property table");
+
+ String propVal = selenium.getValue(MessageFormat.format(TAB_PROP_VAL,r));
+ Assert.assertEquals(propVal,"partialicek", "Previously added property partial refresh not found in the property table");
// - delete d&d prop
r = findTableRow(TAB_PROPERTIES, "dragadrop", 0) - 1;
14 years, 11 months