Some minor fix concerning Selenium.

Author: henryju

jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java

@@ -49,7 +49,8 @@ public JettySetup(Test test) {
 	 * 
 	 * @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 @@ public void setUp() {
 	 * 
 	 * @see junit.extensions.TestSetup#tearDown()
 	 */
-	public void tearDown() {
+	public void tearDown() throws Exception {
 		try {
 			jettyServer.stop();
 		} catch (InterruptedException e) {
@@ -105,5 +106,6 @@ public void tearDown() {
 			e.printStackTrace();
 			fail("Could not stop the Jetty server: " + e);
 		}
+		super.tearDown();
 	}
-}
+}

jwebunit-selenium-plugin/pom.xml

@@ -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>
@@ -38,6 +63,10 @@
             <groupId>org.openqa.selenium.client-drivers</groupId>
             <artifactId>selenium-java-client-driver</artifactId>
             <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>
@@ -71,4 +100,4 @@
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
-</project>
+</project>

jwebunit-selenium-plugin/src/test/java/net/sourceforge/jwebunit/selenium/JWebUnitTest.java

@@ -50,7 +50,7 @@ public static Test suite() {
         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);
     }