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

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-05-11 16:23:06 +10:00
parent 19c63703ea bdafea3e96
commit 6fb095f02c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java
View File

@ -232,7 +232,7 @@ public class GracefulStopTest
assertThat(response2, containsString(" 503 ")); assertThat(response2, containsString(" 503 "));
now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime()); now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
Thread.sleep(end-now); Thread.sleep(Math.max(1,end-now));
client1.getOutputStream().write("567890".getBytes()); client1.getOutputStream().write("567890".getBytes());
} }
catch(Exception e) catch(Exception e)

20
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java
View File

@ -35,6 +35,10 @@ import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
public class PostServletTest public class PostServletTest
{ {
private static final Logger LOG = Log.getLogger(PostServletTest.class); private static final Logger LOG = Log.getLogger(PostServletTest.class);
@ -108,7 +112,7 @@ public class PostServletTest
String resp = connector.getResponses(req.toString()); String resp = connector.getResponses(req.toString());
Assert.assertThat("resp", resp, Matchers.containsString("HTTP/1.1 200 OK")); assertThat("resp", resp, Matchers.containsString("HTTP/1.1 200 OK"));
} }
@Test @Test
@ -128,9 +132,9 @@ public class PostServletTest
try (StacklessLogging scope = new StacklessLogging(ServletHandler.class)) try (StacklessLogging scope = new StacklessLogging(ServletHandler.class))
{ {
String resp = connector.getResponses(req.toString()); String resp = connector.getResponses(req.toString());
Assert.assertThat("resp", resp, Matchers.containsString("HTTP/1.1 200 ")); assertThat("resp", resp, Matchers.containsString("HTTP/1.1 200 "));
Assert.assertThat("resp", resp, Matchers.containsString("chunked")); assertThat("resp", resp, Matchers.containsString("chunked"));
Assert.assertThat("resp", resp, Matchers.not(Matchers.containsString("\r\n0\r\n"))); assertThat("resp", resp, not(containsString("\r\n0\r\n")));
} }
} }
@ -162,7 +166,7 @@ public class PostServletTest
endp.waitUntilClosedOrIdleFor(1,TimeUnit.SECONDS); endp.waitUntilClosedOrIdleFor(1,TimeUnit.SECONDS);
String resp = endp.takeOutputString(); String resp = endp.takeOutputString();
Assert.assertThat("resp", resp, Matchers.containsString("HTTP/1.1 400 ")); assertThat("resp", resp, Matchers.containsString("HTTP/1.1 400 "));
} }
} }
@ -193,9 +197,9 @@ public class PostServletTest
endp.waitUntilClosedOrIdleFor(1,TimeUnit.SECONDS); endp.waitUntilClosedOrIdleFor(1,TimeUnit.SECONDS);
String resp = endp.takeOutputString(); String resp = endp.takeOutputString();
Assert.assertThat("resp", resp, Matchers.containsString("HTTP/1.1 200 ")); assertThat("resp", resp, Matchers.containsString("HTTP/1.1 200 "));
Assert.assertThat("resp", resp, Matchers.containsString("Transfer-Encoding: chunked")); assertThat("resp", resp, Matchers.containsString("Transfer-Encoding: chunked"));
Assert.assertThat("resp", resp, Matchers.not(Matchers.containsString("\r\n0\r\n"))); assertThat("resp", resp, not(Matchers.containsString("\r\n0\r\n")));
} }
} }
} }