Add tests to verify CF-RAY ID inclusion in timeout and unexpected error responses

Author: novalisdenahi

src/test/java/com/configcat/ConfigFetcherTest.java

@@ -5,6 +5,7 @@
 import okhttp3.OkHttpClient;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.SocketPolicy;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -86,7 +87,7 @@ public void fetchException() throws IOException, ExecutionException, Interrupted
     }
 
     @Test
-    public void fetchExceptionContainsCFRayIdIfPresented() throws IOException, ExecutionException, InterruptedException {
+    public void fetchTimeOutExceptionContainsCFRayIdIfPresented() throws IOException, ExecutionException, InterruptedException {
 
         ConfigFetcher fetch = new ConfigFetcher(new OkHttpClient.Builder()
                 .readTimeout(1, TimeUnit.SECONDS)
@@ -103,6 +104,41 @@ public void fetchExceptionContainsCFRayIdIfPresented() throws IOException, Execu
         assertTrue(response.entry().isEmpty());
         assertTrue(response.entry().getConfig().isEmpty());
 
+        assertTrue(response.error().toString().contains("Request timed out while trying to fetch config JSON."));
+        assertTrue(response.error().toString().contains("(Ray ID: 12345)"));
+        assertEquals("12345", response.cfRayId());
+
+        fetch.close();
+    }
+
+    @Test
+    public void fetchUnexpectedErrorExceptionContainsCFRayIdIfPresented() throws IOException, ExecutionException, InterruptedException {
+
+        ConfigFetcher fetch = new ConfigFetcher(
+                new OkHttpClient
+                        .Builder()
+                        .readTimeout(1, TimeUnit.SECONDS)
+                        .build(),
+                logger,
+                "",
+                this.server.url("/").toString(),
+                false,
+                PollingModes.manualPoll().getPollingIdentifier());
+
+        this.server.enqueue(
+                new MockResponse()
+                        .setResponseCode(200)
+                        .setHeader("CF-RAY", "12345")
+                        .setBody("test")
+                        .setSocketPolicy(SocketPolicy.DISCONNECT_DURING_RESPONSE_BODY));
+
+        FetchResponse response = fetch.fetchAsync(null).get();
+        assertTrue(response.isFailed());
+        assertTrue(response.entry().isEmpty());
+        assertTrue(response.entry().getConfig().isEmpty());
+
+        assertTrue(response.error().toString().contains("Unexpected error occurred while trying to fetch config JSON."));
+        assertTrue(response.error().toString().contains("(Ray ID: 12345)"));
         assertEquals("12345", response.cfRayId());
 
         fetch.close();