From 07ee63d3b4ed6e971a12584d32d16f9bb57caa1a Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Jan 2020 22:06:38 -0600 Subject: [PATCH 1/2] Fixing and finishing unit tests --- .../java/io/dapr/client/DaprHttpTest.java | 102 ++++++++++++++---- 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java index 95957218ab..bb9e38bc81 100644 --- a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java +++ b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java @@ -32,19 +32,39 @@ public class DaprHttpTest { @Before public void setUp() throws Exception { mockInterceptor = new MockInterceptor(Behavior.UNORDERED); - okHttpClient = new OkHttpClient.Builder().addInterceptor(mockInterceptor).build(); + okHttpClient = new OkHttpClient.Builder().addInterceptor(mockInterceptor).build(); } @Test - public void invokePostMethod() throws IOException { + public void invokeMethod() throws IOException { + + Map headers = new HashMap<>(); + headers.put("content-type","text/html"); + headers.put("header1","value1"); mockInterceptor.addRule() .post("http://localhost:3500/v1.0/state") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + Mono mono = daprHttp.invokeAPI("POST", "v1.0/state", null, (byte[])null, headers); - Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); + DaprHttp.Response response = mono.block(); + String body = serializer.deserialize(response.getBody(), String.class); + assertEquals(EXPECTED_RESULT,body); + } + + @Test + public void invokePostMethod() throws IOException { + + mockInterceptor.addRule() + .post("http://localhost:3500/v1.0/state") + .respond(EXPECTED_RESULT) + .addHeader("Header","Value"); + + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + + Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null,"", null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); assertEquals(EXPECTED_RESULT,body); @@ -58,9 +78,9 @@ public void invokeDeleteMethod() throws IOException { .delete("http://localhost:3500/v1.0/state") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); - Mono mono = daprHttp.invokeAPI("DELETE","v1.0/state", null, null); + Mono mono = daprHttp.invokeAPI("DELETE","v1.0/state", null, (String) null,null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); assertEquals(EXPECTED_RESULT,body); @@ -74,7 +94,7 @@ public void invokeGetMethod() throws IOException { .get("http://localhost:3500/v1.0/get") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); Mono mono = daprHttp.invokeAPI("GET","v1.0/get",null, null); DaprHttp.Response response = mono.block(); @@ -91,11 +111,11 @@ public void invokeMethodWithHeaders() throws IOException { headers.put("header1","value1"); mockInterceptor.addRule() - .get("http://localhost:3500/v1.0/get?header1=value1&header=value") + .get("http://localhost:3500/v1.0/get") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); - Mono mono = daprHttp.invokeAPI("GET","v1.0/get", headers, null); + Mono mono = daprHttp.invokeAPI("GET","v1.0/get",null, headers); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); assertEquals(EXPECTED_RESULT,body); @@ -103,23 +123,67 @@ public void invokeMethodWithHeaders() throws IOException { } @Test(expected = RuntimeException.class) - public void invokeMethodRuntimeException() throws IOException { + public void invokePostMethodRuntime() throws IOException { - Map headers = new HashMap<>(); - headers.put("header","value"); - headers.put("header1","value1"); + mockInterceptor.addRule() + .post("http://localhost:3500/v1.0/state") + .respond(500); + + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + + Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); + DaprHttp.Response response = mono.block(); + String body = serializer.deserialize(response.getBody(), String.class); + assertEquals(EXPECTED_RESULT,body); + + } + + @Test(expected = RuntimeException.class) + public void invokePostDaprError() throws IOException { mockInterceptor.addRule() - .get("http://localhost:3500/v1.0/get") + .post("http://localhost:3500/v1.0/state") + .respond(500, ResponseBody.create(MediaType.parse("text"), + "{\"errorCode\":null,\"message\":null}")); + + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + + Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); + DaprHttp.Response response = mono.block(); + String body = serializer.deserialize(response.getBody(), String.class); + assertEquals(EXPECTED_RESULT,body); + + } + + @Test(expected = RuntimeException.class) + public void invokePostMethodUnknownError() throws IOException { + + mockInterceptor.addRule() + .post("http://localhost:3500/v1.0/state") .respond(500, ResponseBody.create(MediaType.parse("application/json"), - "{\"errorCode\":\"500\",\"message\":\"Error\"}")); + "{\"errorCode\":\"null\",\"message\":\"null\"}")); - DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); - Mono mono = daprHttp.invokeAPI("GET","v1.0/get", headers, null); + Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); assertEquals(EXPECTED_RESULT,body); + + } + + @Test + public void getHeadersAndStatus(){ + + mockInterceptor.addRule() + .post("http://localhost:3500/v1.0/state") + .respond(500, ResponseBody.create(MediaType.parse("application/json"), + "{\"errorCode\":\"null\",\"message\":\"null\"}")); + + DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + + System.out.println(daprHttp); + } -} \ No newline at end of file +} From 4da0f0ac22bfc016029bb344bcc799084006c066 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 14 Jan 2020 14:57:23 -0600 Subject: [PATCH 2/2] Fixing styling Issues and adding new test --- .../java/io/dapr/client/DaprHttpTest.java | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java index bb9e38bc81..041c08a11e 100644 --- a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java +++ b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java @@ -39,19 +39,19 @@ public void setUp() throws Exception { public void invokeMethod() throws IOException { Map headers = new HashMap<>(); - headers.put("content-type","text/html"); - headers.put("header1","value1"); + headers.put("content-type", "text/html"); + headers.put("header1", "value1"); mockInterceptor.addRule() .post("http://localhost:3500/v1.0/state") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("POST", "v1.0/state", null, (byte[])null, headers); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @Test @@ -62,12 +62,12 @@ public void invokePostMethod() throws IOException { .respond(EXPECTED_RESULT) .addHeader("Header","Value"); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null,"", null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -78,12 +78,12 @@ public void invokeDeleteMethod() throws IOException { .delete("http://localhost:3500/v1.0/state") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("DELETE","v1.0/state", null, (String) null,null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -94,12 +94,12 @@ public void invokeGetMethod() throws IOException { .get("http://localhost:3500/v1.0/get") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("GET","v1.0/get",null, null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -107,18 +107,21 @@ public void invokeGetMethod() throws IOException { public void invokeMethodWithHeaders() throws IOException { Map headers = new HashMap<>(); - headers.put("header","value"); - headers.put("header1","value1"); + headers.put("header", "value"); + headers.put("header1", "value1"); + + Map urlParameters = new HashMap<>(); + urlParameters.put("orderId", "41"); mockInterceptor.addRule() - .get("http://localhost:3500/v1.0/get") + .get("http://localhost:3500/v1.0/state/order?orderId=41") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); - Mono mono = daprHttp.invokeAPI("GET","v1.0/get",null, headers); + Mono mono = daprHttp.invokeAPI("GET","v1.0/state/order", urlParameters, headers); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -129,12 +132,12 @@ public void invokePostMethodRuntime() throws IOException { .post("http://localhost:3500/v1.0/state") .respond(500); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -146,12 +149,12 @@ public void invokePostDaprError() throws IOException { .respond(500, ResponseBody.create(MediaType.parse("text"), "{\"errorCode\":null,\"message\":null}")); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -168,7 +171,7 @@ public void invokePostMethodUnknownError() throws IOException { Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); - assertEquals(EXPECTED_RESULT,body); + assertEquals(EXPECTED_RESULT, body); } @@ -180,7 +183,7 @@ public void getHeadersAndStatus(){ .respond(500, ResponseBody.create(MediaType.parse("application/json"), "{\"errorCode\":\"null\",\"message\":\"null\"}")); - DaprHttp daprHttp = new DaprHttp(3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); System.out.println(daprHttp);