Reimplemented request executor. Added possibility to test requests with mocked http requests.

src/test/java/com/github/prominence/openweathermap/api/core/net/MockHttpClient.java

@@ -0,0 +1,31 @@
+package com.github.prominence.openweathermap.api.core.net;
+
+import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
+
+public class MockHttpClient implements HttpClient {
+    private String responseOutput;
+
+    @Override
+    public void setTimeoutSettings(TimeoutSettings timeoutSettings) {
+
+    }
+
+    @Override
+    public String executeGetRequest(String url) {
+        System.out.println("Executing request to " + url);
+
+        return responseOutput;
+    }
+
+    @Override
+    public String executePostRequest(String url, String body) {
+        System.out.println("Executing request to " + url);
+        System.out.println("Request body: " + body);
+
+        return responseOutput;
+    }
+
+    public void setResponseOutput(String responseOutput) {
+        this.responseOutput = responseOutput;
+    }
+}

src/test/java/com/github/prominence/openweathermap/api/mapper/FiveDayThreeHourStepForecastResponseMapperTest.java

@@ -9,7 +9,8 @@ import org.junit.jupiter.api.Test;
 import java.time.ZoneOffset;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class FiveDayThreeHourStepForecastResponseMapperTest {
 

src/test/java/com/github/prominence/openweathermap/api/mapper/RoadRiskResponseMapperTest.java

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class RoadRiskResponseMapperTest {
 

src/test/java/com/github/prominence/openweathermap/api/mapper/SolarRadiationResponseMapperTest.java

@@ -8,7 +8,8 @@ import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class SolarRadiationResponseMapperTest {
 

src/test/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastResponseMapperUnitTest.java

@@ -56,7 +56,7 @@ public class FiveDayThreeHourStepForecastResponseMapperUnitTest {
         assertNotNull(forecast);
         assertNotNull(forecast.getLocation());
         assertNotNull(forecast.getWeatherForecasts());
-        forecast.getWeatherForecasts().forEach(weatherForecast -> assertNull(weatherForecast.getWeatherStates()));
+        forecast.getWeatherForecasts().forEach(weatherForecast -> assertEquals(0, weatherForecast.getWeatherStates().size()));
     }
 
     @Test

src/test/java/com/github/prominence/openweathermap/api/request/roadrisk/RoadRiskIntegrationTest.java

@@ -0,0 +1,87 @@
+package com.github.prominence.openweathermap.api.request.roadrisk;
+
+import com.github.prominence.openweathermap.api.ApiTest;
+import com.github.prominence.openweathermap.api.core.net.MockHttpClient;
+import com.github.prominence.openweathermap.api.model.Coordinates;
+import com.github.prominence.openweathermap.api.model.roadrisk.RoadRiskRecord;
+import com.github.prominence.openweathermap.api.model.roadrisk.TrackPoint;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class RoadRiskIntegrationTest extends ApiTest {
+    private static final MockHttpClient httpClient = new MockHttpClient();
+
+    @BeforeAll
+    public static void setup() {
+        getClient().setHttpClient(httpClient);
+    }
+
+    @Test
+    public void whenGetSingleCurrentWeatherByCoordinateRequestAsJava_thenReturnNotNull() {
+        final TrackPoint trackPoint = new TrackPoint();
+        trackPoint.setCoordinates(Coordinates.of(5, 5));
+        trackPoint.setRequestedTime(LocalDateTime.now());
+
+        final String responseOutput = """
+                [
+                  {
+                    "dt": 1602702000,
+                    "coord": [
+                      7.27,
+                      44.04
+                    ],
+                    "weather": {
+                      "temp": 278.44,
+                      "wind_speed": 2.27,
+                      "wind_deg": 7,
+                      "precipitation_intensity": 0.38,
+                      "dew_point": 276.13
+                    },
+                    "road": {
+                      "state": 2,
+                      "temp": 293.85
+                    },
+                    "alerts": [
+                      {
+                        "sender_name": "METEO-FRANCE",
+                        "event": "Moderate thunderstorm warning",
+                        "event_level": 2
+                      }
+                    ]
+                  },
+                  {
+                    "dt": 1602702400,
+                    "coord": [
+                      7.37,
+                      45.04
+                    ],
+                    "weather": {
+                      "temp": 282.44,
+                      "wind_speed": 1.84,
+                      "wind_deg": 316,
+                      "dew_point": 275.99
+                    },
+                    "road": {
+                      "state": 1,
+                      "temp": 293.85
+                    },
+                    "alerts": [
+                    ]
+                  }
+                ]
+                """;
+        httpClient.setResponseOutput(responseOutput);
+
+        final List<RoadRiskRecord> roadRiskRecords = getClient()
+                .roadRisk()
+                .byTrackPoints(List.of(trackPoint))
+                .retrieve()
+                .asJava();
+
+        System.out.println(roadRiskRecords);
+    }
+
+}

src/test/java/com/github/prominence/openweathermap/api/utils/RequestUtilsUnitTest.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2021 Alexey Zinchenko
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.github.prominence.openweathermap.api.utils;
-
-import com.github.prominence.openweathermap.api.exception.NoDataFoundException;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class RequestUtilsUnitTest {
-    @Test
-    public void whenPassInvalidUrl_thenThrowAnException() {
-        assertThrows(IllegalArgumentException.class, () -> RequestUtils.getResponse("wrongUrl"));
-    }
-
-    @Test
-    public void whenPassUrlToNonExistingPage_thenThrowAnException() {
-        assertThrows(NoDataFoundException.class, () -> RequestUtils.getResponse("https://openweathermap.org/somePage"));
-    }
-}