refs #875, refs #879, moved data generating functions to CTesting

(will be further split up/refactored)
This commit is contained in:
Klaus Basan
2017-02-11 12:00:43 +01:00
committed by Mathew Sutcliffe
parent 7917769802
commit d1827bd162
6 changed files with 74 additions and 92 deletions

View File

@@ -9,6 +9,7 @@
#include "testservice.h"
#include "testutils.h"
#include "testing.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/track.h"
@@ -343,13 +344,13 @@ namespace BlackMisc
CAtcStationList CTestService::getAtcStationList(int n) const
{
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " getAtcStationList" << endl;
return CTestUtils::getStations(n);
return CTesting::createAtcStations(n, false);
}
CAircraftCfgEntriesList CTestService::getAircraftCfgEntriesList(int n) const
{
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " getAircraftCfgEntriesList" << endl;
return CTestUtils::getAircraftCfgEntries(n);
return CTesting::getAircraftCfgEntries(n);
}
QList<QDBusObjectPath> CTestService::getObjectPaths(int n) const