You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/09 08:47:06 UTC
svn commit: r654694 - in /geronimo/server/trunk/testsuite/console-testsuite:
advanced/src/test/java/org/apache/geronimo/testsuite/console/
basic/src/test/java/org/apache/geronimo/testsuite/console/
Author: jdillon
Date: Thu May 8 23:47:04 2008
New Revision: 654694
URL: http://svn.apache.org/viewvc?rev=654694&view=rev
Log:
Tidy up console-testsuite tests
Added:
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java (with props)
Modified:
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java Thu May 8 23:47:04 2008
@@ -20,55 +20,44 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class ConsoleRealmTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConsoleRealmTest extends TestSupport {
@Test
public void testNewUser() throws Exception {
- try {
- login();
-
- selenium.click("link=Users and Groups");
- waitForPageLoad();
- selenium.click("link=Create New User");
- waitForPageLoad();
- selenium.type("userId", "myuser");
- selenium.type("password", "myuser");
- selenium.type("confirmpassword", "myuser");
- selenium.click("//input[@value='Add']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("myuser"));
- selenium.click("link=Delete");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Confirm Delete user myuser[\\s\\S]$"));
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("myuser"));
- } finally {
- logout();
- }
+ selenium.click("link=Users and Groups");
+ waitForPageLoad();
+ selenium.click("link=Create New User");
+ waitForPageLoad();
+ selenium.type("userId", "myuser");
+ selenium.type("password", "myuser");
+ selenium.type("confirmpassword", "myuser");
+ selenium.click("//input[@value='Add']");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("myuser"));
+ selenium.click("link=Delete");
+ waitForPageLoad();
+ assertTrue(selenium.getConfirmation().matches("^Confirm Delete user myuser[\\s\\S]$"));
+ waitForPageLoad();
+ assertFalse(selenium.isTextPresent("myuser"));
}
@Test
public void testNewGroup() throws Exception {
- try {
- login();
-
- selenium.click("link=Users and Groups");
- waitForPageLoad();
- selenium.click("link=Create New Group");
- waitForPageLoad();
- selenium.type("group", "mygroup");
- selenium.click("//input[@value='Add']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("mygroup"));
- selenium.click("//a[@onclick=\"return confirm('Confirm Delete group mygroup?');\"]");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Confirm Delete group mygroup[\\s\\S]$"));
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("mygroup"));
- } finally {
- logout();
- }
+ selenium.click("link=Users and Groups");
+ waitForPageLoad();
+ selenium.click("link=Create New Group");
+ waitForPageLoad();
+ selenium.type("group", "mygroup");
+ selenium.click("//input[@value='Add']");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("mygroup"));
+ selenium.click("//a[@onclick=\"return confirm('Confirm Delete group mygroup?');\"]");
+ waitForPageLoad();
+ assertTrue(selenium.getConfirmation().matches("^Confirm Delete group mygroup[\\s\\S]$"));
+ waitForPageLoad();
+ assertFalse(selenium.isTextPresent("mygroup"));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java Thu May 8 23:47:04 2008
@@ -20,39 +20,34 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class DBManagerTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class DBManagerTest extends TestSupport {
@Test
public void testNewDB() throws Exception {
- try {
- login();
-
- selenium.click("link=DB Manager");
- waitForPageLoad();
- selenium.type("createDB", "MyUniqueDB");
- selenium.click("action");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("MyUniqueDB"));
- selenium.type("sqlStmts", "create table myTable ( id int primary key );");
- selenium.select("useDB", "label=SystemDatabase");
- selenium.select("useDB", "label=MyUniqueDB");
- selenium.click("//input[@value = 'Run SQL']");
- waitForPageLoad();
- //selenium.click("link=Application");
- selenium.click("//a[contains(@href, 'db=MyUniqueDB')]");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("MYTABLE"));
- selenium.select("deleteDB", "label=SystemDatabase");
- selenium.select("deleteDB", "label=MyUniqueDB");
- selenium.click("//input[@value = 'Delete']");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete this database[\\s\\S]$"));
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("Database deleted: MyUniqueDB"));
- } finally {
- logout();
- }
+ selenium.click("link=DB Manager");
+ waitForPageLoad();
+ selenium.type("createDB", "MyUniqueDB");
+ selenium.click("action");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("MyUniqueDB"));
+ selenium.type("sqlStmts", "create table myTable ( id int primary key );");
+ selenium.select("useDB", "label=SystemDatabase");
+ selenium.select("useDB", "label=MyUniqueDB");
+ selenium.click("//input[@value = 'Run SQL']");
+ waitForPageLoad();
+ //selenium.click("link=Application");
+ selenium.click("//a[contains(@href, 'db=MyUniqueDB')]");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("MYTABLE"));
+ selenium.select("deleteDB", "label=SystemDatabase");
+ selenium.select("deleteDB", "label=MyUniqueDB");
+ selenium.click("//input[@value = 'Delete']");
+ waitForPageLoad();
+ assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete this database[\\s\\S]$"));
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("Database deleted: MyUniqueDB"));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java Thu May 8 23:47:04 2008
@@ -20,66 +20,55 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class DatabasePoolTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class DatabasePoolTest extends TestSupport {
@Test
public void testNewDBPool() throws Exception {
- try {
- login();
-
- String geronimoVersion = System.getProperty("geronimoVersion");
-
- selenium.click("link=Database Pools");
- waitForPageLoad();
- selenium.click("link=Using the Geronimo database pool wizard");
- waitForPageLoad();
- selenium.type("name", "UniquePool");
- selenium.select("dbtype", "label=Derby embedded");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.addSelection("jars", "label=org.apache.geronimo.configs/system-database/" + geronimoVersion + "/car");
- selenium.type("property-DatabaseName", "SystemDatabase");
- selenium.click("//input[@value='Deploy']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("UniquePool"));
- selenium.click("//tr[td[1] = 'UniquePool']/td[4]/a[3]");
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("UniquePool"));
- } finally {
- logout();
- }
+ String geronimoVersion = System.getProperty("geronimoVersion");
+ assertNotNull(geronimoVersion);
+
+ selenium.click("link=Database Pools");
+ waitForPageLoad();
+ selenium.click("link=Using the Geronimo database pool wizard");
+ waitForPageLoad();
+ selenium.type("name", "UniquePool");
+ selenium.select("dbtype", "label=Derby embedded");
+ selenium.click("//input[@value='Next']");
+ waitForPageLoad();
+ selenium.addSelection("jars", "label=org.apache.geronimo.configs/system-database/" + geronimoVersion + "/car");
+ selenium.type("property-DatabaseName", "SystemDatabase");
+ selenium.click("//input[@value='Deploy']");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("UniquePool"));
+ selenium.click("//tr[td[1] = 'UniquePool']/td[4]/a[3]");
+ waitForPageLoad();
+ assertFalse(selenium.isTextPresent("UniquePool"));
}
+
/*
// cannot test yet. jetty is having problems rending the page
@Test
public void testDatabasePoolEdit() throws Exception {
- try {
- login();
-
- selenium.click("link=Database Pools");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("running"));
- selenium.click("link=edit");
- waitForPageLoad();
- selenium.type("maxSize", "101");
- selenium.click("//input[@value='Save']");
- waitForPageLoad();
- selenium.click("link=edit");
- waitForPageLoad();
- assertEquals("101", selenium.getValue("maxSize"));
- selenium.type("maxSize", "100");
- selenium.click("//input[@value='Save']");
- waitForPageLoad();
- selenium.click("link=edit");
- waitForPageLoad();
- assertEquals("100", selenium.getValue("maxSize"));
- } catch(Exception e) {
-
- } finally {
- logout();
- }
+ selenium.click("link=Database Pools");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("running"));
+ selenium.click("link=edit");
+ waitForPageLoad();
+ selenium.type("maxSize", "101");
+ selenium.click("//input[@value='Save']");
+ waitForPageLoad();
+ selenium.click("link=edit");
+ waitForPageLoad();
+ assertEquals("101", selenium.getValue("maxSize"));
+ selenium.type("maxSize", "100");
+ selenium.click("//input[@value='Save']");
+ waitForPageLoad();
+ selenium.click("link=edit");
+ waitForPageLoad();
+ assertEquals("100", selenium.getValue("maxSize"));
}*/
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java Thu May 8 23:47:04 2008
@@ -20,22 +20,17 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class DeploymentTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class DeploymentTest extends TestSupport {
@Test
public void testEmptyDeployment() throws Exception {
- try {
- login();
-
- selenium.click("link=Deploy New");
- waitForPageLoad();
- selenium.click("//input[@value='Install']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("Deployment failed:"));
- } finally {
- logout();
- }
+ selenium.click("link=Deploy New");
+ waitForPageLoad();
+ selenium.click("//input[@value='Install']");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("Deployment failed:"));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java Thu May 8 23:47:04 2008
@@ -20,51 +20,46 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class JMSResourcesTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class JMSResourcesTest extends TestSupport {
@Test
public void testNewJMSResource() throws Exception {
- try {
- login();
-
- selenium.click("link=JMS Resources");
- waitForPageLoad();
- selenium.click("link=For ActiveMQ");
- waitForPageLoad();
- selenium.type("instanceName", "UniqueName");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.click("//input[@value='Add Connection Factory']");
- waitForPageLoad();
- selenium.select("factoryType", "label=javax.jms.QueueConnectionFactory");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.type("factory.0.instanceName", "ConnectionFactory");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.click("//input[@value='Add Destination']");
- waitForPageLoad();
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.type("destination.0.name", "mdb/Unique");
- selenium.type("destination.0.instance-config-0", "mdb/Unique");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.click("//input[@value='Deploy Now']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/rar)"));
- selenium.click("link=J2EE Connectors");
- waitForPageLoad();
- selenium.click("link=Uninstall");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Are you certain you wish to uninstall console\\.jms/UniqueName/1\\.0/rar[\\s\\S]*"));
- selenium.click("link=JMS Resources");
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/rar)"));
- } finally {
- logout();
- }
+ selenium.click("link=JMS Resources");
+ waitForPageLoad();
+ selenium.click("link=For ActiveMQ");
+ waitForPageLoad();
+ selenium.type("instanceName", "UniqueName");
+ selenium.click("//input[@value='Next']");
+ waitForPageLoad();
+ selenium.click("//input[@value='Add Connection Factory']");
+ waitForPageLoad();
+ selenium.select("factoryType", "label=javax.jms.QueueConnectionFactory");
+ selenium.click("//input[@value='Next']");
+ waitForPageLoad();
+ selenium.type("factory.0.instanceName", "ConnectionFactory");
+ selenium.click("//input[@value='Next']");
+ waitForPageLoad();
+ selenium.click("//input[@value='Add Destination']");
+ waitForPageLoad();
+ selenium.click("//input[@value='Next']");
+ waitForPageLoad();
+ selenium.type("destination.0.name", "mdb/Unique");
+ selenium.type("destination.0.instance-config-0", "mdb/Unique");
+ selenium.click("//input[@value='Next']");
+ waitForPageLoad();
+ selenium.click("//input[@value='Deploy Now']");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/rar)"));
+ selenium.click("link=J2EE Connectors");
+ waitForPageLoad();
+ selenium.click("link=Uninstall");
+ waitForPageLoad();
+ assertTrue(selenium.getConfirmation().matches("^Are you certain you wish to uninstall console\\.jms/UniqueName/1\\.0/rar[\\s\\S]*"));
+ selenium.click("link=JMS Resources");
+ waitForPageLoad();
+ assertFalse(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/rar)"));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java Thu May 8 23:47:04 2008
@@ -20,74 +20,57 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class JMSServerTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class JMSServerTest extends TestSupport {
@Test
public void testNewListener() throws Exception {
- try {
- login();
-
- selenium.click("link=JMS Server");
- waitForPageLoad();
- selenium.click("link=Add new tcp listener");
- waitForPageLoad();
- selenium.type("name", "uniquename");
- selenium.type("host", "0.0.0.0");
- selenium.type("port", "2097");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("uniquename"));
- //selenium.click("link=delete");
- selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete uniquename?');\"]");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete uniquename[\\s\\S]$"));
- } finally {
- logout();
- }
+ selenium.click("link=JMS Server");
+ waitForPageLoad();
+ selenium.click("link=Add new tcp listener");
+ waitForPageLoad();
+ selenium.type("name", "uniquename");
+ selenium.type("host", "0.0.0.0");
+ selenium.type("port", "2097");
+ selenium.click("submit");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("uniquename"));
+ //selenium.click("link=delete");
+ selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete uniquename?');\"]");
+ waitForPageLoad();
+ assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete uniquename[\\s\\S]$"));
}
@Test
public void testStartStopListener() throws Exception {
- try {
- login();
-
- selenium.click("link=JMS Server");
- waitForPageLoad();
- selenium.click("//tr[4]/td[6]/a[1]");
- waitForPageLoad();
- assertEquals("stopped", selenium.getText("//tr[4]/td[5]"));
- selenium.click("//tr[4]/td[6]/a[1]");
- waitForPageLoad();
- assertEquals("running", selenium.getText("//tr[4]/td[5]"));
- } finally {
- logout();
- }
+ selenium.click("link=JMS Server");
+ waitForPageLoad();
+ selenium.click("//tr[4]/td[6]/a[1]");
+ waitForPageLoad();
+ assertEquals("stopped", selenium.getText("//tr[4]/td[5]"));
+ selenium.click("//tr[4]/td[6]/a[1]");
+ waitForPageLoad();
+ assertEquals("running", selenium.getText("//tr[4]/td[5]"));
}
@Test
public void testEditNetworkListener() throws Exception {
- try {
- login();
-
- selenium.click("link=JMS Server");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("61613"));
- selenium.click("link=edit");
- waitForPageLoad();
- selenium.type("port", "6161");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("6161"));
- selenium.click("link=edit");
- waitForPageLoad();
- selenium.type("port", "61612");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("61612"));
- } finally {
- logout();
- }
+ selenium.click("link=JMS Server");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("61613"));
+ selenium.click("link=edit");
+ waitForPageLoad();
+ selenium.type("port", "6161");
+ selenium.click("submit");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("6161"));
+ selenium.click("link=edit");
+ waitForPageLoad();
+ selenium.type("port", "61612");
+ selenium.click("submit");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("61612"));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java Thu May 8 23:47:04 2008
@@ -20,45 +20,38 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class PluginsTest extends ConsoleTestSupport {
-
+/**
+ * @version $Rev$ $Date$
+ */
+public class PluginsTest extends TestSupport {
@Test
public void testListPlugins() throws Exception {
- try {
- login();
-
- String link = "http://geronimo-server:8080/plugin/maven-repo/";
- String actualLink = "http://localhost:8080/plugin/maven-repo/";
-
- selenium.click("link=Plugins");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent(link));
-
- selenium.click("link=Add Repository");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent(link));
-
- selenium.type("newRepository", actualLink);
- selenium.click("//input[@value='Add Repository']");
- waitForPageLoad();
-
- selenium.select("repository", "label=" + actualLink);
- selenium.type("username", "system");
- selenium.type("password", "manager");
- selenium.click("//input[@value = 'Show Plugins in selected repository']");
- waitForPageLoad();
+ String link = "http://geronimo-server:8080/plugin/maven-repo/";
+ String actualLink = "http://localhost:8080/plugin/maven-repo/";
- assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Boilerplate Minimal"));
- selenium.click("link=Geronimo Assemblies :: Boilerplate Minimal");
- waitForPageLoad();
-
- assertTrue(selenium.isTextPresent("Geronimo-Versions"));
- } finally {
- logout();
- }
+ selenium.click("link=Plugins");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent(link));
+
+ selenium.click("link=Add Repository");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent(link));
+
+ selenium.type("newRepository", actualLink);
+ selenium.click("//input[@value='Add Repository']");
+ waitForPageLoad();
+
+ selenium.select("repository", "label=" + actualLink);
+ selenium.type("username", "system");
+ selenium.type("password", "manager");
+ selenium.click("//input[@value = 'Show Plugins in selected repository']");
+ waitForPageLoad();
+
+ assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Boilerplate Minimal"));
+ selenium.click("link=Geronimo Assemblies :: Boilerplate Minimal");
+ waitForPageLoad();
+
+ assertTrue(selenium.isTextPresent("Geronimo-Versions"));
}
-
}
Added: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java?rev=654694&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java (added)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java Thu May 8 23:47:04 2008
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.testsuite.console;
+
+import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+
+/**
+ * Support for tests.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestSupport
+ extends ConsoleTestSupport
+{
+ @BeforeMethod
+ public void signIn() throws Exception {
+ login();
+ }
+
+ @AfterMethod
+ public void signOut() throws Exception {
+ logout();
+ }
+}
Propchange: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java Thu May 8 23:47:04 2008
@@ -20,82 +20,65 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-@Test
-public class WebServerTest extends ConsoleTestSupport {
+/**
+ * @version $Rev$ $Date$
+ */
+public class WebServerTest extends TestSupport {
- String TOMCAT = "Tomcat";
- String JETTY = "Jetty";
+ public static final String TOMCAT = "Tomcat";
+ public static final String JETTY = "Jetty";
@Test
public void testNewConnector() throws Exception {
- try {
- login();
-
- String name = "uniquename";
- addConnector(name, 8081);
-
- deleteConnector(name);
- } finally {
- logout();
- }
+ String name = "uniquename";
+ addConnector(name, 8081);
+
+ deleteConnector(name);
}
@Test
public void testEditConnector() throws Exception{
- try {
- login();
-
- String name = "uniquename2";
- addConnector(name, 8082);
-
- String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
-
- selenium.click(connectorSelector + "/td[5]/a[3]");
- waitForPageLoad();
-
- selenium.type("port", "8008");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("8008"));
-
- selenium.click(connectorSelector + "/td[5]/a[3]");
-
- waitForPageLoad();
- selenium.type("port", "8009");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("8009"));
-
- deleteConnector(name);
- } finally {
- logout();
- }
+ String name = "uniquename2";
+ addConnector(name, 8082);
+
+ String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
+
+ selenium.click(connectorSelector + "/td[5]/a[3]");
+ waitForPageLoad();
+
+ selenium.type("port", "8008");
+ selenium.click("submit");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("8008"));
+
+ selenium.click(connectorSelector + "/td[5]/a[3]");
+
+ waitForPageLoad();
+ selenium.type("port", "8009");
+ selenium.click("submit");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("8009"));
+
+ deleteConnector(name);
}
@Test
public void testStartStopConnector() throws Exception {
- try {
- login();
-
- String name = "uniquename3";
- addConnector(name, 8083);
+ String name = "uniquename3";
+ addConnector(name, 8083);
- String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
+ String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
- assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
- selenium.click(connectorSelector + "/td[5]/a[1]");
- waitForPageLoad();
- assertEquals("stopped", selenium.getText(connectorSelector + "/td[4]"));
- selenium.click(connectorSelector + "/td[5]/a[1]");
- waitForPageLoad();
- assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
-
- deleteConnector(name);
- } finally {
- logout();
- }
+ assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
+ selenium.click(connectorSelector + "/td[5]/a[1]");
+ waitForPageLoad();
+ assertEquals("stopped", selenium.getText(connectorSelector + "/td[4]"));
+ selenium.click(connectorSelector + "/td[5]/a[1]");
+ waitForPageLoad();
+ assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
+
+ deleteConnector(name);
}
private void addConnector(String name, int port) throws Exception {
@@ -120,6 +103,5 @@
waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete " + name + "[\\s\\S]$"));
}
-
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Apache mod_jk configuration portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ApacheConfigPortletTest
extends BasicConsoleTestSupport
{
@@ -36,7 +34,6 @@
selenium.click("link=Apache HTTP");
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Apache mod_jk Configuration",
- selenium.getText(getPortletTitleLocation()));
+ assertEquals("Apache mod_jk Configuration", selenium.getText(getPortletTitleLocation()));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java Thu May 8 23:47:04 2008
@@ -31,7 +31,7 @@
}
@AfterMethod
- public void singOut() throws Exception {
+ public void signOut() throws Exception {
logout();
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Certification authority portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class CertificationAuthorityPortletTest
extends BasicConsoleTestSupport
{
@@ -35,8 +33,8 @@
public void testCertificationAuthorityLink() throws Exception {
selenium.click("link=Certificate Authority");
waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
+ assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Certification Authority",
- selenium.getText(getPortletTitleLocation()));
+ selenium.getText(getPortletTitleLocation()));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Configuration manager (Application clients) portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConfigManagerPortletAppClientTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Configuration manager (EARs) portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConfigManagerPortletEARTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Configuration manager (EJB JARs) portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConfigManagerPortletEJBTest
extends BasicConsoleTestSupport
{
@@ -37,6 +35,6 @@
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed EJB JARs",
- selenium.getText(getPortletTitleLocation()));
+ selenium.getText(getPortletTitleLocation()));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Configuration manager (J2EE Connectors) portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConfigManagerPortletRARTest
extends BasicConsoleTestSupport
{
@@ -37,6 +35,6 @@
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed J2EE Connectors",
- selenium.getText(getPortletTitleLocation()));
+ selenium.getText(getPortletTitleLocation()));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Configuration manager (System modules) portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConfigManagerPortletSysModulesTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Configuration manager (Web applications) portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConfigManagerPortletWARTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Web server connector portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ConnectorPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Database viewer portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class DBViewerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Database pool portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class DatabasePoolPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Deployment portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class DeploymentPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Derby log viewer portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class DerbyLogViewerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Import/export plugin portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ImportExportPortletTest
extends BasicConsoleTestSupport
{
@@ -37,6 +35,6 @@
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Create and Install Plugins",
- selenium.getText(getPortletTitleLocation()));
+ selenium.getText(getPortletTitleLocation()));
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Internal DB portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class InternalDBPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* JMS broker portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class JMSBrokerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* JMS connector portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class JMSConnectorPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* JMS resource portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class JMSResourcePortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* JMX manager portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class JMXManagerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Java system information portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class JavaSystemInfoPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Keystore configuration portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class KeystoresPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* LDAP manager portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class LDAPManagerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,10 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
- * ???
- *
* @version $Rev$ $Date$
*/
-@Test
public class LinkCheckTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Log manager portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class LogManagerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Log viewer portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class LogViewerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Repository viewer portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class RepositoryViewPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Run SQL commands portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class RunSQLPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Console realm group portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class SEGroupsPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Console realm user portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class SEUsersPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Security realm portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class SecurityRealmPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Server info portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ServerInfoPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Server manager portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ServerManagerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java Thu May 8 23:47:04 2008
@@ -23,21 +23,11 @@
import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
- * ???
- *
* @version $Rev$ $Date$
*/
-@Test
public class SimpleLoginTest
extends ConsoleTestSupport
{
- // @Test
- // public void testLogin() throws Exception {
- // login();
- //
- // selenium.removeCookie("JSESSIONID", "/");
- // }
-
@Test
public void testLoginAndLogout() throws Exception {
login();
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Thread pool portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class ThreadPoolPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Web access log portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class WebAccessLogViewerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Web manager portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class WebManagerPortletTest
extends BasicConsoleTestSupport
{
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java?rev=654694&r1=654693&r2=654694&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java Thu May 8 23:47:04 2008
@@ -20,14 +20,12 @@
package org.apache.geronimo.testsuite.console;
import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
/**
* Welcome portlet tests
*
* @version $Rev$ $Date$
*/
-@Test
public class WelcomePortletTest
extends BasicConsoleTestSupport
{