You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/06 16:05:34 UTC
[05/17] git commit: Rather than rely on or work around JRE behavior
based, lock S3ClientMockTest using OkHttp.
Rather than rely on or work around JRE behavior based, lock S3ClientMockTest using OkHttp.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/044223ef
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/044223ef
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/044223ef
Branch: refs/heads/reactivate-checkstyle
Commit: 044223efcbabeff90a5bb7197b6e8662d22115f7
Parents: 99e217b
Author: Adrian Cole <ad...@gmail.com>
Authored: Sat Oct 4 10:30:31 2014 -0700
Committer: Adrian Cole <ad...@gmail.com>
Committed: Sun Oct 5 20:14:45 2014 -0700
----------------------------------------------------------------------
apis/s3/pom.xml | 6 ++++++
apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java | 9 ++-------
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/044223ef/apis/s3/pom.xml
----------------------------------------------------------------------
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index dfdbf9d..14ea076 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -81,6 +81,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-okhttp</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/044223ef/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
index 279de59..c9f67dc 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
import org.jclouds.s3.domain.S3Object;
import org.testng.annotations.Test;
@@ -44,13 +45,11 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(singleThreaded = true)
public class S3ClientMockTest {
- private static final Set<Module> modules = ImmutableSet.<Module> of(
+ private static final Set<Module> modules = ImmutableSet.<Module> of(new OkHttpCommandExecutorServiceModule(),
new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService()));
static S3Client getS3Client(URL server) {
Properties overrides = new Properties();
- // prevent expect-100 bug http://code.google.com/p/mockwebserver/issues/detail?id=6
- overrides.setProperty(PROPERTY_SO_TIMEOUT, "0");
overrides.setProperty(PROPERTY_MAX_RETRIES, "1");
return ContextBuilder.newBuilder("s3")
.credentials("accessKey", "secretKey")
@@ -63,8 +62,6 @@ public class S3ClientMockTest {
public void testZeroLengthPutHasContentLengthHeader() throws IOException, InterruptedException {
MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().addHeader(ETAG, "ABCDEF"));
- // hangs on Java 7 without this additional response ?!?
- server.enqueue(new MockResponse().addHeader(ETAG, "ABCDEF"));
server.play();
S3Client client = getS3Client(server.getUrl("/"));
@@ -77,7 +74,6 @@ public class S3ClientMockTest {
RecordedRequest request = server.takeRequest();
assertEquals(request.getRequestLine(), "PUT /bucket/object HTTP/1.1");
assertEquals(request.getHeaders(CONTENT_LENGTH), ImmutableList.of("0"));
- // will fail unless -Dsun.net.http.allowRestrictedHeaders=true is set
assertEquals(request.getHeaders(EXPECT), ImmutableList.of("100-continue"));
server.shutdown();
}
@@ -96,7 +92,6 @@ public class S3ClientMockTest {
RecordedRequest request = server.takeRequest();
assertEquals(request.getRequestLine(), "PUT /bucket/someDir/fileName HTTP/1.1");
- // will fail unless -Dsun.net.http.allowRestrictedHeaders=true is set
assertEquals(request.getHeaders(EXPECT), ImmutableList.of("100-continue"));
server.shutdown();