geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r672443 - in /geronimo/server/trunk: testsuite/pom.xml testsupport/testsupport-selenium/pom.xml testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
Date Sat, 28 Jun 2008 00:19:46 GMT
Author: dwoods
Date: Fri Jun 27 17:19:46 2008
New Revision: 672443

URL: http://svn.apache.org/viewvc?rev=672443&view=rev
Log:
GERONIMO-4170 Add ability to use Firefox or IExplorer.  Remove usage of DEFAULT_PORT which
is no longer defined in the latest 1.0-SNAPSHOT artifacts.  Staying with 1.0-beta-1 for now,
as the SNAPSHOTS still do not work with FF3.

Modified:
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml
    geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=672443&r1=672442&r2=672443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri Jun 27 17:19:46 2008
@@ -180,6 +180,12 @@
                         <configuration>
                             <logOutput>true</logOutput>
                             <background>true</background>
+                            <systemProperties>
+                                <property>
+                                    <name>browser</name>
+                                    <value>${browser}</value>
+                                </property>
+                            </systemProperties>
                         </configuration>
                     </execution>
                     <execution>
@@ -340,6 +346,28 @@
                 </pluginManagement>
             </build>
         </profile>
+
+        <profile>
+            <id>firefox</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <browser>*firefox</browser>
+            </properties>
+        </profile>
+        <profile>
+            <id>iexplore</id>
+            <properties>
+                <browser>*iexplore</browser>
+            </properties>
+        </profile>
+        <profile>
+            <id>otherbrowser</id>
+            <properties>
+                <browser>${browserPath}</browser>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml?rev=672443&r1=672442&r2=672443&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml (original)
+++ geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml Fri Jun 27 17:19:46 2008
@@ -62,7 +62,7 @@
     
     <repositories>
         <repository>
-            <id>openqa.org</id>
+            <id>releases.openqa.org</id>
             <name>Openqa Release Repository</name>
             <url>http://archiva.openqa.org/repository/releases</url>
             <layout>default</layout>
@@ -74,7 +74,7 @@
             </releases>
         </repository>
         <repository>
-            <id>openqa.org</id>
+            <id>snapshots.openqa.org</id>
             <name>Openqa Snapshot Repository</name>
             <url>http://archiva.openqa.org/repository/snapshots</url>
             <layout>default</layout>
@@ -89,4 +89,4 @@
         </repository>
     </repositories>
     
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java?rev=672443&r1=672442&r2=672443&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
(original)
+++ geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
Fri Jun 27 17:19:46 2008
@@ -42,13 +42,17 @@
         super.setUp();
         
         if (url == null) {
-            url = "http://localhost:" + SeleniumServer.DEFAULT_PORT;
+            // url = "http://localhost:" + SeleniumServer.DEFAULT_PORT;
+            // post 1.0-beta-1 builds don't define DEFAULT_PORT
+            url = "http://localhost:4444";
         }
         
-        log.info("Creating Selenium client for URL: {}", url);
+        String browser = System.getProperty("browser", "*firefox");
+
+        log.info("Creating Selenium client for URL: {}, Browser: {}", url, browser);
         
-        ExtendedSelenium selenium = new ExtendedSelenium(
-            "localhost", SeleniumServer.DEFAULT_PORT, "*firefox", url);
+        // ExtendedSelenium selenium = new ExtendedSelenium("localhost", SeleniumServer.DEFAULT_PORT,
"*firefox", url);
+        ExtendedSelenium selenium = new ExtendedSelenium("localhost", 4444, browser, url);
         
         return selenium;
     }



Mime
View raw message