JBoss Portal SVN: r11997 - branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-26 11:03:58 -0400 (Fri, 26 Sep 2008)
New Revision: 11997
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
Log:
remove fixed width for longer i18n labels
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-26 14:13:28 UTC (rev 11996)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-26 15:03:58 UTC (rev 11997)
@@ -498,7 +498,6 @@
}
.admin-ui .layout-button {
- width: 50px;
margin: 2px;
padding: 2px;
}
17 years, 7 months
JBoss Portal SVN: r11996 - branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-26 10:13:28 -0400 (Fri, 26 Sep 2008)
New Revision: 11996
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
Log:
remove junk chars
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 14:01:36 UTC (rev 11995)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 14:13:28 UTC (rev 11996)
@@ -155,8 +155,7 @@
{
IdentityUIUser uiUser =new IdentityUIUser(user.getUserName());
list.add(uiUser);
- } JBo
-
+ }
Collections.sort(list, new IdentityUIUserComparator());
return list;
17 years, 7 months
JBoss Portal SVN: r11995 - branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-26 10:01:36 -0400 (Fri, 26 Sep 2008)
New Revision: 11995
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
Log:
sync fix from 2.6 branch
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 14:00:44 UTC (rev 11994)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 14:01:36 UTC (rev 11995)
@@ -30,6 +30,8 @@
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+import java.util.Comparator;
+import java.util.Collections;
import javax.faces.context.FacesContext;
@@ -153,7 +155,10 @@
{
IdentityUIUser uiUser =new IdentityUIUser(user.getUserName());
list.add(uiUser);
- }
+ } JBo
+
+ Collections.sort(list, new IdentityUIUserComparator());
+
return list;
}
@@ -277,4 +282,25 @@
return null;
}
+
+ protected class IdentityUIUserComparator implements Comparator
+ {
+
+
+ public int compare(Object o1, Object o2)
+ {
+ try
+ {
+ IdentityUIUser u1 = (IdentityUIUser)o1;
+ IdentityUIUser u2 = (IdentityUIUser)o2;
+
+ return u1.getUsername().compareToIgnoreCase(u2.getUsername());
+ }
+ catch(Throwable e)
+ {
+ //none
+ }
+ return 0;
+ }
+ }
}
17 years, 7 months
JBoss Portal SVN: r11994 - branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-identity/src/main/org/jboss/portal/core/identity/ui/common.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-26 10:00:44 -0400 (Fri, 26 Sep 2008)
New Revision: 11994
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
Log:
- sync fix from 2.6 branch
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 13:28:52 UTC (rev 11993)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 14:00:44 UTC (rev 11994)
@@ -30,6 +30,8 @@
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+import java.util.Comparator;
+import java.util.Collections;
import javax.faces.context.FacesContext;
@@ -160,6 +162,7 @@
User u = (User) i.next();
list.add(new IdentityUIUser(u.getUserName()));
}
+ Collections.sort(list, new IdentityUIUserComparator());
return list;
}
@@ -283,4 +286,27 @@
return null;
}
+
+ protected class IdentityUIUserComparator implements Comparator
+ {
+
+
+ public int compare(Object o1, Object o2)
+ {
+ try
+ {
+ IdentityUIUser u1 = (IdentityUIUser)o1;
+ IdentityUIUser u2 = (IdentityUIUser)o2;
+
+ return u1.getUsername().compareToIgnoreCase(u2.getUsername());
+ }
+ catch(Throwable e)
+ {
+ //none
+ }
+ return 0;
+ }
+ }
+
+
}
17 years, 7 months
JBoss Portal SVN: r11993 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-09-26 09:28:52 -0400 (Fri, 26 Sep 2008)
New Revision: 11993
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
Log:
wsrp and dashboard fixes
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-26 13:04:02 UTC (rev 11992)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-26 13:28:52 UTC (rev 11993)
@@ -4,6 +4,7 @@
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@@ -15,7 +16,7 @@
private static final String LINK_CONFIGURE_DASHBOARD = "link=Configure dashboard";
private static final String LINK_DASHBOARD = "link=Dashboard";
private static final String SELECT_PAGE = "page-selector-form:pageNameSelector";
- private static final String INPUT_PAGENAME = "dashboard-form:pageName";
+ private static final String INPUT_PAGENAME = "dashboard-form:pageName";
private static final String SUBMIT_CREATEPAGE = "dashboard-form:save-button";
private static final String SELECT_LAYOUT = "dashboardLayoutForm:layoutSelector";
private static final String SUBMIT_LAYOUTSEL = "dashboardLayoutForm:update-layout";
@@ -55,9 +56,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.select(SELECT_THEME, "label=renaissance");
selenium.click(SUBMIT_THEMESEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -71,26 +72,20 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
-
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_THEME), "renaissance","Previously selected theme other then expected.");
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_THEME), "renaissance", "Previously selected theme other then expected.");
}
- private void selectIfNotSelected(String label) {
- if (!selenium.getSelectedLabel(SELECT_PAGE).equals(label))
- selenium.select(SELECT_PAGE, "label="+label);
- selenium.waitForPageToLoad(PAGE_LOAD);
- }
+
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
public void testUpdateLayout() {
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"DashTestPage","Default layout is not called \"default\".");
- selectIfNotSelected("DashTestPage");
-
+
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.select(SELECT_LAYOUT, "label=generic");
selenium.click(SUBMIT_LAYOUTSEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -104,7 +99,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"generic","Previously selected layout other then expected.");
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT), "generic", "Previously selected layout other then expected.");
}
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
@@ -114,7 +109,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
selenium.click("link=Who's online portlet");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_ADDCENTER);
@@ -123,12 +118,12 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Current users"));
Assert.assertTrue(selenium.isTextPresent("Whose 1 is logged-in:"));
Assert.assertTrue(selenium.isTextPresent("[admin]"));
}
-
+
@Test(enabled = true, dependsOnMethods = { "testAddPortlet" })
public void testDeletePortlet() {
@@ -136,9 +131,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- selectIfNotSelected("DashTestPage");
-
+
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.addSelection("layoutForm:selectMany_center", "label=CurrentUsersPortletWindow");
selenium.click("layoutForm:l_center");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -147,12 +142,11 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertFalse(selenium.isTextPresent("Current users"));
Assert.assertFalse(selenium.isTextPresent("Whose 1 is logged-in:"));
Assert.assertFalse(selenium.isTextPresent("[admin]"));
}
-
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testAddGooglePortlet() {
@@ -160,7 +154,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
selenium.select("abc:instanceId", "label=widget/google");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Hindu God of the Week");
@@ -171,16 +165,17 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Hindu God of the Week"));
}
// http://www.jboss.com/index.html?module=bb&op=viewtopic&t=143023
- @Test(enabled = false)
- public void testBugResetPortletSetting()
- {
+ @Test(enabled = true)
+ public void testBugResetPortletSetting() {
final String pageName = "page1";
+ final String pageNameNew = "page1a";
+ // create page
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
@@ -192,35 +187,69 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- Assert.assertTrue(selenium.isElementPresent("link="+pageName));
- selenium.click("link="+pageName);
+
+ Assert.assertTrue(selenium.isElementPresent("link=" + pageName));
+ selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
-
+
+ // add weather portlet
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected(pageName);
- selenium.click("Link=Weather Portlet");
+
+ selectIfNotSelected(SELECT_PAGE,pageName);
+
+ selenium.click("Link=*Weather Portlet*");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_ADDLEFT);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("link="+pageName);
+ selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Miami, FL, US"));
-
-
+
+ // change the properties
+ selenium.click("//div[@id='dashboard:YWRtaW4=.cGFnZTE=.V2VhdGhlclBvcnRsZXRXaW5kb3c=']/div/table/tbody/tr[1]/td[2]/div/div/div[2]/span[1]/a");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.type("newzip", "41001");
+ selenium.click("submit");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"));
+
+ // rename portal
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selectIfNotSelected(SELECT_PAGE,pageName);
+
+ selenium.type("renameForm:newName", pageNameNew);
+ selenium.click("renameForm:rename-button");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ // check the portlet again
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=" + pageNameNew);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"), "Previously selected portlet settings were changes after renaming of portal page.");
+
}
-
- //TODO write an extension for checking of ordering of elements
+
+ // TODO write an extension for checking of ordering of elements
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testReorder() {
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-26 13:04:02 UTC (rev 11992)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-26 13:28:52 UTC (rev 11993)
@@ -66,6 +66,18 @@
protected int countTableRows(String tableLocation){
return Integer.valueOf(selenium.getEval("selenium.countTableRows(\"" + tableLocation + "\")"));
}
+
+ protected void clickAndWait(String locator){
+ selenium.click(locator);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+
+ protected void selectIfNotSelected(String selector, String label) {
+ if (!selenium.getSelectedLabel(selector).equals(label)) {
+ selenium.select(selector, "label=" + label);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+ }
protected void login(String username, String password) {
selenium.setTimeout("0");
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-26 13:04:02 UTC (rev 11992)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-26 13:28:52 UTC (rev 11993)
@@ -33,6 +33,7 @@
private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link";
private static final String ID_LINK_CONSCONF = "producer-temp-form:consumersTab";
private static final String LINK_CONSUMER_HOME ="cons-temp-form1:list-cons-link";
+
private static final String LINK_T_CONS_CON="consumer-list-form:consumersList:{0}:configure";
private static final String LINK_T_CONS_REF="consumer-list-form:consumersList:{0}:refresh";
private static final String LINK_T_CONS_ACT="consumer-list-form:consumersList:{0}:activate";
@@ -246,8 +247,7 @@
public void testConfigureConsumer() {
final String name = "renameMe";
final String nameNew = "renameNewMe";
-
- createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
+
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -263,6 +263,7 @@
Assert.assertTrue(r<0, "Not created consumer already in table");
+ // create consumer to be renamed
createConsumer(name, "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
clickIfVisible(ID_LINK_CONSCONF);
@@ -271,11 +272,14 @@
r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
Assert.assertTrue(r>0, "Created consumer not found in table");
- selenium.click(MessageFormat.format(LINK_T_CONS_CON,r));
+ // rename the consumer
+ selenium.click(MessageFormat.format(LINK_T_CONS_CON,r-1));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type("edit-cons-form:id", nameNew);
selenium.click("edit-cons-form:refresh-cons-link");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
17 years, 7 months
JBoss Portal SVN: r11992 - branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-26 09:04:02 -0400 (Fri, 26 Sep 2008)
New Revision: 11992
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
Log:
- make search users show sorted results
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 12:26:45 UTC (rev 11991)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-09-26 13:04:02 UTC (rev 11992)
@@ -30,6 +30,8 @@
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+import java.util.Collections;
+import java.util.Comparator;
import javax.faces.context.FacesContext;
@@ -160,6 +162,7 @@
User u = (User) i.next();
list.add(new IdentityUIUser(u.getUserName()));
}
+ Collections.sort(list, new IdentityUIUserComparator());
return list;
}
@@ -283,4 +286,25 @@
return null;
}
+
+ protected class IdentityUIUserComparator implements Comparator
+ {
+
+
+ public int compare(Object o1, Object o2)
+ {
+ try
+ {
+ IdentityUIUser u1 = (IdentityUIUser)o1;
+ IdentityUIUser u2 = (IdentityUIUser)o2;
+
+ return u1.getUsername().compareToIgnoreCase(u2.getUsername());
+ }
+ catch(Throwable e)
+ {
+ //none
+ }
+ return 0;
+ }
+ }
}
17 years, 7 months
JBoss Portal SVN: r11991 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-26 08:26:45 -0400 (Fri, 26 Sep 2008)
New Revision: 11991
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
Log:
- fix configuration for LDAP empty roles
- fix findUsersFilteredByUserName returning set of SearchResult object
- push minor search roles improvements
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2008-09-26 12:26:45 UTC (rev 11991)
@@ -220,6 +220,9 @@
controls.setReturningObjFlag(true);
controls.setTimeLimit(getSearchTimeLimit());
+ String[] retAttr = {getRidAttributeID(), getDisplayNameAttributeID()};
+ controls.setReturningAttributes(retAttr);
+
//
filter = filter.replaceAll("\\\\", "\\\\\\\\");
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-09-26 12:26:45 UTC (rev 11991)
@@ -181,7 +181,7 @@
return new HashSet();
}
- return Tools.toSet(uf.subList(offset, size).iterator());
+ return processUsers(uf.subList(offset, size));
}
catch (NoSuchElementException e)
{
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2008-09-26 12:26:45 UTC (rev 11991)
@@ -428,7 +428,7 @@
//can't remove the last member (if the attribute is required by schema)
//TODO: workaround this somehow.... (adding goofy user or admin instead?)
- if (attr.size() != 1)
+ if (!(attr.size() == 1 && isMembershipAttributeRequired()))
{
//remove user name from the member list
attr.remove(memberName);
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-09-26 12:26:45 UTC (rev 11991)
@@ -336,7 +336,7 @@
return new HashSet();
}
- return Tools.toSet(uf.subList(offset, size).iterator());
+ return processUsers(uf.subList(offset, size));
}
catch (NoSuchElementException e)
{
17 years, 7 months
JBoss Portal SVN: r11990 - in branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium: portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-09-26 07:51:14 -0400 (Fri, 26 Sep 2008)
New Revision: 11990
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
Log:
failed test fixes
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-25 20:46:09 UTC (rev 11989)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-26 11:51:14 UTC (rev 11990)
@@ -1,17 +1,17 @@
package org.jboss.portal.test.selenium;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.testng.Assert;
-
-import com.sun.java_cup.internal.internal_error;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@Test(groups = { "cms_dashboard" }, enabled = true, description = "Dashboard issues test case.")
public class DashboardTestCase extends JBossPortalSeleniumTestCase {
+ private static final String SUBMIT_ADDCENTER = "layoutForm:a_center";
+ private static final String SUBMIT_ADDLEFT = "layoutForm:a_left";
private static final String LINK_CONFIGURE_DASHBOARD = "link=Configure dashboard";
private static final String LINK_DASHBOARD = "link=Dashboard";
private static final String SELECT_PAGE = "page-selector-form:pageNameSelector";
@@ -87,9 +87,10 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"DashTestPage","Default layout is not called \"default\".");
selectIfNotSelected("DashTestPage");
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"default","Default layout is not called \"default\".");
-
+
selenium.select(SELECT_LAYOUT, "label=generic");
selenium.click(SUBMIT_LAYOUTSEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -116,17 +117,43 @@
selectIfNotSelected("DashTestPage");
selenium.click("link=Who's online portlet");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("layoutForm:a_center");
+ selenium.click(SUBMIT_ADDCENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
+
Assert.assertTrue(selenium.isTextPresent("Current users"));
Assert.assertTrue(selenium.isTextPresent("Whose 1 is logged-in:"));
Assert.assertTrue(selenium.isTextPresent("[admin]"));
}
+
+ @Test(enabled = true, dependsOnMethods = { "testAddPortlet" })
+ public void testDeletePortlet() {
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selectIfNotSelected("DashTestPage");
+
+ selenium.addSelection("layoutForm:selectMany_center", "label=CurrentUsersPortletWindow");
+ selenium.click("layoutForm:l_center");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=DashTestPage");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertFalse(selenium.isTextPresent("Current users"));
+ Assert.assertFalse(selenium.isTextPresent("Whose 1 is logged-in:"));
+ Assert.assertFalse(selenium.isTextPresent("[admin]"));
+ }
+
+
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testAddGooglePortlet() {
selenium.click(LINK_DASHBOARD);
@@ -138,7 +165,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Hindu God of the Week");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("layoutForm:a_center");
+ selenium.click(SUBMIT_ADDCENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -148,6 +175,52 @@
Assert.assertTrue(selenium.isTextPresent("Hindu God of the Week"));
}
+ // http://www.jboss.com/index.html?module=bb&op=viewtopic&t=143023
+ @Test(enabled = false)
+ public void testBugResetPortletSetting()
+ {
+ final String pageName = "page1";
+
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.type(INPUT_PAGENAME, pageName);
+ selenium.click(SUBMIT_CREATEPAGE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isElementPresent("link="+pageName));
+ selenium.click("link="+pageName);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
+
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selectIfNotSelected(pageName);
+ selenium.click("Link=Weather Portlet");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(SUBMIT_ADDLEFT);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link="+pageName);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Miami, FL, US"));
+
+
+ }
+
+ //TODO write an extension for checking of ordering of elements
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testReorder() {
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-09-25 20:46:09 UTC (rev 11989)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-09-26 11:51:14 UTC (rev 11990)
@@ -132,7 +132,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
- final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+ final String CHECK_ROLE = MessageFormat.format(ID_CHECK_ROLE, role);
selenium.click(CHECK_ROLE);
selenium.click(ID_SUBMIT_ASSIGN_ROLE);
@@ -155,7 +155,7 @@
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
// check the tempRole check box
- final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+ final String CHECK_ROLE = MessageFormat.format(ID_CHECK_ROLE, role);
selenium.click(CHECK_ROLE);
selenium.click(ID_SUBMIT_ASSIGN_ROLE);
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-25 20:46:09 UTC (rev 11989)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-26 11:51:14 UTC (rev 11990)
@@ -38,11 +38,12 @@
if (selenium.isElementPresent(id)){
selenium.click(id);
-
+
selenium.waitForPageToLoad(PAGE_LOAD);
}
}
+ @Deprecated
protected boolean findLink(String id) {
for (String link : selenium.getAllLinks()) {
if (link.equals(id)) {
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java 2008-09-25 20:46:09 UTC (rev 11989)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java 2008-09-26 11:51:14 UTC (rev 11990)
@@ -1,15 +1,13 @@
package org.jboss.portal.test.selenium;
-import java.util.Date;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Vector;
import org.testng.Assert;
import org.testng.annotations.Test;
-
-import com.sun.org.apache.xerces.internal.impl.dtd.models.DFAContentModel;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-25 20:46:09 UTC (rev 11989)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-26 11:51:14 UTC (rev 11990)
@@ -2,12 +2,10 @@
import java.text.MessageFormat;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.testng.Assert;
-
-import com.sun.java_cup.internal.internal_error;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@@ -17,16 +15,7 @@
private static final String SUBMIT_REFRESH_CANCEL = "edit-cons-form:list-cons-link_1";
private static final String SUBMIT_PROD_SAVE = "producer-form:save-producer";
private static final String SUBMIT_CONSDEL_CONF = "confirm-delete-form:destroy-link";
- // private static final String ID_LINK_PRODCONF =
- // "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
- // ;
- // private static final String ID_LINK_CONSCONF =
- // "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
- // ;
-
-
- // TODO shouldn't be same as REFRESH?
private static final String SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link";
private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link";
@@ -51,9 +40,8 @@
private static final String LINK_T_CONS_REG="consumer-list-form:consumersList:{0}:register";
private static final String LINK_T_CONS_DER="consumer-list-form:consumersList:{0}:register";
private static final String LINK_T_CONS_DEL="consumer-list-form:consumersList:{0}:delete";
-
-
-// public static String WSRP_CONSUMER_TABLE = "//form[@id='_id18jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj']/table";
+
+
public static String WSRP_CONSUMER_TABLE = "consumer-list-form:consumersList";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -198,7 +186,6 @@
public void testBeaConsumerDelete() {
createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
- //selenium.setSpeed("2000");
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -254,7 +241,51 @@
Assert.assertEquals("tetsPropHint", selenium.getValue(INPUT_PROPHINT));
}
+
+ @Test(enabled = true, description = "Renaming a consumer through the configure button.")
+ public void testConfigureConsumer() {
+ final String name = "renameMe";
+ final String nameNew = "renameNewMe";
+
+ createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=Admin");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=WSRP");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+
+ int r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+
+ Assert.assertTrue(r<0, "Not created consumer already in table");
+
+ createConsumer(name, "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
+
+ clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+ r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+ Assert.assertTrue(r>0, "Created consumer not found in table");
+
+ selenium.click(MessageFormat.format(LINK_T_CONS_CON,r));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type("edit-cons-form:id", nameNew);
+ selenium.click("edit-cons-form:refresh-cons-link");
+ clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+ r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+ Assert.assertTrue(r<0, "Renamed consumer still in table");
+
+ r = findTableRow(WSRP_CONSUMER_TABLE, nameNew, 0);
+ Assert.assertTrue(r>0, "Renamed consumer not found in table");
+ }
+
private void createConsumer(String name, String timeout, String address) {
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -267,7 +298,6 @@
selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INPUT_CACHEEXP, timeout);
- // selenium.click("link=14. Web Services for Remote Portlets (WSRP)");
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-25 20:46:09 UTC (rev 11989)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-26 11:51:14 UTC (rev 11990)
@@ -16,7 +16,7 @@
private static final String SUBMIT_RENAME_PORTAL = "renameForm:rename";
private static final String INPUT_RENAME_PORTAL = "renameForm:newName";
- private static final String SUBMIT_DELETE_PORTAL_CONF = "_id29jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:confirm-form:delete";
+ private static final String SUBMIT_DELETE_PORTAL_CONF = "delete-view:confirm-form:delete";
private static final String INPUT_SUBMIT_PAGECREATE = "create-page-form:create-page";
private static final String INPUT_PAGENAME = "create-page-form:pageName";
private static final String INPUT_PORTALNAME = "create-portal-form:name";
@@ -25,7 +25,7 @@
private final String TAB_PORTALOBJ_ID = "//div[@id='current']/a";
private final String LINK_PORTALS_ID = "link=*Portal Objects*";
- private final String LINK_PORTAL_HOME = "_id8jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id11jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
+ private final String LINK_PORTAL_HOME = "obj-temp-form:object-link-0";
private final String TABLE_PORTAL_ADMIN = "obj-nav-form:portal-datatable";
private final String POR_TL_MAIN = "obj-nav-form:portal-datatable:{0}:object-iid-link";
@@ -62,6 +62,7 @@
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
+
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
17 years, 7 months
JBoss Portal SVN: r11989 - branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-25 16:46:09 -0400 (Thu, 25 Sep 2008)
New Revision: 11989
Modified:
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
Log:
[JBPORTAL-2104] adding id to widget selection components
Modified: branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2008-09-25 20:18:09 UTC (rev 11988)
+++ branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2008-09-25 20:46:09 UTC (rev 11989)
@@ -84,10 +84,10 @@
}
%>
<div id="<p:namespace/>selection">
- <input type="RADIO" name="gg_pick_method" value="directory" <%= !uriPickMethod ? "CHECKED" : "" %>
+ <input id="radio1" type="RADIO" name="gg_pick_method" value="directory" <%= !uriPickMethod ? "CHECKED" : "" %>
onclick="document.getElementById('<p:namespace/>directory_search_div').style.display = 'block'; document.getElementById('<p:namespace/>gadget_url_div').style.display = 'none'; ">
Gadget Directory
- <input type="RADIO" name="gg_pick_method" value="uri" <%= uriPickMethod ? "CHECKED" : "" %>
+ <input id="raido2" type="RADIO" name="gg_pick_method" value="uri" <%= uriPickMethod ? "CHECKED" : "" %>
onclick="document.getElementById('<p:namespace/>directory_search_div').style.display = 'none'; document.getElementById('<p:namespace/>gadget_url_div').style.display = 'block'; ">
Gadget URI
<br>
@@ -100,7 +100,7 @@
contentURL.setParameter("content.action.select", "content.action.select");
contentURL.setParameter("gg_pick_method", "uri");
%>
- <form action="<%= contentURL %>" method="post">
+ <form id="widget-form" action="<%= contentURL %>" method="post">
<%
if (uri != null && selWidget instanceof WidgetFailure)
@@ -124,16 +124,16 @@
}
%>
- <input type="text" name="content.uri" value="<%= uri != null ? uri : "" %>" class="portlet-form-field"/>
- <input type="submit" value="Select Gadget" class="portlet-form-button"/>
+ <input id="text-input" type="text" name="content.uri" value="<%= uri != null ? uri : "" %>" class="portlet-form-field"/>
+ <input id="submit" type="submit" value="Select Gadget" class="portlet-form-button"/>
</form>
</div>
<div id="<p:namespace/>directory_search_div" style="display: <%= !uriPickMethod ? "block" : "none" %>;">
- <form action="<p:renderURL></p:renderURL>" method="post">
- <input type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/>
- <select name="cat" class="portlet-form-field">
+ <form id="widget-form1" action="<p:renderURL></p:renderURL>" method="post">
+ <input id="query-input" type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/>
+ <select id="select-combo" name="cat" class="portlet-form-field">
<%
// Category dropdown
for (Iterator i = provider.getCategories().iterator(); i.hasNext();)
@@ -147,7 +147,7 @@
}
%>
</select>
- <select name="numberOfResults" class="portlet-form-field">
+ <select id="num-res-combo" name="numberOfResults" class="portlet-form-field">
<%
// Number of results dropdown
for(int i = 5; i <= 25; i = i + 5)
@@ -158,7 +158,7 @@
%>
</select>
<br/>
- <input type="submit" value="Search Gadgets" class="portlet-form-button"/>
+ <input id="submit-button" type="submit" value="Search Gadgets" class="portlet-form-button"/>
<%
if (uri != null && selWidget instanceof WidgetFailure)
{
17 years, 7 months
JBoss Portal SVN: r11988 - branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-25 16:18:09 -0400 (Thu, 25 Sep 2008)
New Revision: 11988
Modified:
branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
Log:
[JBPORTAL-2104] adding id to widget selection components
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2008-09-25 19:54:26 UTC (rev 11987)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2008-09-25 20:18:09 UTC (rev 11988)
@@ -84,10 +84,10 @@
}
%>
<div id="<p:namespace/>selection">
- <input type="RADIO" name="gg_pick_method" value="directory" <%= !uriPickMethod ? "CHECKED" : "" %>
+ <input id="radio1" type="RADIO" name="gg_pick_method" value="directory" <%= !uriPickMethod ? "CHECKED" : "" %>
onclick="document.getElementById('<p:namespace/>directory_search_div').style.display = 'block'; document.getElementById('<p:namespace/>gadget_url_div').style.display = 'none'; ">
Gadget Directory
- <input type="RADIO" name="gg_pick_method" value="uri" <%= uriPickMethod ? "CHECKED" : "" %>
+ <input id="raido2" type="RADIO" name="gg_pick_method" value="uri" <%= uriPickMethod ? "CHECKED" : "" %>
onclick="document.getElementById('<p:namespace/>directory_search_div').style.display = 'none'; document.getElementById('<p:namespace/>gadget_url_div').style.display = 'block'; ">
Gadget URI
<br>
@@ -100,7 +100,7 @@
contentURL.setParameter("content.action.select", "content.action.select");
contentURL.setParameter("gg_pick_method", "uri");
%>
- <form action="<%= contentURL %>" method="post">
+ <form id="widget-form" action="<%= contentURL %>" method="post">
<%
if (uri != null && selWidget instanceof WidgetFailure)
@@ -124,16 +124,16 @@
}
%>
- <input type="text" name="content.uri" value="<%= uri != null ? uri : "" %>" class="portlet-form-field"/>
- <input type="submit" value="Select Gadget" class="portlet-form-button"/>
+ <input id="text-input" type="text" name="content.uri" value="<%= uri != null ? uri : "" %>" class="portlet-form-field"/>
+ <input id="submit" type="submit" value="Select Gadget" class="portlet-form-button"/>
</form>
</div>
<div id="<p:namespace/>directory_search_div" style="display: <%= !uriPickMethod ? "block" : "none" %>;">
- <form action="<p:renderURL></p:renderURL>" method="post">
- <input type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/>
- <select name="cat" class="portlet-form-field">
+ <form id="widget-form1" action="<p:renderURL></p:renderURL>" method="post">
+ <input id="query-input" type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/>
+ <select id="select-combo" name="cat" class="portlet-form-field">
<%
// Category dropdown
for (Iterator i = provider.getCategories().iterator(); i.hasNext();)
@@ -147,7 +147,7 @@
}
%>
</select>
- <select name="numberOfResults" class="portlet-form-field">
+ <select id="num-res-combo" name="numberOfResults" class="portlet-form-field">
<%
// Number of results dropdown
for(int i = 5; i <= 25; i = i + 5)
@@ -158,7 +158,7 @@
%>
</select>
<br/>
- <input type="submit" value="Search Gadgets" class="portlet-form-button"/>
+ <input id="submit-button" type="submit" value="Search Gadgets" class="portlet-form-button"/>
<%
if (uri != null && selWidget instanceof WidgetFailure)
{
17 years, 7 months