You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/12 06:31:08 UTC
svn commit: r584042 - in
/geronimo/server/trunk/testsuite/console-testsuite/advanced: pom.xml
src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
Author: gawor
Date: Thu Oct 11 21:31:07 2007
New Revision: 584042
URL: http://svn.apache.org/viewvc?rev=584042&view=rev
Log:
fix one more test
Modified:
geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml?rev=584042&r1=584041&r2=584042&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml Thu Oct 11 21:31:07 2007
@@ -57,6 +57,12 @@
<suiteXmlFiles>
<suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
</suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>geronimoVersion</name>
+ <value>${version}</value>
+ </property>
+ </systemProperties>
</configuration>
</plugin>
</plugins>
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=584042&r1=584041&r2=584042&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 Oct 11 21:31:07 2007
@@ -29,6 +29,8 @@
try {
login();
+ String geronimoVersion = System.getProperty("geronimoVersion");
+
selenium.click("link=Database Pools");
selenium.waitForPageToLoad("30000");
selenium.click("link=Using the Geronimo database pool wizard");
@@ -37,12 +39,12 @@
selenium.select("dbtype", "label=Derby embedded");
selenium.click("//input[@value='Next']");
selenium.waitForPageToLoad("30000");
- selenium.addSelection("jars", "label=org.apache.derby/derby/10.2.2.0/jar");
+ selenium.addSelection("jars", "label=org.apache.geronimo.configs/system-database/" + geronimoVersion + "/car");
selenium.type("property-DatabaseName", "SystemDatabase");
selenium.click("//input[@value='Deploy']");
selenium.waitForPageToLoad("30000");
assertTrue(selenium.isTextPresent("UniquePool"));
- selenium.click("//a[contains(@href, '/console/portal/services/services_jdbc/_pm_services_jdbc_row1_col1_p1/view/_ps_services_jdbc_row1_col1_p1/normal/_pid/services_jdbc_row1_col1_p1/_ac_services_jdbc_row1_col1_p1/AC/_st_services_jdbc_row1_col1_p1/normal/_md_services_jdbc_row1_col1_p1/view?mode=delete&abstractName=console.dbpool%2FUniquePool%2F1.0%2Frar%3FJ2EEApplication%3Dnull%2CJCAConnectionFactory%3DUniquePool%2CJCAResource%3Dconsole.dbpool%2FUniquePool%2F1.0%2Frar%2CResourceAdapter%3Dconsole.dbpool%2FUniquePool%2F1.0%2Frar%2CResourceAdapterModule%3Dconsole.dbpool%2FUniquePool%2F1.0%2Frar%2Cj2eeType%3DJCAManagedConnectionFactory%2Cname%3DUniquePool&adapterAbstractName=console.dbpool%2FUniquePool%2F1.0%2Frar%3FJ2EEApplication%3Dnull%2Cj2eeType%3DResourceAdapterModule%2Cname%3Dconsole.dbpool%2FUniquePool%2F1.0%2Frar&name=')]");
+ selenium.click("//tr[td[1] = 'UniquePool']/td[4]/a[3]");
selenium.waitForPageToLoad("30000");
assertFalse(selenium.isTextPresent("UniquePool"));
} finally {