flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 19:35:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T172, using centralized swift test server

Browse Source 
Remark: The credentials for the server were distributed in multiple places, now cnetralized in one
This commit is contained in:
Klaus Basan
2017-12-28 18:24:09 +01:00
parent c1df30fc55
commit 2c60dfd133
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/data/globalsetup.cpp
View File

@@ -233,7 +233,7 @@ namespace BlackCore
CServerList CGlobalSetup::getFsdTestServersPlusHardcodedServers() const 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); CServerList testServers(m_fsdTestServers);
testServers.addIfAddressNotExists(hardcoded); testServers.addIfAddressNotExists(hardcoded);
return testServers; return testServers;

2
src/blackcore/vatsim/vatsimsettings.h
View File

@@ -49,7 +49,7 @@ namespace BlackCore
static const BlackMisc::Network::CServer &defaultValue() static const BlackMisc::Network::CServer &defaultValue()
{ {
using namespace BlackMisc::Network; 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; return dv;
} }
}; };

3
src/blackmisc/test/testdata.cpp
View File

@@ -35,7 +35,8 @@ namespace BlackMisc
const CServer &CTestData::getTrafficServer() const CServer &CTestData::getTrafficServer()
{ {
static const CServer trafficServer("fooserver", "a foo server", "localhost", 1234, 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; return trafficServer;
} }

4
tests/blackcore/testnetwork.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackCoreTest
{ {
void CTestNetwork::networkTest(BlackCore::INetwork *net) 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."); } if (!this->pingServer(fsdServer)) { QSKIP("Server not reachable."); }
QString string = net->connectionStatusToString(INetwork::Connected); QString string = net->connectionStatusToString(INetwork::Connected);
@@ -102,7 +102,7 @@ namespace BlackCoreTest
bool CTestNetwork::pingServer(const CServer &server) bool CTestNetwork::pingServer(const CServer &server)
{ {
QString m; QString m;
CUrl url(server.getAddress(), server.getPort()); const CUrl url(server.getAddress(), server.getPort());
if (!CNetworkUtils::canConnect(url, m, 2500)) if (!CNetworkUtils::canConnect(url, m, 2500))
{ {
qWarning() << "Skipping unit test as" << url.getFullUrl() << "cannot be connected"; qWarning() << "Skipping unit test as" << url.getFullUrl() << "cannot be connected";

2
tests/blackmisc/testaviation.cpp
View File

@@ -171,7 +171,7 @@ namespace BlackMiscTest
CUser user2(user1); CUser user2(user1);
QVERIFY2(user1 == user2, "information shall be equal"); 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); CServer server2(server1);
QVERIFY2(server1 == server2, "server shall be equal"); QVERIFY2(server1 == server2, "server shall be equal");