Skip to content

04 weather client #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tolikheha wants to merge 14 commits into
base: master
Choose a base branch
from
Open

04 weather client #10

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2858ac9
04 - Weather client - Class work
Jan 10, 2019
91eb0db
04 - Weather client - Added acceptance for GetAverageTemperature
Jan 10, 2019
ac17e6e
04 - Weather client - Added red test for GetMinimumTemperature
Jan 10, 2019
c1b8510
04 - Weather client - Fixed test for GetMinimumTemperature
Jan 10, 2019
9e19f9c
04 - Weather client - Added acceptance for GetMinimumTemperature
Jan 10, 2019
fec5895
04 - Weather client - Added red test for GetMaximumTemperature
Jan 10, 2019
f78aa66
04 - Weather client - Fixed test for GetMaximumTemperature
Jan 10, 2019
7d05801
04 - Weather client - Added acceptance for GetMaximumTemperature
Jan 10, 2019
67a411a
04 - Weather client - Added red test for GetAverageWindDirection
Jan 10, 2019
db61581
04 - Weather client - Added acceptance for GetAverageWindDirection
Jan 10, 2019
cf406ea
04 - Weather client - Added red test for GetAverageWindSpeed
Jan 10, 2019
ad36ef0
04 - Weather client - Fixed test for GetMaximumWindSpeed
Jan 10, 2019
39f94b1
04 - Weather client - Added acceptance for GetMaximumWindSpeed
Jan 10, 2019
3ad6830
04 - Weather client - Refactoring
Jan 10, 2019
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
32 changes: 30 additions & 2 deletions tdd_intro/homework/04_weather_client/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class IWeatherClient
virtual double GetAverageTemperature(IWeatherServer& server, const std::string& date) = 0;
virtual double 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 GetAverageWindDirection(IWeatherServer& server, const std::string& date) = 0;
// virtual double GetMaximumWindSpeed(IWeatherServer& server, const std::string& date) = 0;
};

Expand Down Expand Up @@ -168,6 +168,24 @@ class WeatherClient : public IWeatherClient

return *results.rbegin();
}

double GetAverageWindDirection(IWeatherServer& server, const std::string& date)
{
double result = 0;


std::string response = server.GetWeather(date + ";03:00");
result += ParseWeather(response).windDirection;
response = server.GetWeather(date + ";09:00");
result += ParseWeather(response).windDirection;
response = server.GetWeather(date + ";15:00");
result += ParseWeather(response).windDirection;
response = server.GetWeather(date + ";21:00");
Copy link
Collaborator

@prepas prepas Jan 10, 2019

Choose a reason for hiding this comment

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

строки с временем 03:00, 09:00 и т.д. повторяются

result += ParseWeather(response).windDirection;


return result/4;
}
};

Weather ParseWeather(const std::string &data)
Expand Down Expand Up @@ -298,5 +316,15 @@ TEST(WeatherClient, GetAverageWindDirectionFor31_08_2018)
WeatherServerStub server;
WeatherClient client;

ASSERT_DOUBLE_EQ(666, client.GetAverageWindDirecion(server, "31.08.2018"));
ASSERT_DOUBLE_EQ(189.25, client.GetAverageWindDirection(server, "31.08.2018"));
}

TEST(WeatherClient, AverageWindDirectionAcceptance)
{
WeatherServerStub server;
WeatherClient client;

ASSERT_DOUBLE_EQ(135.75, client.GetAverageWindDirection(server, "01.09.2018"));
ASSERT_DOUBLE_EQ(229, client.GetAverageWindDirection(server, "02.09.2018"));
EXPECT_THROW(client.GetAverageWindDirection(server, "03.09.2018"), std::runtime_error);
}