diff options
| author | Thomas Becker | 2011-09-14 08:43:20 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2011-09-14 15:41:33 +0000 |
| commit | 5530594128ba7d73132ee86b2f35f0a49b4e7361 (patch) | |
| tree | b9abec440055e8ebffdb4769c5061870d660f272 | |
| parent | fce4192fd95b715cae559c693e08d7a5f511c59b (diff) | |
| download | org.eclipse.jetty.project-5530594128ba7d73132ee86b2f35f0a49b4e7361.tar.gz org.eclipse.jetty.project-5530594128ba7d73132ee86b2f35f0a49b4e7361.tar.xz org.eclipse.jetty.project-5530594128ba7d73132ee86b2f35f0a49b4e7361.zip | |
353509: Fixed merging issues
3 files changed, 4 insertions, 2 deletions
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java index 2426cdfd79..8cfe3d7d2e 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java @@ -24,6 +24,7 @@ public class AsyncSslHttpExchangeTest extends SslHttpExchangeTest @BeforeClass public static void setUpOnce() throws Exception { + _scheme="https"; _server = serverAndClientCreator.createServer(); _httpClient = serverAndClientCreator.createClient(3000L,3500L,2000); _port = _server.getConnectors()[0].getLocalPort(); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java index f3ccca1eda..303cdcbec5 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java @@ -25,7 +25,7 @@ public class ExternalKeyStoreAsyncSslHttpExchangeTest extends SslHttpExchangeTes @BeforeClass public static void setUpOnce() throws Exception { - _scheme="https://"; + _scheme="https"; _server = serverAndClientCreator.createServer(); _httpClient = serverAndClientCreator.createClient(3000L,3500L,2000); _port = _server.getConnectors()[0].getLocalPort(); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java index 7490f0cfc5..97d65f7cf1 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java @@ -366,6 +366,7 @@ public class HttpExchangeTest System.err.println(throwable.get()); assertTrue(throwable.get().toString().indexOf("close")>=0); assertEquals(HttpExchange.STATUS_EXCEPTED, status); + _httpClient.start(); } /* ------------------------------------------------------------ */ @@ -554,7 +555,7 @@ public class HttpExchangeTest assertEquals(HttpStatus.OK_200,httpExchange.getResponseStatus()); 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 expectedMethods[] = |