From 6594ee87fa7acef9a580a27ba6fc3532a28932ee Mon Sep 17 00:00:00 2001
From: Thomas Becker <tbecker@intalio.com>
Date: Mon, 16 Sep 2013 18:04:52 +0200
Subject: [PATCH] 416674 run all jetty-ant tests on random ports

---
 .../eclipse/jetty/ant/JettyAntTaskTest.java   | 26 +++++++++----------
 jetty-ant/src/test/resources/webapp-test.xml  |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jetty-ant/src/test/java/org/eclipse/jetty/ant/JettyAntTaskTest.java b/jetty-ant/src/test/java/org/eclipse/jetty/ant/JettyAntTaskTest.java
index ec70c7c80ac..39960ce2c0e 100644
--- a/jetty-ant/src/test/java/org/eclipse/jetty/ant/JettyAntTaskTest.java
+++ b/jetty-ant/src/test/java/org/eclipse/jetty/ant/JettyAntTaskTest.java
@@ -21,12 +21,12 @@ package org.eclipse.jetty.ant;
 import java.net.HttpURLConnection;
 import java.net.URI;
 
-import junit.framework.Assert;
-
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
-import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
 public class JettyAntTaskTest
 {
     
@@ -42,9 +42,9 @@ public class JettyAntTaskTest
         HttpURLConnection connection = (HttpURLConnection)uri.toURL().openConnection();
         
         connection.connect();
-        
-        Assert.assertEquals(404,connection.getResponseCode());
-        
+
+        assertThat("response code is 404", connection.getResponseCode(), is(404));
+
         build.stop();
     }
 
@@ -53,17 +53,17 @@ public class JettyAntTaskTest
     public void testWebApp () throws Exception
     {
         AntBuild build = new AntBuild(MavenTestingUtils.getTestResourceFile("webapp-test.xml").getAbsolutePath());
-      
+
         build.start();
-        
+
         URI uri = new URI("http://" + build.getJettyHost() + ":" + build.getJettyPort() + "/");
-        
+
         HttpURLConnection connection = (HttpURLConnection)uri.toURL().openConnection();
-        
+
         connection.connect();
-        
-        Assert.assertEquals(200,connection.getResponseCode());
-        
+
+        assertThat("response code is 200", connection.getResponseCode(), is(200));
+
         System.err.println("Stop build!");
         build.stop();
     }
diff --git a/jetty-ant/src/test/resources/webapp-test.xml b/jetty-ant/src/test/resources/webapp-test.xml
index dbc99ed881e..259375993b6 100644
--- a/jetty-ant/src/test/resources/webapp-test.xml
+++ b/jetty-ant/src/test/resources/webapp-test.xml
@@ -10,7 +10,7 @@
            classpathref="jetty.plugin.classpath" loaderref="jetty.loader" />
 
   <target name="jetty.run">
-    <jetty.run daemon="true" scanIntervalSeconds="10">
+    <jetty.run daemon="true" scanIntervalSeconds="10" jettyPort="0">
        <webapp  war="${basedir}/src/test/resources/foo" contextpath="/" />
     </jetty.run>
   </target>