arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 06:45:48 +00:00
Code Issues Projects Releases Wiki Activity

Return to owm weather provider

Browse Source 
Since yahoo support already exists, so I've added new option
X-AW-Provider (apiver 3). Added tests for these cases
This commit is contained in:
Evgenii Alekseev
2016-06-02 11:09:02 +03:00
parent 4337379177
commit 620c4bd1e3
26 changed files with 704 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
sources/test/testextweather.cpp
View File

@ -30,6 +30,7 @@ void TestExtWeather::initTestCase()
extWeather->setCity(city);
extWeather->setCountry(country);
extWeather->setNumber(0);
extWeather->setProvider(ExtWeather::Provider::OWM);
extWeather->run();
}
@ -47,62 +48,28 @@ void TestExtWeather::test_values()
QCOMPARE(extWeather->number(), 0);
QCOMPARE(extWeather->city(), city);
QCOMPARE(extWeather->country(), country);
QCOMPARE(extWeather->provider(), ExtWeather::Provider::OWM);
}
void TestExtWeather::test_run()
void TestExtWeather::test_runOWM()
{
// init spy
QSignalSpy spy(extWeather, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extWeather->run();
run();
}
// check values
QVERIFY(spy.wait(5000));
QVariantHash arguments = spy.takeFirst().at(0).toHash();
QEXPECT_FAIL("", "WeatherID should not be 0", Continue);
QCOMPARE(arguments[extWeather->tag(QString("weatherId"))].toInt(), 0);
QVERIFY((arguments[extWeather->tag(QString("humidity"))].toInt()
> humidity.first)
&& (arguments[extWeather->tag(QString("humidity"))].toInt()
< humidity.second));
QEXPECT_FAIL("", "https://yahoo.uservoice.com/forums/207813-us-weather/"
"suggestions/14209233-invalid-pressure-calculation",
Continue);
QVERIFY((arguments[extWeather->tag(QString("pressure"))].toFloat()
> pressure.first)
&& (arguments[extWeather->tag(QString("pressure"))].toInt()
< pressure.second));
QVERIFY((arguments[extWeather->tag(QString("temperature"))].toFloat()
> temp.first)
&& (arguments[extWeather->tag(QString("temperature"))].toInt()
< temp.second));
// image should be only one symbol here
QCOMPARE(arguments[extWeather->tag(QString("weather"))].toString().count(),
1);
void TestExtWeather::test_runYahoo()
{
extWeather->setProvider(ExtWeather::Provider::Yahoo);
run();
extWeather->setProvider(ExtWeather::Provider::OWM);
}
void TestExtWeather::test_ts()
{
extWeather->setTs(1);
// init spy
QSignalSpy spy(extWeather, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extWeather->run();
// check values
QVERIFY(spy.wait(5000));
QVariantHash arguments = spy.takeFirst().at(0).toHash();
QEXPECT_FAIL("", "WeatherID should not be 0", Continue);
QCOMPARE(arguments[extWeather->tag(QString("weatherId"))].toInt(), 0);
QCOMPARE(arguments[extWeather->tag(QString("humidity"))].toInt(), 0);
QCOMPARE(arguments[extWeather->tag(QString("pressure"))].toFloat(), 0.0f);
QVERIFY((arguments[extWeather->tag(QString("temperature"))].toFloat()
> temp.first)
&& (arguments[extWeather->tag(QString("temperature"))].toInt()
< temp.second));
// image should be only one symbol here
QCOMPARE(arguments[extWeather->tag(QString("weather"))].toString().count(),
1);
run();
}
@ -131,10 +98,43 @@ void TestExtWeather::test_copy()
QCOMPARE(newExtWeather->country(), extWeather->country());
QCOMPARE(newExtWeather->ts(), extWeather->ts());
QCOMPARE(newExtWeather->image(), extWeather->image());
QCOMPARE(newExtWeather->provider(), extWeather->provider());
QCOMPARE(newExtWeather->number(), 1);
delete newExtWeather;
}
void TestExtWeather::run()
{
// init spy
QSignalSpy spy(extWeather, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extWeather->run();
// check values
QVERIFY(spy.wait(5000));
QVariantHash arguments = spy.takeFirst().at(0).toHash();
QEXPECT_FAIL("", "WeatherID should not be 0", Continue);
QCOMPARE(arguments[extWeather->tag(QString("weatherId"))].toInt(), 0);
QVERIFY((arguments[extWeather->tag(QString("humidity"))].toInt()
>= humidity.first)
&& (arguments[extWeather->tag(QString("humidity"))].toInt()
<= humidity.second));
QWARN("May fail here for Yahoo! Weather, see "
"https://yahoo.uservoice.com/forums/207813-us-weather/suggestions/"
"14209233-invalid-pressure-calculation");
QVERIFY((arguments[extWeather->tag(QString("pressure"))].toFloat()
> pressure.first)
&& (arguments[extWeather->tag(QString("pressure"))].toInt()
< pressure.second));
QVERIFY((arguments[extWeather->tag(QString("temperature"))].toFloat()
> temp.first)
&& (arguments[extWeather->tag(QString("temperature"))].toInt()
< temp.second));
// image should be only one symbol here
QCOMPARE(arguments[extWeather->tag(QString("weather"))].toString().count(),
1);
}
QTEST_MAIN(TestExtWeather);

4
sources/test/testextweather.h
View File

@ -34,12 +34,14 @@ private slots:
void cleanupTestCase();
// test
void test_values();
void test_run();
void test_runOWM();
void test_runYahoo();
void test_ts();
void test_image();
void test_copy();
private:
void run();
ExtWeather *extWeather = nullptr;
QString city = QString("London");
QString country = QString("uk");