aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2011-09-14 04:43:20 (EDT)
committerJoakim Erdfelt2011-09-14 11:41:33 (EDT)
commit5530594128ba7d73132ee86b2f35f0a49b4e7361 (patch)
treeb9abec440055e8ebffdb4769c5061870d660f272
parentfce4192fd95b715cae559c693e08d7a5f511c59b (diff)
downloadorg.eclipse.jetty.project-5530594128ba7d73132ee86b2f35f0a49b4e7361.zip
org.eclipse.jetty.project-5530594128ba7d73132ee86b2f35f0a49b4e7361.tar.gz
org.eclipse.jetty.project-5530594128ba7d73132ee86b2f35f0a49b4e7361.tar.bz2
353509: Fixed merging issues
-rw-r--r--jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java1
-rw-r--r--jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java2
-rw-r--r--jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java3
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 2426cdf..8cfe3d7 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 f3ccca1..303cdcb 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 7490f0c..97d65f7 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[] =