Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 29B5E200BE8 for ; Thu, 17 Nov 2016 17:43:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 295D1160B0B; Thu, 17 Nov 2016 16:43:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 66FB6160B18 for ; Thu, 17 Nov 2016 17:43:36 +0100 (CET) Received: (qmail 57394 invoked by uid 500); 17 Nov 2016 16:43:35 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 57339 invoked by uid 99); 17 Nov 2016 16:43:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Nov 2016 16:43:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 61C4FF1711; Thu, 17 Nov 2016 16:43:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: svet@apache.org To: commits@brooklyn.apache.org Date: Thu, 17 Nov 2016 16:43:36 -0000 Message-Id: In-Reply-To: <7a33fe24c5bf463a8c780dfc1e634a0a@git.apache.org> References: <7a33fe24c5bf463a8c780dfc1e634a0a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] brooklyn-server git commit: Adding test for HttpResponse headers value archived-at: Thu, 17 Nov 2016 16:43:37 -0000 Adding test for HttpResponse headers value Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a8cef3f6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a8cef3f6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a8cef3f6 Branch: refs/heads/master Commit: a8cef3f6047a8cd177ce220330494a42cdb99ed5 Parents: 5649c2d Author: Yavor Yanchev Authored: Wed Nov 16 16:14:25 2016 +0200 Committer: Yavor Yanchev Committed: Wed Nov 16 16:14:25 2016 +0200 ---------------------------------------------------------------------- .../util/executor/HttpExecutorImplTest.java | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a8cef3f6/core/src/test/java/org/apache/brooklyn/util/executor/HttpExecutorImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/executor/HttpExecutorImplTest.java b/core/src/test/java/org/apache/brooklyn/util/executor/HttpExecutorImplTest.java index 5837b4b..233d7a6 100644 --- a/core/src/test/java/org/apache/brooklyn/util/executor/HttpExecutorImplTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/executor/HttpExecutorImplTest.java @@ -42,6 +42,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Multimap; import com.google.common.io.ByteStreams; import com.google.mockwebserver.MockResponse; import com.google.mockwebserver.RecordedRequest; @@ -53,6 +55,8 @@ public class HttpExecutorImplTest { protected URL baseUrl; protected HttpExecutorFactoryImpl factory; + protected String HTTP_RESPONSE_CUSTOM_HEADER_KEY = "Custom-Header"; + protected String HTTP_RESPONSE_CUSTOM_HEADER_VALUE = "Custom Value"; protected String HTTP_RESPONSE_HEADER_KEY = "content-type"; protected String HTTP_RESPONSE_HEADER_VALUE = "application/json"; protected String HTTP_BODY = "{\"foo\":\"myfoo\"}"; @@ -71,6 +75,36 @@ public class HttpExecutorImplTest { } @Test + public void testHttpResponse() throws Exception { + Multimap responseHeaders = ArrayListMultimap.create(); + responseHeaders.put(HTTP_RESPONSE_CUSTOM_HEADER_KEY, HTTP_RESPONSE_CUSTOM_HEADER_VALUE); + HttpResponse httpResponse = new HttpResponse.Builder() + .headers(responseHeaders) + .header(HTTP_RESPONSE_HEADER_KEY, HTTP_RESPONSE_HEADER_VALUE) + .build(); + + MockResponse serverResponse = new MockResponse() + .setResponseCode(200) + .setBody(HTTP_BODY); + + for (Map.Entry entry : httpResponse.headers().entries()) { + serverResponse.addHeader(entry.getKey(), entry.getValue()); + } + server.enqueue(serverResponse); + HttpExecutor executor = factory.getHttpExecutor(getProps()); + HttpRequest executorRequest = new HttpRequest.Builder() + .method("GET") + .uri(baseUrl.toURI()) + .build(); + HttpResponse executorResponse = executor.execute(executorRequest); + assertTrue(executorResponse.headers().containsKey(HTTP_RESPONSE_CUSTOM_HEADER_KEY)); + assertTrue(Iterables.getOnlyElement(executorResponse.headers().get(HTTP_RESPONSE_HEADER_KEY)).equals(HTTP_RESPONSE_HEADER_VALUE)); + + assertTrue(executorResponse.headers().containsKey(HTTP_RESPONSE_HEADER_KEY)); + assertTrue(Iterables.getOnlyElement(executorResponse.headers().get(HTTP_RESPONSE_CUSTOM_HEADER_KEY)).equals(HTTP_RESPONSE_CUSTOM_HEADER_VALUE)); + } + + @Test public void testHttpRequest() throws Exception { MockResponse serverResponse = new MockResponse().setResponseCode(200).addHeader(HTTP_RESPONSE_HEADER_KEY, HTTP_RESPONSE_HEADER_VALUE).setBody(HTTP_BODY); server.enqueue(serverResponse);