Skip to content
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions tdd_intro/homework/04_weather_client/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class IWeatherClient
public:
virtual ~IWeatherClient() { }
virtual double GetAverageTemperature(IWeatherServer& server, const std::string& date) = 0;
// virtual double GetMinimumTemperature(IWeatherServer& server, const std::string& date) = 0;
virtual short GetMinimumTemperature(IWeatherServer& server, const std::string& date) = 0;
// virtual double GetMaximumTemperature(IWeatherServer& server, const std::string& date) = 0;
// virtual double GetAverageWindDirection(IWeatherServer& server, const std::string& date) = 0;
// virtual double GetMaximumWindSpeed(IWeatherServer& server, const std::string& date) = 0;
Expand Down Expand Up @@ -144,6 +144,22 @@ class WeatherClient : public IWeatherClient

return result/4;
}

short GetMinimumTemperature(IWeatherServer& server, const std::string& date)
{
std::vector<short> temps;
std::string response = server.GetWeather(date + ";03:00");
temps.push_back(ParseWeather(response).temperature);
response = server.GetWeather(date + ";09:00");
temps.push_back(ParseWeather(response).temperature);
response = server.GetWeather(date + ";15:00");
temps.push_back(ParseWeather(response).temperature);
response = server.GetWeather(date + ";21:00");
temps.push_back(ParseWeather(response).temperature);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

строчки для получения температуры по времени почти повторяются с GetAverageTemperature, нет рефакторинга, где этот код можно вынести в отдельный мето


std::vector<short>::iterator result = std::min_element(std::begin(temps), std::end(temps));
return *result;
}
};

Weather ParseWeather(const std::string &data)
Expand Down Expand Up @@ -266,5 +282,5 @@ TEST(WeatherClient, GetMinimumTemperatureFor31_08_2018)
WeatherServerStub server;
WeatherClient client;

ASSERT_FLOAT_EQ(25.5f, client.GetMinimumTemperature(server, "31.08.2018"));
ASSERT_EQ(20, client.GetMinimumTemperature(server, "31.08.2018"));
}