mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

tests: move Proxy test from testpreferences

Browse source 
Remove Proxy test in testpreferences
add the same Proxy tests to testqPrefProxy

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-28 19:03:58 +02:00 • committed by Dirk Hohndel
parent e198230c83
commit 7acd489891
3 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tests/testpreferences.cpp
View file

@ -177,35 +177,6 @@ void TestPreferences::testPreferences()
TEST(geo->secondTaxonomyCategory(), TC_COUNTRY);
TEST(geo->thirdTaxonomyCategory(), TC_NONE);
auto proxy = qPrefProxy::instance();
proxy->set_proxy_type(2);
proxy->set_proxy_port(80);
proxy->set_proxy_auth(true);
proxy->set_proxy_host("localhost");
proxy->set_proxy_user("unknown");
proxy->set_proxy_pass("secret");
TEST(proxy->proxy_type(), 2);
TEST(proxy->proxy_port(), 80);
TEST(proxy->proxy_auth(), true);
TEST(proxy->proxy_host(), QStringLiteral("localhost"));
TEST(proxy->proxy_user(), QStringLiteral("unknown"));
TEST(proxy->proxy_pass(), QStringLiteral("secret"));
proxy->set_proxy_type(3);
proxy->set_proxy_port(8080);
proxy->set_proxy_auth(false);
proxy->set_proxy_host("127.0.0.1");
proxy->set_proxy_user("unknown_1");
proxy->set_proxy_pass("secret_1");
TEST(proxy->proxy_type(), 3);
TEST(proxy->proxy_port(), 8080);
TEST(proxy->proxy_auth(), false);
TEST(proxy->proxy_host(), QStringLiteral("127.0.0.1"));
TEST(proxy->proxy_user(), QStringLiteral("unknown_1"));
TEST(proxy->proxy_pass(), QStringLiteral("secret_1"));
auto planner = pref->planner_settings;
planner->setLastStop(true);
planner->setVerbatimPlan(true);

39
tests/testqPrefProxy.cpp
View file

@ -132,4 +132,43 @@ void TestQPrefProxy::test_multiple()
QCOMPARE(tst->proxy_type(), 25);
}
#define TEST(METHOD, VALUE) \
QCOMPARE(METHOD, VALUE); \
proxy->sync(); \
proxy->load(); \
QCOMPARE(METHOD, VALUE);
void TestQPrefProxy::test_oldPreferences()
{
auto proxy = qPrefProxy::instance();
proxy->set_proxy_type(2);
proxy->set_proxy_port(80);
proxy->set_proxy_auth(true);
proxy->set_proxy_host("localhost");
proxy->set_proxy_user("unknown");
proxy->set_proxy_pass("secret");
TEST(proxy->proxy_type(), 2);
TEST(proxy->proxy_port(), 80);
TEST(proxy->proxy_auth(), true);
TEST(proxy->proxy_host(), QStringLiteral("localhost"));
TEST(proxy->proxy_user(), QStringLiteral("unknown"));
TEST(proxy->proxy_pass(), QStringLiteral("secret"));
proxy->set_proxy_type(3);
proxy->set_proxy_port(8080);
proxy->set_proxy_auth(false);
proxy->set_proxy_host("127.0.0.1");
proxy->set_proxy_user("unknown_1");
proxy->set_proxy_pass("secret_1");
TEST(proxy->proxy_type(), 3);
TEST(proxy->proxy_port(), 8080);
TEST(proxy->proxy_auth(), false);
TEST(proxy->proxy_host(), QStringLiteral("127.0.0.1"));
TEST(proxy->proxy_user(), QStringLiteral("unknown_1"));
TEST(proxy->proxy_pass(), QStringLiteral("secret_1"));
}
QTEST_MAIN(TestQPrefProxy)

1
tests/testqPrefProxy.h
View file

@ -14,6 +14,7 @@ private slots:
void test_set_load_struct();
void test_struct_disk();
void test_multiple();
void test_oldPreferences();
};
#endif // TESTQPREFPROXY_H