ETM-Schurig/powersync-remoteproxy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Simon Stürz 2018-08-15 11:07:05 +02:00
parent e0864b3834
commit 8f5cc9b6cb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-remoteproxy/engine.cpp
View File

@ -34,7 +34,6 @@ void Engine::start(ProxyConfiguration *configuration)
{ {
// Make sure an authenticator was registered // Make sure an authenticator was registered
Q_ASSERT_X(m_authenticator != nullptr, "Engine", "There is no authenticator registerd."); Q_ASSERT_X(m_authenticator != nullptr, "Engine", "There is no authenticator registerd.");
Q_ASSERT_X(m_configuration != nullptr, "Engine", "There is no configuration set.");
if (!m_running) if (!m_running)
qCDebug(dcEngine()) << "Start server engine"; qCDebug(dcEngine()) << "Start server engine";
@ -43,6 +42,8 @@ void Engine::start(ProxyConfiguration *configuration)
clean(); clean();
m_configuration = configuration; m_configuration = configuration;
Q_ASSERT_X(configuration != nullptr, "Engine", "There is no configuration set.");
m_proxyServer = new ProxyServer(this); m_proxyServer = new ProxyServer(this);
m_webSocketServer = new WebSocketServer(m_sslConfiguration, this); m_webSocketServer = new WebSocketServer(m_sslConfiguration, this);
@ -50,7 +51,7 @@ void Engine::start(ProxyConfiguration *configuration)
websocketServerUrl.setScheme("wss"); websocketServerUrl.setScheme("wss");
websocketServerUrl.setHost(m_configuration->webSocketServerHost().toString()); websocketServerUrl.setHost(m_configuration->webSocketServerHost().toString());
websocketServerUrl.setPort(m_configuration->webSocketServerPort()); websocketServerUrl.setPort(m_configuration->webSocketServerPort());
qDebug() << "WSS url is:" << websocketServerUrl;
m_webSocketServer->setServerUrl(websocketServerUrl); m_webSocketServer->setServerUrl(websocketServerUrl);
m_proxyServer->registerTransportInterface(m_webSocketServer); m_proxyServer->registerTransportInterface(m_webSocketServer);

3
tests/offline/nymea-remoteproxy-tests-offline.cpp
View File

@ -28,12 +28,11 @@ void RemoteProxyTests::dummyAuthenticator()
DummyAuthenticator *dummyAuthenticator = new DummyAuthenticator(this); DummyAuthenticator *dummyAuthenticator = new DummyAuthenticator(this);
// Start proxy webserver // Start proxy webserver
Engine::instance()->setConfiguration(m_configuration);
Engine::instance()->setAuthenticator(dummyAuthenticator); Engine::instance()->setAuthenticator(dummyAuthenticator);
Engine::instance()->setSslConfiguration(m_sslConfiguration); Engine::instance()->setSslConfiguration(m_sslConfiguration);
QSignalSpy runningSpy(Engine::instance(), &Engine::runningChanged); QSignalSpy runningSpy(Engine::instance(), &Engine::runningChanged);
Engine::instance()->start(); Engine::instance()->start(m_configuration);
runningSpy.wait(); runningSpy.wait();
QVERIFY(runningSpy.count() == 1); QVERIFY(runningSpy.count() == 1);

2
tests/testbase/basetest.cpp
View File

@ -92,7 +92,7 @@ void BaseTest::startServer()
QSignalSpy runningSpy(Engine::instance(), &Engine::runningChanged); QSignalSpy runningSpy(Engine::instance(), &Engine::runningChanged);
Engine::instance()->setConfiguration(m_configuration); Engine::instance()->setConfiguration(m_configuration);
Engine::instance()->setDeveloperModeEnabled(true); Engine::instance()->setDeveloperModeEnabled(true);
Engine::instance()->start(); Engine::instance()->start(m_configuration);
runningSpy.wait(); runningSpy.wait();
QVERIFY(runningSpy.count() == 1); QVERIFY(runningSpy.count() == 1);
} }