Adding handle to multiple MatchStatus.

Author: alemdomarco

src/main/java/com/amihaiemil/docker/MatchStatus.java

@@ -25,10 +25,14 @@
  */
 package com.amihaiemil.docker;
 
-import java.net.URI;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
 
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * An Apache ResponseHandler that tries to match the Response's status code
  * with the expected one.
@@ -42,32 +46,54 @@ final class MatchStatus implements ResponseHandler<HttpResponse> {
      * Called URI.
      */
     private final URI called;
-    
+
     /**
      * Expected status.
      */
-    private final int expected;
-    
+    private final List<Integer> expected;
+
     /**
      * Ctor.
      * @param called Called URI.
      * @param expected Expected Http status code.
      */
     MatchStatus(final URI called, final int expected) {
+        this(called, Arrays.asList(expected));
+    }
+
+    /**
+     * Ctor.
+     * @param called Called URI.
+     * @param expected Expected a iterable Http status code.
+     */
+    MatchStatus(final URI called, final Integer... expected) {
+       this(called, Arrays.asList(expected));
+    }
+
+    /**
+     * Primary Ctor.
+     * @param called Called URI.
+     * @param expected Expected a iterable Http status code.
+     */
+    MatchStatus(final URI called, final List<Integer> expected) {
         this.called = called;
         this.expected = expected;
     }
-    
+
     @Override
     public HttpResponse handleResponse(final HttpResponse response) {
         final int actual = response.getStatusLine().getStatusCode();
-        if(actual != this.expected) {
-            throw new UnexpectedResponseException(
-                this.called.toString(), actual,
-                this.expected, new PayloadOf(response)
-            );
+        for(final Integer statusCode: this.expected){
+            if(statusCode == actual) {
+                return response;
+            }
         }
-        return response;
+        String codes = this.expected.stream()
+            .map(Object::toString)
+            .collect(Collectors.joining(" "));
+        throw new UnexpectedResponseException(
+            this.called.toString(), actual,
+            codes, new PayloadOf(response)
+        );
     }
-    
 }

src/main/java/com/amihaiemil/docker/UnexpectedResponseException.java

@@ -50,7 +50,7 @@ public final class UnexpectedResponseException extends RuntimeException {
     /**
      * Expected response status.
      */
-    private final int expectedStatus;
+    private final String expectedStatus;
 
     /**
      * The response's body.
@@ -68,6 +68,21 @@ public final class UnexpectedResponseException extends RuntimeException {
     public UnexpectedResponseException(
         final String endpoint, final int actualStatus,
         final int expectedStatus, final JsonObject body
+    ) {
+        this(endpoint, actualStatus, String.valueOf(expectedStatus), body);
+    }
+
+    /**
+     * Primary Ctor.
+     * @param endpoint Endpoint that was called.
+     * @param actualStatus Received status.
+     * @param expectedStatus Expected status.
+     * @param body The response's body.
+     */
+    // @checkstyle ParameterNumber (3 lines)
+    public UnexpectedResponseException(
+        final String endpoint, final int actualStatus,
+        final String expectedStatus, final JsonObject body
     ) {
         super(String.format(
             // @checkstyle LineLength (1 line)
@@ -100,7 +115,7 @@ public int actualStatus() {
      * Expected status.
      * @return Integer HTTP status.
      */
-    public int expectedStatus() {
+    public String expectedStatus() {
         return this.expectedStatus;
     }
 

src/test/java/com/amihaiemil/docker/MatchStatusTestCase.java

@@ -66,5 +66,21 @@ public void returnsResponseOnMatch() throws Exception {
             Matchers.is(resp)
         );
     }
+
+    /**
+     * {@link MatchStatus} returns the HttpResponse if one of the status
+     * code match.
+     * @throws Exception If something goes wrong.
+     */
+    @Test
+    public void returnsResponseOnMatchOne() throws Exception {
+        final HttpResponse resp = new Response(HttpStatus.SC_NO_CONTENT);
+        MatcherAssert.assertThat(
+            new MatchStatus(URI.create("/test/ur"),
+                HttpStatus.SC_OK, HttpStatus.SC_NO_CONTENT)
+                .handleResponse(resp),
+            Matchers.is(resp)
+        );
+    }
 
 }

src/test/java/com/amihaiemil/docker/UnexpectedResponseExceptionTestCase.java

@@ -64,7 +64,7 @@ public void returnsExpectedStatus() {
                 "/uri", HttpStatus.SC_NOT_FOUND,
                 HttpStatus.SC_OK, Json.createObjectBuilder().build()
             ).expectedStatus(),
-            Matchers.equalTo(HttpStatus.SC_OK)
+            Matchers.equalTo(String.valueOf(HttpStatus.SC_OK))
         );
     }
 
@@ -99,6 +99,24 @@ public void returnsMessage() {
         );
     }
 
+    /**
+     * UnexpectedResponseException has a proper message.
+     */
+    @Test
+    public void returnsMessages() {
+        MatcherAssert.assertThat(
+            new UnexpectedResponseException(
+                "/uri", HttpStatus.SC_NOT_FOUND,
+                String.valueOf(HttpStatus.SC_OK),
+                Json.createObjectBuilder().build()
+            ).getMessage(),
+            Matchers.startsWith(
+                // @checkstyle LineLength (1 line)
+                "Expected status 200 but got 404 when calling /uri. Response body was"
+            )
+        );
+    }
+
     /**
      * UnexpectedResponseException appends the payload to the message.
      */