From 2892e9347673c2e47b0930f0f6c89558c806c833 Mon Sep 17 00:00:00 2001 From: Ivan Paolillo Date: Wed, 19 Oct 2016 11:01:40 +0200 Subject: [PATCH 1/3] Code improvement --- .../baeldung/okhttp/OkHttpGetLiveTest.java | 3 ++ .../baeldung/okhttp/OkHttpMiscLiveTest.java | 28 +++++++------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java index 9a49c8d9a2..dc80ce7cf5 100644 --- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java @@ -14,6 +14,9 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +//@RunWith(SpringJUnit4ClassRunner.class) +//@WebAppConfiguration +//@ContextConfiguration(locations = "file:src/main/webapp/WEB-INF/api-servlet.xml") public class OkHttpGetLiveTest { private static final String BASE_URL = "http://localhost:8080/spring-rest"; diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java index c44500f4be..dcdb4e328c 100644 --- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java @@ -37,7 +37,7 @@ public class OkHttpMiscLiveTest { response.close(); } - @Test + @Test(expected = IOException.class) public void whenCancelRequest_thenCorrect() throws IOException { ScheduledExecutorService executor = Executors.newScheduledThreadPool(1); @@ -49,30 +49,22 @@ public class OkHttpMiscLiveTest { .build(); final int seconds = 1; - final long startNanos = System.nanoTime(); + final Call call = client.newCall(request); // Schedule a job to cancel the call in 1 second. - executor.schedule(new Runnable() { - public void run() { + executor.schedule(() -> { + + logger.debug("Canceling call: " + (System.nanoTime() - startNanos) / 1e9f); + call.cancel(); + logger.debug("Canceled call: " + (System.nanoTime() - startNanos) / 1e9f); - logger.debug("Canceling call: " + (System.nanoTime() - startNanos) / 1e9f); - call.cancel(); - logger.debug("Canceled call: " + (System.nanoTime() - startNanos) / 1e9f); - } }, seconds, TimeUnit.SECONDS); - try { - - logger.debug("Executing call: " + (System.nanoTime() - startNanos) / 1e9f); - Response response = call.execute(); - logger.debug("Call was expected to fail, but completed: " + (System.nanoTime() - startNanos) / 1e9f, response); - - } catch (IOException e) { - - logger.debug("Call failed as expected: " + (System.nanoTime() - startNanos) / 1e9f, e); - } + logger.debug("Executing call: " + (System.nanoTime() - startNanos) / 1e9f); + Response response = call.execute(); + logger.debug("Call completed: " + (System.nanoTime() - startNanos) / 1e9f, response); } @Test From 35dbb1cfb0206f2c518597b52a77c13c2ba3b6ea Mon Sep 17 00:00:00 2001 From: Ivan Paolillo Date: Wed, 19 Oct 2016 12:18:03 +0200 Subject: [PATCH 2/3] Code improvement --- .../java/org/baeldung/okhttp/OkHttpGetLiveTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java index dc80ce7cf5..8049e23784 100644 --- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java @@ -2,6 +2,7 @@ package org.baeldung.okhttp; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.io.IOException; @@ -21,7 +22,7 @@ public class OkHttpGetLiveTest { private static final String BASE_URL = "http://localhost:8080/spring-rest"; - @Test + //@Test public void whenGetRequest_thenCorrect() throws IOException { OkHttpClient client = new OkHttpClient(); @@ -36,7 +37,7 @@ public class OkHttpGetLiveTest { assertThat(response.code(), equalTo(200)); } - @Test + //@Test public void whenGetRequestWithQueryParameter_thenCorrect() throws IOException { OkHttpClient client = new OkHttpClient(); @@ -57,7 +58,7 @@ public class OkHttpGetLiveTest { } @Test - public void whenAsynchronousGetRequest_thenCorrect() { + public void whenAsynchronousGetRequest_thenCorrect() throws InterruptedException { OkHttpClient client = new OkHttpClient(); @@ -70,12 +71,16 @@ public class OkHttpGetLiveTest { call.enqueue(new Callback() { public void onResponse(Call call, Response response) throws IOException { + assertThat(response.code(), equalTo(200)); } public void onFailure(Call call, IOException e) { + fail(); } }); + + Thread.sleep(3000); } } From 91faa251d51a76cff2451c19ec6404166446bae4 Mon Sep 17 00:00:00 2001 From: Ivan Paolillo Date: Wed, 19 Oct 2016 12:23:03 +0200 Subject: [PATCH 3/3] Code improvement --- .../test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java index 8049e23784..632d7577a4 100644 --- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java @@ -22,7 +22,7 @@ public class OkHttpGetLiveTest { private static final String BASE_URL = "http://localhost:8080/spring-rest"; - //@Test + @Test public void whenGetRequest_thenCorrect() throws IOException { OkHttpClient client = new OkHttpClient(); @@ -37,7 +37,7 @@ public class OkHttpGetLiveTest { assertThat(response.code(), equalTo(200)); } - //@Test + @Test public void whenGetRequestWithQueryParameter_thenCorrect() throws IOException { OkHttpClient client = new OkHttpClient(); @@ -71,12 +71,10 @@ public class OkHttpGetLiveTest { call.enqueue(new Callback() { public void onResponse(Call call, Response response) throws IOException { - assertThat(response.code(), equalTo(200)); } public void onFailure(Call call, IOException e) { - fail(); } });