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

fix inline comments

Browse Source
This commit is contained in:
Simon Stürz 2017-10-10 16:03:49 +02:00 committed by Michael Zanetti
parent e7b45d7dee
commit 858846897c
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libguh-core/guhconfiguration.cpp
View File

@ -165,7 +165,7 @@ void GuhConfiguration::setServerName(const QString &serverName)
GuhSettings settings(GuhSettings::SettingsRoleGlobal);
settings.beginGroup("guhd");
if (settings.value("name").toString() == serverName) {
qCDebug(dcApplication()) << "Configuration: Server name unchainged.";
qCDebug(dcApplication()) << "Configuration: Server name unchanged.";
settings.endGroup();
} else {
settings.setValue("name", serverName);
@ -188,7 +188,7 @@ void GuhConfiguration::setTimeZone(const QByteArray &timeZone)
GuhSettings settings(GuhSettings::SettingsRoleGlobal);
settings.beginGroup("guhd");
if (settings.value("timeZone").toByteArray() == timeZone) {
qCDebug(dcApplication()) << "Configuration: Time zone unchainged.";
qCDebug(dcApplication()) << "Configuration: Time zone unchanged.";
settings.endGroup();
} else {
settings.setValue("timeZone", timeZone);
@ -211,7 +211,7 @@ void GuhConfiguration::setLocale(const QLocale &locale)
GuhSettings settings(GuhSettings::SettingsRoleGlobal);
settings.beginGroup("guhd");
if (settings.value("language").toString() == locale.name()) {
qCDebug(dcApplication()) << "Configuration: Language unchainged.";
qCDebug(dcApplication()) << "Configuration: Language unchanged.";
settings.endGroup();
} else {
settings.setValue("language", locale.name());

26
tests/auto/configurations/testconfigurations.cpp
View File

@ -168,19 +168,17 @@ void TestConfigurations::testServerName()
QSignalSpy notificationSpy(m_mockTcpServer, SIGNAL(outgoingData(QUuid,QByteArray)));
// Set name unchainged
// Set name unchanged
QVariantMap params; QVariant response; QVariantList configurationChangedNotifications;
params.insert("serverName", serverName);
response = injectAndWait("Configuration.SetServerName", params);
verifyConfigurationError(response);
// Check notification not emitted
notificationSpy.wait(200);
notificationSpy.wait(500);
configurationChangedNotifications = checkNotifications(notificationSpy, "Configuration.BasicConfigurationChanged");
QVERIFY2(configurationChangedNotifications.count() == 0, "Got Configuration.BasicConfigurationChanged notification but should have not.");
// TODO: verify notification
// Set new server name
QString newServerName = QString("Test server %1").arg(QUuid::createUuid().toString());
params.clear(); response.clear(); configurationChangedNotifications.clear();
@ -193,7 +191,16 @@ void TestConfigurations::testServerName()
// Check notification not emitted
notificationSpy.wait(500);
configurationChangedNotifications = checkNotifications(notificationSpy, "Configuration.BasicConfigurationChanged");
QVariantMap notificationContent = configurationChangedNotifications.first().toMap().value("params").toMap();
QVERIFY2(notificationContent.contains("basicConfiguration"), "Notification does not contain basicConfiguration");
QVERIFY2(configurationChangedNotifications.count() == 1, "Should get only one Configuration.BasicConfigurationChanged notification");
QVariantMap basicConfigurationNotificationMap = notificationContent.value("basicConfiguration").toMap();
QVERIFY2(basicConfigurationNotificationMap.contains("language"), "Notification does not contain key language");
QVERIFY2(basicConfigurationNotificationMap.contains("serverTime"), "Notification does not contain key serverTime");
QVERIFY2(basicConfigurationNotificationMap.contains("serverUuid"), "Notification does not contain key serverUuid");
QVERIFY2(basicConfigurationNotificationMap.contains("timeZone"), "Notification does not contain key timeZone");
QVERIFY2(basicConfigurationNotificationMap.contains("serverName"), "Notification does not contain key serverName");
QVERIFY2(basicConfigurationNotificationMap.value("serverName").toString() == newServerName, "Notification does not contain the new serverName");
basicConfigurationMap = loadBasicConfiguration();
QString loadedServerName = basicConfigurationMap.value("serverName").toString();
@ -217,14 +224,14 @@ void TestConfigurations::testLanguages()
QSignalSpy notificationSpy(m_mockTcpServer, SIGNAL(outgoingData(QUuid,QByteArray)));
// Set language unchainged
// Set language unchanged
QVariant response; QVariantMap params;
params.insert("language", basicConfigurationMap.value("language"));
response = injectAndWait("Configuration.SetLanguage", params);
verifyConfigurationError(response);
// Check notification not emitted
notificationSpy.wait(200);
notificationSpy.wait(500);
QVariantList languageChangedNotifications = checkNotifications(notificationSpy, "Configuration.LanguageChanged");
QVERIFY2(languageChangedNotifications.count() == 0, "Got Configuration.LanguageChanged notification but should have not.");
@ -246,7 +253,7 @@ void TestConfigurations::testLanguages()
verifyConfigurationError(response);
// Check notification
notificationSpy.wait(200);
notificationSpy.wait(500);
QVariantList languageChangedNotifications = checkNotifications(notificationSpy, "Configuration.LanguageChanged");
// If the language did not change no notification should be emited
@ -254,8 +261,9 @@ void TestConfigurations::testLanguages()
QVERIFY2(languageChangedNotifications.count() == 0, "Got Configuration.LanguageChanged notification but should have not.");
} else {
QVERIFY2(languageChangedNotifications.count() == 1, "Should get only one Configuration.LanguageChanged notification");
// TODO: verify notification
QVariantMap notificationMap = languageChangedNotifications.first().toMap().value("params").toMap();
QVERIFY2(notificationMap.contains("language"), "Notification does not contain language");
QVERIFY2(notificationMap.value("language").toString() == languageVariant.toString(), "Notification does not contain the new language");
// Restart the server and check if the language will be loaded correctly
restartServer();

1
tests/auto/guhtestbase.cpp
View File

@ -119,7 +119,6 @@ GuhTestBase::GuhTestBase(QObject *parent) :
// Important for settings
QCoreApplication::instance()->setOrganizationName("guh-test");
}
void GuhTestBase::initTestCase()