Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.1' into release-9.1

This commit is contained in:
Joakim Erdfelt 2013-09-16 09:49:51 -07:00
parent 9677f6e863 6594ee87fa
commit 9481cb5bba
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-ant/src/test/java/org/eclipse/jetty/ant/JettyAntTaskTest.java
View File

@ -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
{
@ -43,7 +43,7 @@ public class JettyAntTaskTest
connection.connect();
Assert.assertEquals(404,connection.getResponseCode());
assertThat("response code is 404", connection.getResponseCode(), is(404));
build.stop();
}
@ -62,7 +62,7 @@ public class JettyAntTaskTest
connection.connect();
Assert.assertEquals(200,connection.getResponseCode());
assertThat("response code is 200", connection.getResponseCode(), is(200));
System.err.println("Stop build!");
build.stop();

2
jetty-ant/src/test/resources/webapp-test.xml
View File

@ -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>