From a2915a22956c359f2c3e74ffccebb95c032db91a Mon Sep 17 00:00:00 2001 From: swayfarer <@dkamensky@licei10.ru> Date: Thu, 22 May 2025 19:20:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/OpenWeatherMapWeatherProvider.java | 1 - .../provider/WeatherProviderRegistry.java | 4 ++++ src/test/java/CLIInputReaderTest.java | 9 +++++++++ .../city/WeatherProviderCLISelectorTest.java | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java diff --git a/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java b/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java index 203b2b3..5f56408 100644 --- a/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java +++ b/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java @@ -33,7 +33,6 @@ public class OpenWeatherMapWeatherProvider implements WeatherProvider { for (var day = 0; day < 7; day ++) { var forecast = weatherArray.getJSONObject(day); var mainData = forecast.getJSONObject("main"); - var temperature = mainData.getDouble("temp"); resultWeeklyWeather.perDayWeather.add(new WeatherInfo(temperature)); } diff --git a/src/main/java/ru/dima/weather/provider/WeatherProviderRegistry.java b/src/main/java/ru/dima/weather/provider/WeatherProviderRegistry.java index 0c09178..d8e858d 100644 --- a/src/main/java/ru/dima/weather/provider/WeatherProviderRegistry.java +++ b/src/main/java/ru/dima/weather/provider/WeatherProviderRegistry.java @@ -15,4 +15,8 @@ public class WeatherProviderRegistry { public List getAllWeatherProviders() { return Collections.unmodifiableList(registeredWeatherProviders); } + + public void addWeatherProvider(WeatherProvider a) { + + } } diff --git a/src/test/java/CLIInputReaderTest.java b/src/test/java/CLIInputReaderTest.java index c934b6c..1ca33be 100644 --- a/src/test/java/CLIInputReaderTest.java +++ b/src/test/java/CLIInputReaderTest.java @@ -18,6 +18,15 @@ public class CLIInputReaderTest { String result = inputReader.readString(); assertEquals("а", result, ":("); } + @Test + void TestReadInteger(){ + var j = "1"; + InputStream inputStream = new ByteArrayInputStream(j.getBytes()); + var inputReadString = new CLIInputReader(inputStream); + int result = inputReadString.readInteger(); + assertEquals(1 , result , "в этом коде мои слезы"); + + } } diff --git a/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java b/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java new file mode 100644 index 0000000..4e5b8ad --- /dev/null +++ b/src/test/java/ru/dima/weather/city/WeatherProviderCLISelectorTest.java @@ -0,0 +1,17 @@ +package ru.dima.weather.city; + +import org.junit.jupiter.api.Test; +import ru.dima.weather.cli.CLIInputReader; +import ru.dima.weather.cli.WeatherProviderCLISelector; +import ru.dima.weather.provider.WeatherProvider; +import ru.dima.weather.provider.WeatherProviderRegistry; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.Scanner; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class WeatherProviderCLISelectorTest { + +} \ No newline at end of file