Revision: 720
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=720&view=rev
Author: henryju
Date: 2008-04-11 07:24:51 -0700 (Fri, 11 Apr 2008)
Log Message:
-----------
Some minor fix concerning Selenium.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
trunk/jwebunit-selenium-plugin/pom.xml
trunk/jwebunit-selenium-plugin/src/test/java/net/sourceforge/jwebunit/selenium/JWebUnitTest.java
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2008-04-11 14:22:56 UTC (rev 719)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2008-04-11 14:24:51 UTC (rev 720)
@@ -49,7 +49,8 @@
*
* @see junit.extensions.TestSetup#setUp()
*/
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
try {
jettyServer = new Server();
SocketConnector connector = new SocketConnector();
@@ -95,7 +96,7 @@
*
* @see junit.extensions.TestSetup#tearDown()
*/
- public void tearDown() {
+ public void tearDown() throws Exception {
try {
jettyServer.stop();
} catch (InterruptedException e) {
@@ -105,5 +106,6 @@
e.printStackTrace();
fail("Could not stop the Jetty server: " + e);
}
+ super.tearDown();
}
-}
\ No newline at end of file
+}
Modified: trunk/jwebunit-selenium-plugin/pom.xml
===================================================================
--- trunk/jwebunit-selenium-plugin/pom.xml 2008-04-11 14:22:56 UTC (rev
719)
+++ trunk/jwebunit-selenium-plugin/pom.xml 2008-04-11 14:24:51 UTC (rev
720)
@@ -25,7 +25,32 @@
<exclude>**/*AbstractTests.java</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
+ <!-- Requires java 1.5 -->
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <multiWindow>true</multiWindow>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.openqa.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>1.0-beta-1</version>
+ </dependency>
+ </dependencies>
+ </plugin-->
</plugins>
</build>
<dependencies>
@@ -40,6 +65,10 @@
<exclusions>
<exclusion>
<groupId>org.openqa.selenium.server</groupId>
+ <artifactId>selenium-server-coreless</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.openqa.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
</exclusion>
</exclusions>
@@ -71,4 +100,4 @@
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified:
trunk/jwebunit-selenium-plugin/src/test/java/net/sourceforge/jwebunit/selenium/JWebUnitTest.java
===================================================================
---
trunk/jwebunit-selenium-plugin/src/test/java/net/sourceforge/jwebunit/selenium/JWebUnitTest.java
2008-04-11 14:22:56 UTC (rev 719)
+++
trunk/jwebunit-selenium-plugin/src/test/java/net/sourceforge/jwebunit/selenium/JWebUnitTest.java
2008-04-11 14:24:51 UTC (rev 720)
@@ -50,7 +50,7 @@
suite.addTestSuite(RedirectionTest.class);
suite.addTestSuite(ImageTest.class);
suite.addTestSuite(ResourceBundleAssertionsTest.class);
- suite.addTest(JUnitPerfTest.suite());
+ //suite.addTest(JUnitPerfTest.suite());
// $JUnit-END$
return new JettySetup(suite);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
