From d7897b3d25816d2ca2b35e4af7bb573ef2eb3d14 Mon Sep 17 00:00:00 2001 From: korlov42 Date: Fri, 9 Oct 2020 23:25:48 +0300 Subject: [PATCH] fix failed testSSLConnectionFailsIfOnlyHttpConfigured --- .../okhttp/OkHttpCommandExecutorServiceTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java b/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java index 877cf88fd7..bf67b0b200 100644 --- a/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java +++ b/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import java.io.Closeable; +import java.io.IOException; import java.util.List; import java.util.Properties; @@ -167,7 +168,7 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer } } - @Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = "Failed to connect to.*") + @Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = "Unable to find acceptable protocols.*") public void testSSLConnectionFailsIfOnlyHttpConfigured() throws Exception { MockWebServer server = mockWebServer(new MockResponse()); server.useHttps(sslSocketFactory(), false); @@ -231,6 +232,15 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer } } + protected static MockWebServer mockWebServer(MockResponse... responses) throws IOException { + MockWebServer server = new MockWebServer(); + server.start(null, 0); + for (MockResponse response : responses) { + server.enqueue(response); + } + return server; + } + @ConfiguresHttpCommandExecutorService private static final class ConnectionSpecModule extends AbstractModule { private final List connectionSpecs;