JBoss Portal SVN: r12111 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-21 06:10:44 -0400 (Tue, 21 Oct 2008)
New Revision: 12111
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
Log:
Don't use MaterializedBlob
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 2008-10-21 10:07:37 UTC (rev 12110)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 2008-10-21 10:10:44 UTC (rev 12111)
@@ -60,7 +60,7 @@
<property
name="data"
column="NODE_DATA"
- type="org.jboss.portal.cms.hibernate.MaterializedBlobType"
+ type="binary"
length="100000000"
not-null="true"/>
</class>
@@ -79,7 +79,7 @@
<property
name="data"
column="PROP_DATA"
- type="org.jboss.portal.cms.hibernate.MaterializedBlobType"
+ type="binary"
length="100000000"
not-null="true"/>
</class>
@@ -98,7 +98,7 @@
<property
name="data"
column="REFS_DATA"
- type="org.jboss.portal.cms.hibernate.MaterializedBlobType"
+ type="binary"
length="100000000"
not-null="true"/>
</class>
@@ -136,7 +136,7 @@
<property
name="data"
column="NODE_DATA"
- type="org.jboss.portal.cms.hibernate.MaterializedBlobType"
+ type="binary"
length="100000000"
not-null="true"/>
</class>
@@ -155,7 +155,7 @@
<property
name="data"
column="PROP_DATA"
- type="org.jboss.portal.cms.hibernate.MaterializedBlobType"
+ type="binary"
length="100000000"
not-null="true"/>
</class>
@@ -174,7 +174,7 @@
<property
name="data"
column="REFS_DATA"
- type="org.jboss.portal.cms.hibernate.MaterializedBlobType"
+ type="binary"
length="100000000"
not-null="true"/>
</class>
17 years, 6 months
JBoss Portal SVN: r12110 - modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-21 06:07:37 -0400 (Tue, 21 Oct 2008)
New Revision: 12110
Removed:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/MaterializedBlobType.java
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java
Log:
Rollbacking 11596 for PostreSQL support
Should fix JBPORTAL-2203
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java 2008-10-21 09:41:13 UTC (rev 12109)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java 2008-10-21 10:07:37 UTC (rev 12110)
@@ -142,18 +142,18 @@
selectFileExistStmt = "select 1 from "
+ schemaObjectPrefix + " where FSENTRY_PATH = ? "
- + "and FSENTRY_NAME = ?";
+ + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
- selectFolderExistStmt = "select data from "
+ selectFolderExistStmt = "select 1 from "
+ schemaObjectPrefix + " where FSENTRY_PATH = ? "
- + "and FSENTRY_NAME = ?";
+ + "and FSENTRY_NAME = ? and FSENTRY_DATA is null";
selectChildCountStmt = "select count(FSENTRY_NAME) from "
+ schemaObjectPrefix + " where FSENTRY_PATH = ?";
selectDataStmt = "select data from "
+ schemaObjectPrefix + " where FSENTRY_PATH = ? "
- + "and FSENTRY_NAME = ? ";
+ + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
selectLastModifiedStmt = "select FSENTRY_LASTMOD from "
+ schemaObjectPrefix + " where FSENTRY_PATH = ? "
@@ -161,7 +161,7 @@
selectLengthStmt = "select FSENTRY_LENGTH from "
+ schemaObjectPrefix + " where FSENTRY_PATH = ? "
- + "and FSENTRY_NAME = ?";
+ + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
initialized = true;
}
@@ -221,27 +221,27 @@
try
{
- String query = "from " + schemaObjectPrefix + " where FSENTRY_PATH = ? and FSENTRY_NAME = ?";
+ String query = "from " + schemaObjectPrefix + " where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
List result = session.createQuery(query)
.setString(0, parentDir)
.setString(1, name)
.list();
-
- boolean deleted = false;
+ if (result.size() == 0)
+ {
+ throw new FileSystemException("no such file: " + filePath);
+ }
+
if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
{
Iterator iter = result.iterator();
while (iter.hasNext())
{
VersionEntry versionEntry = (VersionEntry)iter.next();
- if (versionEntry.getData() != null)
- {
- session.delete(versionEntry);
- deleted = true;
- }
+ session.delete(versionEntry);
}
+
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
{
@@ -249,12 +249,9 @@
while (iter.hasNext())
{
CMSEntry cmsEntry = (CMSEntry)iter.next();
- if (cmsEntry.getData() != null)
- {
- session.delete(cmsEntry);
- deleted = true;
- }
+ session.delete(cmsEntry);
}
+
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
{
@@ -262,19 +259,10 @@
while (iter.hasNext())
{
RepositoryEntry repoEntry = (RepositoryEntry)iter.next();
- if (repoEntry.getData() != null)
- {
- session.delete(repoEntry);
- deleted = true;
- }
+ session.delete(repoEntry);
}
- }
- if (!deleted)
- {
- throw new FileSystemException("no such file: " + filePath);
}
-
tx.commit();
}
catch (Exception e)
@@ -329,7 +317,7 @@
{
String query = "from " + schemaObjectPrefix + " where FSENTRY_PATH = ? and FSENTRY_NAME = ? " +
- "or (FSENTRY_PATH = ?) or (FSENTRY_PATH like ?)";
+ "and FSENTRY_DATA is null or (FSENTRY_PATH = ?) or (FSENTRY_PATH like ?)";
List result = session.createQuery(query)
.setString(0, parentDir)
@@ -338,20 +326,21 @@
.setString(3, folderPath + FileSystem.SEPARATOR + "%")
.list();
- boolean deleted = false;
-
+ if (result.size() == 0)
+ {
+ throw new FileSystemException("no such folder: " + folderPath);
+ }
+
if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
{
Iterator iter = result.iterator();
while (iter.hasNext())
{
VersionEntry versionEntry = (VersionEntry)iter.next();
- if (versionEntry.getData() == null)
- {
- session.delete(versionEntry);
- deleted = true;
- }
+ session.delete(versionEntry);
+
}
+
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
{
@@ -359,12 +348,10 @@
while (iter.hasNext())
{
CMSEntry cmsEntry = (CMSEntry)iter.next();
- if (cmsEntry.getData() == null)
- {
- session.delete(cmsEntry);
- deleted = true;
- }
+ session.delete(cmsEntry);
+
}
+
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
{
@@ -372,19 +359,11 @@
while (iter.hasNext())
{
RepositoryEntry repoEntry = (RepositoryEntry)iter.next();
- if (repoEntry.getData() == null)
- {
- session.delete(repoEntry);
- deleted = true;
- }
+ session.delete(repoEntry);
+
}
- }
- if (!deleted)
- {
- throw new FileSystemException("no such folder: " + folderPath);
}
-
tx.commit();
}
catch (Exception e)
@@ -470,11 +449,7 @@
Iterator iter = rs.iterator();
if (iter.hasNext())
{
- Object object = iter.next();
- if (object != null)
- {
- return true;
- }
+ return true;
}
return false;
}
@@ -517,11 +492,7 @@
Iterator iter = rs.iterator();
if (iter.hasNext())
{
- Object object = iter.next();
- if (object == null)
- {
- return true;
- }
+ return true;
}
return false;
}
@@ -989,11 +960,11 @@
in = IOTools.safeBufferedWrapper(new FileInputStream(f));
if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
{
- Query query = session.createQuery("from VersionEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ?");
+ Query query = session.createQuery("from VersionEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
query.setString(0, parentDir);
query.setString(1, name);
VersionEntry versionEntry = (VersionEntry)query.uniqueResult();
- if (versionEntry == null || versionEntry.getData() == null)
+ if (versionEntry == null)
{
throw new Exception("No such Entry " + name);
}
@@ -1006,11 +977,11 @@
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
{
- Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ?");
+ Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
query.setString(0, parentDir);
query.setString(1, name);
CMSEntry cmsEntry = (CMSEntry)query.uniqueResult();
- if (cmsEntry == null || cmsEntry.getData() == null)
+ if (cmsEntry == null)
{
throw new Exception("No such Entry " + name);
}
@@ -1023,11 +994,11 @@
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
{
- Query query = session.createQuery("from RepositoryEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ?");
+ Query query = session.createQuery("from RepositoryEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
query.setString(0, parentDir);
query.setString(1, name);
RepositoryEntry repoEntry = (RepositoryEntry)query.uniqueResult();
- if (repoEntry == null || repoEntry.getData() == null)
+ if (repoEntry == null)
{
throw new Exception("No such Entry " + name);
}
@@ -1198,11 +1169,11 @@
in = IOTools.safeBufferedWrapper(new FileInputStream(f));
if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
{
- Query query = session.createQuery("from VersionEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ?");
+ Query query = session.createQuery("from VersionEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
query.setString(0, parentDir);
query.setString(1, name);
VersionEntry versionEntry = (VersionEntry)query.uniqueResult();
- if (versionEntry == null || versionEntry.getData() == null)
+ if (versionEntry == null)
{
throw new Exception("No such Entry " + name);
}
@@ -1215,11 +1186,11 @@
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
{
- Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ?");
+ Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
query.setString(0, parentDir);
query.setString(1, name);
CMSEntry cmsEntry = (CMSEntry)query.uniqueResult();
- if (cmsEntry == null || cmsEntry.getData() == null)
+ if (cmsEntry == null)
{
throw new Exception("No such Entry " + name);
}
@@ -1232,11 +1203,11 @@
}
else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
{
- Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ?");
+ Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
query.setString(0, parentDir);
query.setString(1, name);
RepositoryEntry repoEntry = (RepositoryEntry)query.uniqueResult();
- if (repoEntry == null || repoEntry.getData() == null)
+ if (repoEntry == null)
{
throw new Exception("No such Entry " + name);
}
Deleted: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/MaterializedBlobType.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/MaterializedBlobType.java 2008-10-21 09:41:13 UTC (rev 12109)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/MaterializedBlobType.java 2008-10-21 10:07:37 UTC (rev 12110)
@@ -1,59 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, 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. *
- ******************************************************************************/
-package org.jboss.portal.cms.hibernate;
-
-import java.sql.Types;
-
-import org.hibernate.type.AbstractBynaryType;
-
-/**
- * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
- * @version $Revision$
- */
-public class MaterializedBlobType extends AbstractBynaryType
-{
- public int sqlType()
- {
- return Types.BLOB;
- }
-
- public String getName()
- {
- return "materialized-blob";
- }
-
- public Class getReturnedClass()
- {
- return byte[].class;
- }
-
- protected Object toExternalFormat(byte[] bytes)
- {
- return bytes;
- }
-
- protected byte[] toInternalFormat(Object bytes)
- {
- return (byte[]) bytes;
- }
-}
17 years, 6 months
JBoss Portal SVN: r12109 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-21 05:41:13 -0400 (Tue, 21 Oct 2008)
New Revision: 12109
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml
Log:
enabling disabled tests
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-20 22:21:30 UTC (rev 12108)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-21 09:41:13 UTC (rev 12109)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="SeleniumTest">
-<!--
+
<test verbose="2" name="org.jboss.portal.test.selenium.UserLoginTestCase" annotations="JDK">
<classes>
<class name="org.jboss.portal.test.selenium.UserLoginTestCase"/>
@@ -21,7 +21,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.PortletUserCreationTestCase"></class></classes>
</test>
--->
+
<test name="org.jboss.portal.test.selenium.WSRPTestCase"
verbose="2" annotations="JDK">
<classes>
@@ -33,7 +33,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.UserInterceptorPortletTestCase"></class></classes>
</test>
-<!--
+
<test name="org.jboss.portal.test.selenium.cms.CMSFileTestCase"
verbose="2" annotations="JDK">
<classes>
@@ -63,7 +63,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"></class></classes>
</test>
--->
+
<test name="org.jboss.portal.test.selenium.DashboardTestCase"
verbose="2" annotations="JDK">
<classes>
17 years, 6 months
JBoss Portal SVN: r12108 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 18:21:30 -0400 (Mon, 20 Oct 2008)
New Revision: 12108
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
Log:
Using fixed versions
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-10-20 21:48:20 UTC (rev 12107)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-10-20 22:21:30 UTC (rev 12108)
@@ -47,11 +47,11 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.1-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.3"/>
<componentref name="jboss-portal/modules/web" version="1.1.0"/>
- <componentref name="jboss-portal/modules/test" version="1.0.1.SP1"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.1.SP2"/>
<componentref name="jboss-portal/modules/portlet" version="1.0.3"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.4"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0.5"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.1.1"/>
17 years, 6 months
JBoss Portal SVN: r12107 - 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-10-20 17:48:20 -0400 (Mon, 20 Oct 2008)
New Revision: 12107
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
Log:
longer timeout 1
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-10-20 21:17:47 UTC (rev 12106)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 21:48:20 UTC (rev 12107)
@@ -305,7 +305,7 @@
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE);
+
waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE, 0));
selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE, 0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
17 years, 6 months
JBoss Portal SVN: r12106 - 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-10-20 17:17:47 -0400 (Mon, 20 Oct 2008)
New Revision: 12106
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/WSRPTestCase.java
Log:
longer timeout
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-10-20 20:22:35 UTC (rev 12105)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 21:17:47 UTC (rev 12106)
@@ -21,7 +21,7 @@
protected Selenium selenium;
// Generic timeout in miliseconds
- protected static final String PAGE_LOAD = "450000";
+ protected static final String PAGE_LOAD = "900000";
// Element timeout in seconds
protected static final int ELEM_TIMEOUT = 60;
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-10-20 20:22:35 UTC (rev 12105)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 21:17:47 UTC (rev 12106)
@@ -305,6 +305,7 @@
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
+ waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE);
waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE, 0));
selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE, 0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
17 years, 6 months
JBoss Portal SVN: r12105 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-20 16:22:35 -0400 (Mon, 20 Oct 2008)
New Revision: 12105
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
no debug messages
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 19:40:01 UTC (rev 12104)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 20:22:35 UTC (rev 12105)
@@ -55,10 +55,6 @@
public void testAddName() {
clickAndWait(LINK_COUNTPORT);
- waitForElement(SELECT_LANGUAGE);
- for(String opt : selenium.getSelectOptions(SELECT_LANGUAGE))
- System.out.println(opt);
-
safeSelect(SELECT_LANGUAGE, "Czech");
final String name = "Administracny";
selenium.type(INPUT_NAME, name);
17 years, 6 months
JBoss Portal SVN: r12104 - in branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-20 15:40:01 -0400 (Mon, 20 Oct 2008)
New Revision: 12104
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/portal/PortletInstancesTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml
Log:
bugger elem timeout
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-10-20 18:22:26 UTC (rev 12103)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 19:40:01 UTC (rev 12104)
@@ -24,7 +24,7 @@
protected static final String PAGE_LOAD = "450000";
// Element timeout in seconds
- protected static final int ELEM_TIMEOUT = 30;
+ protected static final int ELEM_TIMEOUT = 60;
@BeforeClass
public void setupChromeForLogin() throws Exception {
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 18:22:26 UTC (rev 12103)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 19:40:01 UTC (rev 12104)
@@ -54,6 +54,11 @@
@Test(enabled = true)
public void testAddName() {
clickAndWait(LINK_COUNTPORT);
+
+ waitForElement(SELECT_LANGUAGE);
+ for(String opt : selenium.getSelectOptions(SELECT_LANGUAGE))
+ System.out.println(opt);
+
safeSelect(SELECT_LANGUAGE, "Czech");
final String name = "Administracny";
selenium.type(INPUT_NAME, name);
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-20 18:22:26 UTC (rev 12103)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-20 19:40:01 UTC (rev 12104)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="SeleniumTest">
-<!-- -->
+<!--
<test verbose="2" name="org.jboss.portal.test.selenium.UserLoginTestCase" annotations="JDK">
<classes>
<class name="org.jboss.portal.test.selenium.UserLoginTestCase"/>
@@ -21,7 +21,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.PortletUserCreationTestCase"></class></classes>
</test>
-
+-->
<test name="org.jboss.portal.test.selenium.WSRPTestCase"
verbose="2" annotations="JDK">
<classes>
@@ -33,7 +33,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.UserInterceptorPortletTestCase"></class></classes>
</test>
-
+<!--
<test name="org.jboss.portal.test.selenium.cms.CMSFileTestCase"
verbose="2" annotations="JDK">
<classes>
@@ -63,7 +63,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"></class></classes>
</test>
-
+-->
<test name="org.jboss.portal.test.selenium.DashboardTestCase"
verbose="2" annotations="JDK">
<classes>
17 years, 6 months
JBoss Portal SVN: r12103 - 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-10-20 14:22:26 -0400 (Mon, 20 Oct 2008)
New Revision: 12103
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/WSRPTestCase.java
Log:
wsrp logout fix1
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-10-20 16:56:58 UTC (rev 12102)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 18:22:26 UTC (rev 12103)
@@ -6,6 +6,7 @@
import com.thoughtworks.selenium.DefaultSelenium;
import com.thoughtworks.selenium.Selenium;
+
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@@ -18,11 +19,11 @@
public static final String INPUT_PASSWORD = "j_password";
public static final String INPUT_USERNAME = "j_username";
protected Selenium selenium;
-
- //Generic timeout in miliseconds
+
+ // Generic timeout in miliseconds
protected static final String PAGE_LOAD = "450000";
-
- //Element timeout in seconds
+
+ // Element timeout in seconds
protected static final int ELEM_TIMEOUT = 30;
@BeforeClass
@@ -40,17 +41,17 @@
}
protected void clickIfVisible(String id) {
-
- if (selenium.isElementPresent(id)){
+
+ if (selenium.isElementPresent(id)) {
selenium.click(id);
selenium.waitForPageToLoad(PAGE_LOAD);
}
}
-
+
protected void clickIfVisible(String id, String awaited) {
-
- if (selenium.isElementPresent(id)){
+
+ if (selenium.isElementPresent(id)) {
selenium.click(id);
selenium.waitForPageToLoad(PAGE_LOAD);
}
@@ -69,56 +70,57 @@
return true;
}
}
-
+
return false;
}
protected int findTableRow(String tableLocation, String searchName, int searchCol) {
return Integer.valueOf(selenium.getEval("selenium.findTableRow(\"" + tableLocation + "\",'" + searchName + "'," + searchCol + ")"));
}
-
- protected int countTableRows(String tableLocation){
+
+ protected int countTableRows(String tableLocation) {
return Integer.valueOf(selenium.getEval("selenium.countTableRows(\"" + tableLocation + "\")"));
}
// TODO refactor
- protected void safeSelect(String locator, String value){
+ protected void safeSelect(String locator, String value) {
waitForElement(locator);
-
- for (int second = 0; ; second++) {
- if (second >= ELEM_TIMEOUT) {
- Assert.fail("Element "+locator+" not found.");
- }
- try {
- String [] opts = selenium.getSelectOptions(locator);
- boolean isAvailable = false;
-
- for(String opt : opts){
- if (opt.equals(value)){
- isAvailable = true;
- }
- }
-
- if (isAvailable) break;
- } catch (Exception e) {
- }
- waitFor(1000);
- }
-
- selenium.select(locator, "label="+value);
+
+ for (int second = 0;; second++) {
+ if (second >= ELEM_TIMEOUT) {
+ Assert.fail("Element " + locator + " not found.");
+ }
+ try {
+ String[] opts = selenium.getSelectOptions(locator);
+ boolean isAvailable = false;
+
+ for (String opt : opts) {
+ if (opt.equals(value)) {
+ isAvailable = true;
+ }
+ }
+
+ if (isAvailable)
+ break;
+ } catch (Exception e) {
+ }
+ waitFor(1000);
+ }
+
+ selenium.select(locator, "label=" + value);
}
-
- protected void clickAndWait(String locator){
+
+ protected void clickAndWait(String locator) {
waitForElement(locator);
selenium.click(locator);
selenium.waitForPageToLoad(PAGE_LOAD);
}
-
- protected void openAndWait(String locator){
+
+ protected void openAndWait(String locator) {
selenium.open(locator);
selenium.waitForPageToLoad(PAGE_LOAD);
}
-
+
protected void selectIfNotSelected(String selector, String label) {
waitForElement(selector);
if (!selenium.getSelectedLabel(selector).equals(label)) {
@@ -126,52 +128,51 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
}
-
- protected boolean assertTextOrder(String text){
+
+ protected boolean assertTextOrder(String text) {
return Boolean.valueOf(selenium.getEval("selenium.assertTextOrder(\"" + text + "\")"));
}
- protected void waitFor(long time){
+ protected void waitFor(long time) {
try {
Thread.sleep(time);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- }
+ }
}
-
- public void waitForElement(String locator) {
- for (int second = 0; ; second++) {
- if (second >= ELEM_TIMEOUT) {
- Assert.fail("Element "+locator+" not found.");
- }
- try {
- if (selenium.isElementPresent(locator)) break;
- } catch (Exception e) {
- }
- waitFor(1000);
- }
- }
-
-
+
+ public void waitForElement(String locator) {
+ for (int second = 0;; second++) {
+ if (second >= ELEM_TIMEOUT) {
+ Assert.fail("Element " + locator + " not found.");
+ }
+ try {
+ if (selenium.isElementPresent(locator))
+ break;
+ } catch (Exception e) {
+ }
+ waitFor(1000);
+ }
+ }
+
protected void login(String username, String password) {
selenium.open(ADDR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
selenium.click(LINK_LOGIN);
selenium.selectFrame(FRAME_LOGIN_CONTENT);
-
-
+
waitForElement(INPUT_USERNAME);
waitForElement(INPUT_PASSWORD);
waitForElement(SUBMIT_LOGIN);
-
+
selenium.type(INPUT_USERNAME, username);
selenium.type(INPUT_PASSWORD, password);
Assert.assertTrue(selenium.isElementPresent(SUBMIT_LOGIN));
selenium.click(SUBMIT_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Logged in as: "+username), "Not logged in, login message missing.");
+ Assert.assertTrue(selenium.isTextPresent("Logged in as: " + username), "Not logged in, login message missing.");
}
protected void logout() {
@@ -183,15 +184,15 @@
Assert.assertFalse(selenium.isTextPresent("Logged in as:"), "Not logged in, login message missing.");
Assert.assertTrue(selenium.isElementPresent("Link=Login"), "Login link not present.");
}
-
+
protected void logoutIfPossible() {
selenium.open(ADDR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- if (selenium.isElementPresent(LINK_LOGOUT)){
- selenium.click(LINK_LOGOUT);
- selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent("Logged in as:"), "Not logged in, login message missing.");
- Assert.assertTrue(selenium.isElementPresent("Link=Login"), "Login link not present.");
+ if (selenium.isElementPresent(LINK_LOGOUT)) {
+ selenium.click(LINK_LOGOUT);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertFalse(selenium.isTextPresent("Logged in as:"), "Not logged in, login message missing.");
+ Assert.assertTrue(selenium.isElementPresent("Link=Login"), "Login link not present.");
}
}
}
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-10-20 16:56:58 UTC (rev 12102)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 18:22:26 UTC (rev 12103)
@@ -6,20 +6,20 @@
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>
*/
@Test(groups = { "cms_wsrp" }, enabled = true, description = "WSRP test case.")
public class WSRPTestCase extends JBossPortalSeleniumTestCase {
-
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 SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link";
private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link";
-
+
private static final String INPUT_CONS_REGVALUE = "edit-cons-form:existingProps:{0}:prop-value-input";
private static final String SUBMIT_REFRESHSAVE = "edit-cons-form:refresh-cons-link";
private static final String INPUT_CONSWSDL = "edit-cons-form:wsdl";
@@ -33,16 +33,17 @@
private static final String INPUT_CREATECONS = "createConsumer:consumerName";
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";
- private static final String LINK_T_CONS_DEA="consumer-list-form:consumersList:{0}:activate";
- 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";
+ 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";
+ private static final String LINK_T_CONS_DEA = "consumer-list-form:consumersList:{0}:activate";
+ 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 = "consumer-list-form:consumersList";
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -65,18 +66,18 @@
clickIfVisible(ID_LINK_CONSCONF);
selenium.type(INPUT_CREATECONS, "BEA");
-
+
selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
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("Refresh failed (probably because the registration information was not valid)."));
Assert.assertTrue(selenium.isTextPresent("Missing value"));
- selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE,0), "public");
+ selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE, 0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Refresh was successful."));
@@ -96,8 +97,8 @@
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0)-1 ;
- selenium.click(MessageFormat.format(LINK_T_CONS_REG,r));
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0) - 1;
+ selenium.click(MessageFormat.format(LINK_T_CONS_REG, r));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_REFRESHSAVE);
@@ -106,7 +107,7 @@
selenium.click(LINK_CONSUMER_HOME);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertEquals(selenium.getText(MessageFormat.format(LINK_T_CONS_DER,r)), "Deregister");
+ Assert.assertEquals(selenium.getText(MessageFormat.format(LINK_T_CONS_DER, r)), "Deregister");
}
@Test(enabled = true, dependsOnMethods = { "testCreateBeaConsumer" }, description = "Standard BEA consumer deregistering.")
@@ -121,21 +122,21 @@
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
-
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0) -1;
- selenium.click(MessageFormat.format(LINK_T_CONS_DER,r));
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0) - 1;
+
+ selenium.click(MessageFormat.format(LINK_T_CONS_DER, r));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_REFRESH_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertEquals(selenium.getText(MessageFormat.format(LINK_T_CONS_DER,r)), "Register");
+ Assert.assertEquals(selenium.getText(MessageFormat.format(LINK_T_CONS_DER, r)), "Register");
}
@Test(enabled = true, dependsOnMethods = { "testCreateBeaConsumer", "testBeaConsumerDeactivate" }, description = "Standard BEA consumer activating.")
public void testBeaConsumerActivate() {
selenium.open("/portal/");
-
+
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -143,11 +144,11 @@
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0)-1;
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0) - 1;
Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
- selenium.click(MessageFormat.format(LINK_T_CONS_ACT,r));
+ selenium.click(MessageFormat.format(LINK_T_CONS_ACT, r));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
@@ -166,12 +167,12 @@
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
-
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0)-1;
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0) - 1;
+
Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
- selenium.click(MessageFormat.format(LINK_T_CONS_DEA,r));
+ selenium.click(MessageFormat.format(LINK_T_CONS_DEA, r));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
@@ -196,16 +197,16 @@
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
Assert.assertTrue(selenium.isTextPresent("BEAdel"));
-
- Assert.assertTrue(selenium.isElementPresent(WSRP_CONSUMER_TABLE),"Consumer table not available.");
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0)-1;
- Assert.assertFalse(r < 0,"Consumer BEAdel not found");
- selenium.click(MessageFormat.format(LINK_T_CONS_DEL,r));
+ Assert.assertTrue(selenium.isElementPresent(WSRP_CONSUMER_TABLE), "Consumer table not available.");
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0) - 1;
+ Assert.assertFalse(r < 0, "Consumer BEAdel not found");
+
+ selenium.click(MessageFormat.format(LINK_T_CONS_DEL, r));
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Delete 'BEAdel' consumer?"));
-
+
selenium.click(SUBMIT_CONSDEL_CONF);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -222,16 +223,16 @@
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_PRODCONF);
-
+
selenium.click(SUBMIT_ADDPROP_INIT);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INPUT_PROPNAME, "testProp");
selenium.type(INPUT_PROPLABEL, "testProp label");
selenium.type(INPUT_PROPHINT, "tetsPropHint");
-
+
selenium.click(SUBMIT_PROD_SAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Producer configuration successfully saved!"));
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(ID_LINK_PRODCONF);
@@ -241,7 +242,7 @@
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";
@@ -257,38 +258,37 @@
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");
-
+
+ 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);
clickIfVisible(LINK_CONSUMER_HOME);
-
+
r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
- Assert.assertTrue(r>0, "Created consumer not found in table");
-
+ Assert.assertTrue(r > 0, "Created consumer not found in table");
+
// rename the consumer
- selenium.click(MessageFormat.format(LINK_T_CONS_CON,r-1));
- selenium.waitForPageToLoad(PAGE_LOAD);
-
+ 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);
-
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
-
+
r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
- Assert.assertTrue(r<0, "Renamed consumer still in table");
-
+ 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");
+ 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);
@@ -300,20 +300,16 @@
selenium.type(INPUT_CREATECONS, name);
selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
-
-
selenium.type(INPUT_CACHEEXP, timeout);
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE,0));
- selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE,0), "public");
+ waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE, 0));
+ selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE, 0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
-
-
selenium.click(SUBMIT_REFRESHFINAL);
selenium.waitForPageToLoad(PAGE_LOAD);
}
17 years, 6 months
JBoss Portal SVN: r12102 - 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-10-20 12:56:58 -0400 (Mon, 20 Oct 2008)
New Revision: 12102
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/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
several fixes
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-10-20 15:35:39 UTC (rev 12101)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 16:56:58 UTC (rev 12102)
@@ -80,8 +80,36 @@
protected int countTableRows(String tableLocation){
return Integer.valueOf(selenium.getEval("selenium.countTableRows(\"" + tableLocation + "\")"));
}
+
+ // TODO refactor
+ protected void safeSelect(String locator, String value){
+ waitForElement(locator);
+
+ for (int second = 0; ; second++) {
+ if (second >= ELEM_TIMEOUT) {
+ Assert.fail("Element "+locator+" not found.");
+ }
+ try {
+ String [] opts = selenium.getSelectOptions(locator);
+ boolean isAvailable = false;
+
+ for(String opt : opts){
+ if (opt.equals(value)){
+ isAvailable = true;
+ }
+ }
+
+ if (isAvailable) break;
+ } catch (Exception e) {
+ }
+ waitFor(1000);
+ }
+
+ selenium.select(locator, "label="+value);
+ }
protected void clickAndWait(String locator){
+ waitForElement(locator);
selenium.click(locator);
selenium.waitForPageToLoad(PAGE_LOAD);
}
@@ -92,6 +120,7 @@
}
protected void selectIfNotSelected(String selector, String label) {
+ waitForElement(selector);
if (!selenium.getSelectedLabel(selector).equals(label)) {
selenium.select(selector, "label=" + label);
selenium.waitForPageToLoad(PAGE_LOAD);
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-10-20 15:35:39 UTC (rev 12101)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 16:56:58 UTC (rev 12102)
@@ -196,14 +196,14 @@
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
Assert.assertTrue(selenium.isTextPresent("BEAdel"));
- selenium.captureScreenshot("tabletable");
+
Assert.assertTrue(selenium.isElementPresent(WSRP_CONSUMER_TABLE),"Consumer table not available.");
int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0)-1;
Assert.assertFalse(r < 0,"Consumer BEAdel not found");
selenium.click(MessageFormat.format(LINK_T_CONS_DEL,r));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.captureScreenshot("delete");
+
Assert.assertTrue(selenium.isTextPresent("Delete 'BEAdel' consumer?"));
selenium.click(SUBMIT_CONSDEL_CONF);
@@ -307,6 +307,7 @@
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
+ waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE,0));
selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE,0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-20 15:35:39 UTC (rev 12101)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-20 16:56:58 UTC (rev 12102)
@@ -133,11 +133,16 @@
@Test(enabled = true)
public void testDashboardTheme() {
- selenium.select(T_DH_SEL_LAYOUT, "label=1column");
- selenium.select(T_DH_SEL_THEME, "label=nphalanx");
- selenium.select(T_DH_SEL_RENDERSET, "label=default");
- selenium.click(T_DH_SUB_UPDATE);
- selenium.waitForPageToLoad(PAGE_LOAD);
+
+ safeSelect(T_DH_SEL_LAYOUT, "1column");
+
+ safeSelect(T_DH_SEL_THEME, "nphalanx");
+
+ safeSelect(T_DH_SEL_RENDERSET, "default");
+
+
+ clickAndWait(T_DH_SUB_UPDATE);
+
}
private void goToDash() {
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 15:35:39 UTC (rev 12101)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 16:56:58 UTC (rev 12102)
@@ -53,19 +53,12 @@
@Test(enabled = true)
public void testAddName() {
- selenium.click(LINK_COUNTPORT);
- selenium.waitForPageToLoad(PAGE_LOAD);
- //selenium.captureScreenshot("m1.jpg");
- selenium.select(SELECT_LANGUAGE, "label=Czech");
- //selenium.captureScreenshot("m2.jpg");
+ clickAndWait(LINK_COUNTPORT);
+ safeSelect(SELECT_LANGUAGE, "Czech");
final String name = "Administracny";
selenium.type(INPUT_NAME, name);
- //selenium.captureScreenshot("m3.jpg");
- selenium.click(SUBMIT_MODIFY_NAME);
- selenium.waitForPageToLoad(PAGE_LOAD);
- //selenium.captureScreenshot("m4.jpg");
+ clickAndWait(SUBMIT_MODIFY_NAME);
Assert.assertTrue(findTableRow(TABLE_DISPNAMES, name, 1) >= 0);
- //selenium.captureScreenshot("m5.jpg");
}
@Test(enabled = true)
17 years, 6 months