diff --git a/src/test/java/ru/dima/weather/city/OpenWeatherMapWeatherProviderTest.java b/src/test/java/ru/dima/weather/city/OpenWeatherMapWeatherProviderTest.java index 8a604aa..54b35bc 100644 --- a/src/test/java/ru/dima/weather/city/OpenWeatherMapWeatherProviderTest.java +++ b/src/test/java/ru/dima/weather/city/OpenWeatherMapWeatherProviderTest.java @@ -6,6 +6,8 @@ import ru.dima.weather.provider.MultiDaysWeatherInfo; import ru.dima.weather.provider.OpenWeatherMapWeatherProvider; import ru.dima.weather.provider.WeatherInfo; +import java.util.Random; + import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -23,7 +25,7 @@ public class OpenWeatherMapWeatherProviderTest { assertEquals("open-weather-map", OpenWeatherMapWeatherProvider.getName(), "open-weather-map"); } @Test - void TestMultiDaysWeatherInfo() { + void TestMultiDaysWeatherInfo_T() { HttpRequester httpRequester = mock(HttpRequester.class); String ft = "{\"list\": [{\"main\": {\"temp\": 22.5}}, {\"main\": {\"temp\": 19.85}}, {\"main\": {\"temp\": 20.97}}, {\"main\": {\"temp\": 22.19}}, {\"main\": {\"temp\": 25.41}}, {\"main\": {\"temp\": 26.21}}, {\"main\": {\"temp\": 22.53}}]}"; @@ -35,4 +37,19 @@ public class OpenWeatherMapWeatherProviderTest { assertEquals("MultiDaysWeatherInfo{perDayWeather=[WeatherInfo{temperature=22.5}, WeatherInfo{temperature=19.85}, WeatherInfo{temperature=20.97}, WeatherInfo{temperature=22.19}, WeatherInfo{temperature=25.41}, WeatherInfo{temperature=26.21}, WeatherInfo{temperature=22.53}]}",weatherInfo,"s"); } + @Test + void TestMultiDaysWeatherInfo_F() { + HttpRequester httpRequester = mock(HttpRequester.class); + String ffd = "{\"list\": [{\"main\": {\"temp\": 22.5}}, {\"main\": {\"temp\": 19.85}}, {\"main\": {\"temp\": 20.97}}, {\"main\": {\"temp\": 22.19}}, {\"main\": {\"temp\": 25.41}}, {\"main\": {\"temp\": 26.21}}, {\"main\": {\"temp\": 22.53}}]}"; + + + when(httpRequester.getString(anyString())).thenReturn(ffd); + + OpenWeatherMapWeatherProvider openWeatherMapWeatherProvider = new OpenWeatherMapWeatherProvider(httpRequester , "29ed5ca47c3d0c32385b18f1e82e522f" ); + Random random = new Random(); + var ran = random.toString(); + var weatherInfo = openWeatherMapWeatherProvider.getWeeklyWeatherInCity(ran); + assertEquals("MultiDaysWeatherInfo{perDayWeather=[WeatherInfo{temperature=22.5}, WeatherInfo{temperature=19.85}, WeatherInfo{temperature=20.97}, WeatherInfo{temperature=22.19}, WeatherInfo{temperature=25.41}, WeatherInfo{temperature=26.21}, WeatherInfo{temperature=22.53}]}",weatherInfo,"s"); + + } } \ No newline at end of file diff --git a/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java b/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java index 8a04977..39619a9 100644 --- a/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java +++ b/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java @@ -38,7 +38,7 @@ public class WeatherProviderCLISelectorTest { WeatherProvider provider = Mockito.mock("open-weather-map"); List providers = Arrays.asList(provider); when(weatherProviderRegistry.getAllWeatherProviders()).thenReturn(providers); - var j = "3"; + var j = "GYg"; InputStream inputStream = new ByteArrayInputStream(j.getBytes()); CLIInputReader inputReader = new CLIInputReader(inputStream);