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

353509: Fixed merging issues

This commit is contained in:
Thomas Becker 2011-09-14 10:43:20 +02:00 committed by Joakim Erdfelt
parent fce4192fd9
commit 5530594128
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java
View File

@ -24,6 +24,7 @@ public class AsyncSslHttpExchangeTest extends SslHttpExchangeTest
@BeforeClass @BeforeClass
public static void setUpOnce() throws Exception public static void setUpOnce() throws Exception
{ {
_scheme="https";
_server = serverAndClientCreator.createServer(); _server = serverAndClientCreator.createServer();
_httpClient = serverAndClientCreator.createClient(3000L,3500L,2000); _httpClient = serverAndClientCreator.createClient(3000L,3500L,2000);
_port = _server.getConnectors()[0].getLocalPort(); _port = _server.getConnectors()[0].getLocalPort();

2
jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java
View File

@ -25,7 +25,7 @@ public class ExternalKeyStoreAsyncSslHttpExchangeTest extends SslHttpExchangeTes
@BeforeClass @BeforeClass
public static void setUpOnce() throws Exception public static void setUpOnce() throws Exception
{ {
_scheme="https://"; _scheme="https";
_server = serverAndClientCreator.createServer(); _server = serverAndClientCreator.createServer();
_httpClient = serverAndClientCreator.createClient(3000L,3500L,2000); _httpClient = serverAndClientCreator.createClient(3000L,3500L,2000);
_port = _server.getConnectors()[0].getLocalPort(); _port = _server.getConnectors()[0].getLocalPort();

3
jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
View File

@ -366,6 +366,7 @@ public class HttpExchangeTest
System.err.println(throwable.get()); System.err.println(throwable.get());
assertTrue(throwable.get().toString().indexOf("close")>=0); assertTrue(throwable.get().toString().indexOf("close")>=0);
assertEquals(HttpExchange.STATUS_EXCEPTED, status); assertEquals(HttpExchange.STATUS_EXCEPTED, status);
_httpClient.start();
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -554,7 +555,7 @@ public class HttpExchangeTest
assertEquals(HttpStatus.OK_200,httpExchange.getResponseStatus()); assertEquals(HttpStatus.OK_200,httpExchange.getResponseStatus());
HttpFields headers = httpExchange.getResponseFields(); HttpFields headers = httpExchange.getResponseFields();
assertTrue("Response contains Allow header", headers.containsKey("Allow")); assertTrue("Response does not contain Allow header", headers.containsKey("Allow"));
String allow = headers.getStringField("Allow"); String allow = headers.getStringField("Allow");
String expectedMethods[] = String expectedMethods[] =