Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 4126cab

Browse files
Skycoder42Skycoder42
committed
port to QtService 2.0.0
1 parent 2bc8375 commit 4126cab

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed

‎src/datasyncandroid/androidbackgroundservice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void AndroidBackgroundService::prepareSetup(Setup &setup)
4949

5050
QtService::Service::CommandResult AndroidBackgroundService::onStart()
5151
{
52-
return OperationCompleted;
52+
return CommandResult::Completed;
5353
}
5454

5555
QtService::Service::CommandResult AndroidBackgroundService::onStop(int &exitCode)
@@ -61,7 +61,7 @@ QtService::Service::CommandResult AndroidBackgroundService::onStop(int &exitCode
6161

6262
Setup::removeSetup(setupName(), true); //TODO make optional (rmwait, rmnowait, norm)
6363
exitCode = EXIT_SUCCESS;
64-
return OperationCompleted;
64+
return CommandResult::Completed;
6565
}
6666

6767
void AndroidBackgroundService::onSyncCompleted(SyncManager::SyncState state)

‎tests/auto/datasync/IntegrationTest/tst_integration.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ private Q_SLOTS:
2727
void unlock();
2828

2929
private:
30-
QtService::ServiceControl *server;
30+
QtService::ServiceControl *server = nullptr;
3131

32-
AccountManager *acc1;
33-
SyncManager *sync1;
34-
DataTypeStore<TestData> *store1;
32+
AccountManager *acc1 = nullptr;
33+
SyncManager *sync1 = nullptr;
34+
DataTypeStore<TestData> *store1 = nullptr;
3535

36-
AccountManager *acc2;
37-
SyncManager *sync2;
38-
DataTypeStore<TestData> *store2;
36+
AccountManager *acc2 = nullptr;
37+
SyncManager *sync2 = nullptr;
38+
DataTypeStore<TestData> *store2 = nullptr;
3939

4040
QUuid dev2Id;
4141
};
@@ -136,7 +136,7 @@ void IntegrationTest::cleanupTestCase()
136136
Setup::removeSetup(QStringLiteral("setup2"), true);
137137

138138
QVERIFY(server->stop());
139-
QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
139+
QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
140140
server->deleteLater();
141141
}
142142

‎tests/auto/datasync/TestAppServer/tst_appserver.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ private Q_SLOTS:
9696
private:
9797
QtService::ServiceControl *server;
9898

99-
MockClient *client;
99+
MockClient *client = nullptr;
100100
QString devName;
101101
QUuid devId;
102-
ClientCrypto *crypto;
102+
ClientCrypto *crypto = nullptr;
103103

104-
MockClient *partner;
104+
MockClient *partner = nullptr;
105105
QString partnerName;
106106
QUuid partnerDevId;
107-
ClientCrypto *partnerCrypto;
107+
ClientCrypto *partnerCrypto = nullptr;
108108

109109
void testAddDevice(MockClient *&partner, QUuid &partnerDevId, bool keepPartner = false);
110110

@@ -162,19 +162,19 @@ void TestAppServer::cleanupTestCase()
162162
{
163163
clean();
164164
clean(partner);
165-
if(server->status() == QtService::ServiceControl::ServiceRunning) {
165+
if(server->status() == QtService::ServiceControl::Status::Running) {
166166
QVERIFY(server->stop());
167-
QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
167+
QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
168168
}
169169
server->deleteLater();
170170
}
171171

172172
void TestAppServer::testStart()
173173
{
174174
QVERIFY(server->start());
175-
QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceRunning);
175+
QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Running);
176176
QEXPECT_FAIL("", "Server should not stop easily", Continue);
177-
QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
177+
QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
178178
}
179179

180180
void TestAppServer::testInvalidVersion()
@@ -1824,7 +1824,7 @@ void TestAppServer::testRemoveSelf()
18241824
void TestAppServer::testStop()
18251825
{
18261826
server->stop();
1827-
QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
1827+
QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
18281828
}
18291829

18301830
void TestAppServer::clean(bool disconnect)

‎tests/auto/datasync/TestLib/mockconnection.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ void MockConnection::sendPing()
4848

4949
void MockConnection::close()
5050
{
51-
_socket->close();
51+
if(_socket)
52+
_socket->close();
5253
}
5354

5455
bool MockConnection::waitForNothing()

‎tools/appserver/datasyncservice.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ QtService::Service::CommandResult DatasyncService::onStart()
5050
auto configPath = findConfig();
5151
if(configPath.isEmpty()) {
5252
qCritical() << "Unable to find any configuration file. Set it explicitly via the QDSAPP_CONFIG_FILE environment variable";
53-
return OperationFailed;
53+
return CommandResult::Failed;
5454
}
5555

5656
_config = new QSettings(configPath, QSettings::IniFormat, this);
@@ -59,7 +59,7 @@ QtService::Service::CommandResult DatasyncService::onStart()
5959
<< configPath
6060
<< "with error:"
6161
<< (_config->status() == QSettings::AccessError ? "Access denied" : "Invalid format");
62-
return OperationFailed;
62+
return CommandResult::Failed;
6363
}
6464

6565
//before anything else: set the log level
@@ -77,11 +77,11 @@ QtService::Service::CommandResult DatasyncService::onStart()
7777
Qt::QueuedConnection);
7878

7979
if(!_connector->setupWss())
80-
return OperationFailed;
80+
return CommandResult::Failed;
8181
_database->initialize();
8282

8383
qDebug() << QCoreApplication::applicationName() << "started successfully";
84-
return OperationPending;
84+
return CommandResult::Pending;
8585
}
8686

8787
QtService::Service::CommandResult DatasyncService::onStop(int &exitCode)
@@ -92,7 +92,7 @@ QtService::Service::CommandResult DatasyncService::onStop(int &exitCode)
9292
_mainPool->waitForDone();
9393
exitCode = EXIT_SUCCESS;
9494
qDebug() << "Server stopped";
95-
return OperationCompleted;
95+
return CommandResult::Completed;
9696
}
9797

9898
QtService::Service::CommandResult DatasyncService::onReload()
@@ -105,7 +105,7 @@ QtService::Service::CommandResult DatasyncService::onReload()
105105
<< "with error:"
106106
<< (_config->status() == QSettings::AccessError ? "Access denied" : "Invalid format");
107107
qCritical() << "Reload failed. Configuration has not been reloaded!";
108-
return OperationFailed;
108+
return CommandResult::Failed;
109109
}
110110

111111
// before anything else: set the log level
@@ -119,25 +119,25 @@ QtService::Service::CommandResult DatasyncService::onReload()
119119
_connector->recreateServer();
120120
if(!_connector->setupWss() ||
121121
!_connector->listen()) {
122-
return OperationFailed;
122+
return CommandResult::Failed;
123123
}
124124

125125
qDebug() << QCoreApplication::applicationName() << "completed reloading";
126-
return OperationCompleted;
126+
return CommandResult::Completed;
127127
}
128128

129129
QtService::Service::CommandResult DatasyncService::onPause()
130130
{
131131
qDebug() << "Pausing server...";
132132
_connector->setPaused(true);
133-
return OperationCompleted;
133+
return CommandResult::Completed;
134134
}
135135

136136
QtService::Service::CommandResult DatasyncService::onResume()
137137
{
138138
qDebug() << "Resuming server...";
139139
_connector->setPaused(false);
140-
return OperationCompleted;
140+
return CommandResult::Completed;
141141
}
142142

143143
void DatasyncService::completeStartup(bool ok)

0 commit comments

Comments
 (0)