MOE sync - Test HttpContent

Author: peleyal

google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java

@@ -41,6 +41,13 @@ public class MockHttpTransport extends HttpTransport {
   /** Supported HTTP methods or {@code null} to specify that all methods are supported. */
   private Set<String> supportedMethods;
 
+  /**
+   * The {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. If
+   * this field is {@code null}, {@link #buildRequest} will create a new instance
+   * from its arguments.
+   * */
+  private MockLowLevelHttpRequest lowLevelHttpRequest;
+
   public MockHttpTransport() {
   }
 
@@ -51,6 +58,7 @@ public MockHttpTransport() {
    */
   protected MockHttpTransport(Builder builder) {
     supportedMethods = builder.supportedMethods;
+    lowLevelHttpRequest = builder.lowLevelHttpRequest;
   }
 
   @Override
@@ -61,7 +69,9 @@ public boolean supportsMethod(String method) throws IOException {
   @Override
   public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
     Preconditions.checkArgument(supportsMethod(method), "HTTP method %s not supported", method);
-    return new MockLowLevelHttpRequest(url);
+    return lowLevelHttpRequest == null
+        ? new MockLowLevelHttpRequest(url)
+        : lowLevelHttpRequest;
   }
 
   /**
@@ -72,6 +82,16 @@ public final Set<String> getSupportedMethods() {
     return supportedMethods == null ? null : Collections.unmodifiableSet(supportedMethods);
   }
 
+  /**
+   * Returns the {@link MockLowLevelHttpRequest} that is associated with this {@link Builder},
+   * or {@code null} if no such instance exists.
+   *
+   * @since 1.18
+   */
+  public final MockLowLevelHttpRequest getLowLevelHttpRequest() {
+    return lowLevelHttpRequest;
+  }
+
   /**
    * Returns an instance of a new builder.
    *
@@ -97,6 +117,13 @@ public static class Builder {
     /** Supported HTTP methods or {@code null} to specify that all methods are supported. */
     Set<String> supportedMethods;
 
+    /**
+     * The {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. If
+     * this field is {@code null}, {@link #buildRequest} will create a new instance
+     * from its arguments.
+     * */
+    MockLowLevelHttpRequest lowLevelHttpRequest;
+
     protected Builder() {
     }
 
@@ -119,5 +146,27 @@ public final Builder setSupportedMethods(Set<String> supportedMethods) {
       this.supportedMethods = supportedMethods;
       return this;
     }
+
+    /**
+     * Sets the {@link MockLowLevelHttpRequest} that will be returned by {@link #buildRequest}, if
+     * non-{@code null}. If {@code null}, {@link #buildRequest} will create a new
+     * {@link MockLowLevelHttpRequest} arguments.
+     *
+     * @since 1.18
+     */
+    public final Builder setLowLevelHttpRequest(MockLowLevelHttpRequest lowLevelHttpRequest) {
+      this.lowLevelHttpRequest = lowLevelHttpRequest;
+      return this;
+    }
+
+    /**
+     * Returns the {@link MockLowLevelHttpRequest} that is associated with this {@link Builder},
+     * or {@code null} if no such instance exists.
+     *
+     * @since 1.18
+     */
+    public final MockLowLevelHttpRequest getLowLevelHttpRequest() {
+      return lowLevelHttpRequest;
+    }
   }
 }

google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java

@@ -89,14 +89,42 @@ public MockLowLevelHttpResponse addHeader(String name, String value) {
    * @param stringContent content string or {@code null} for none
    */
   public MockLowLevelHttpResponse setContent(String stringContent) {
-    if (stringContent == null) {
-      content = null;
-      setContentLength(0);
-    } else {
-      byte[] bytes = StringUtils.getBytesUtf8(stringContent);
-      content = new TestableByteArrayInputStream(bytes);
-      setContentLength(bytes.length);
+    return stringContent == null
+        ? setZeroContent()
+        : setContent(StringUtils.getBytesUtf8(stringContent));
+  }
+
+  /**
+   * Sets the response content to the given byte array.
+   *
+   * @param byteContent content byte array, or {@code null} for none.
+   *
+   * <p>
+   * If the byte array is {@code null}, the method invokes {@link #setZeroContent}.
+   * Otherwise, {@code byteContent} is wrapped in a {@link TestableByteArrayInputStream}
+   * and becomes this {@link MockLowLevelHttpResponse}'s contents.
+   * </p>
+   *
+   * @since 1.18
+   */
+  public MockLowLevelHttpResponse setContent(byte[] byteContent) {
+    if (byteContent == null) {
+      return setZeroContent();
     }
+    content = new TestableByteArrayInputStream(byteContent);
+    setContentLength(byteContent.length);
+    return this;
+  }
+
+  /**
+   * Sets the content to {@code null} and the content length to 0. Note that
+   * the result will have a content length header whose value is 0.
+   *
+   * @since 1.18
+   */
+  public MockLowLevelHttpResponse setZeroContent() {
+    content = null;
+    setContentLength(0);
     return this;
   }