From 2c60dfd133dfa074d3bb0097b12834a9917d6ea5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 28 Dec 2017 18:24:09 +0100 Subject: [PATCH] Ref T172, using centralized swift test server Remark: The credentials for the server were distributed in multiple places, now cnetralized in one --- src/blackcore/data/globalsetup.cpp | 2 +- src/blackcore/vatsim/vatsimsettings.h | 2 +- src/blackmisc/test/testdata.cpp | 3 ++- tests/blackcore/testnetwork.cpp | 4 ++-- tests/blackmisc/testaviation.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index d67640af9..2ed95a2af 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -233,7 +233,7 @@ namespace BlackCore CServerList CGlobalSetup::getFsdTestServersPlusHardcodedServers() const { - static const CServerList hardcoded({ CServer("swift", "swift Testserver", "vatsim-germany.org", 6809, CUser("1234567", "swift Test User", "", "123456"), CServer::FSDServerVatsim, true) }); + static const CServerList hardcoded({ CServer::swiftFsdTestServer() }); CServerList testServers(m_fsdTestServers); testServers.addIfAddressNotExists(hardcoded); return testServers; diff --git a/src/blackcore/vatsim/vatsimsettings.h b/src/blackcore/vatsim/vatsimsettings.h index e089ae203..2461649ba 100644 --- a/src/blackcore/vatsim/vatsimsettings.h +++ b/src/blackcore/vatsim/vatsimsettings.h @@ -49,7 +49,7 @@ namespace BlackCore static const BlackMisc::Network::CServer &defaultValue() { using namespace BlackMisc::Network; - static const CServer dv("Testserver", "Client project testserver", "fsd.swift-project.org", 6809, CUser("guest", "Guest Client project", "", "guest")); + static const CServer dv = CServer::swiftFsdTestServer(); return dv; } }; diff --git a/src/blackmisc/test/testdata.cpp b/src/blackmisc/test/testdata.cpp index b314ce024..636533ea7 100644 --- a/src/blackmisc/test/testdata.cpp +++ b/src/blackmisc/test/testdata.cpp @@ -35,7 +35,8 @@ namespace BlackMisc const CServer &CTestData::getTrafficServer() { static const CServer trafficServer("fooserver", "a foo server", "localhost", 1234, - CUser("112233", "Some real name", "email@xyz.com", "secret")); + CUser("112233", "Some real name", "email@xyz.com", "secret"), + CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim); return trafficServer; } diff --git a/tests/blackcore/testnetwork.cpp b/tests/blackcore/testnetwork.cpp index 00cddcc4b..ac10e7b3b 100644 --- a/tests/blackcore/testnetwork.cpp +++ b/tests/blackcore/testnetwork.cpp @@ -45,7 +45,7 @@ namespace BlackCoreTest { void CTestNetwork::networkTest(BlackCore::INetwork *net) { - CServer fsdServer("", "", "fsd.swift-project.org", 6809, CUser("1234567", "", "", "123456")); + const CServer fsdServer = CServer::swiftFsdTestServer(true); if (!this->pingServer(fsdServer)) { QSKIP("Server not reachable."); } QString string = net->connectionStatusToString(INetwork::Connected); @@ -102,7 +102,7 @@ namespace BlackCoreTest bool CTestNetwork::pingServer(const CServer &server) { QString m; - CUrl url(server.getAddress(), server.getPort()); + const CUrl url(server.getAddress(), server.getPort()); if (!CNetworkUtils::canConnect(url, m, 2500)) { qWarning() << "Skipping unit test as" << url.getFullUrl() << "cannot be connected"; diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp index cd842a155..c061ad6d5 100644 --- a/tests/blackmisc/testaviation.cpp +++ b/tests/blackmisc/testaviation.cpp @@ -171,7 +171,7 @@ namespace BlackMiscTest CUser user2(user1); QVERIFY2(user1 == user2, "information shall be equal"); - CServer server1("development", "VATSIM dev.server", "vatsim-germany.org", 6809, user1); + CServer server1 = CServer::swiftFsdTestServer(); CServer server2(server1); QVERIFY2(server1 == server2, "server shall be equal");