Last one for today - Fixes all testcases that I wrote so far.
More will come by tomorrow.
On Sat, Oct 15, 2016 at 8:21 PM, Tomaz Canabrava <tcanabr...@kde.org> wrote:
> a bunch more patches.
> this fixes a couple of bugs too - one of the tests don't pass yet (working
> on that currently)
>
> Tomaz
>
> On Fri, Oct 14, 2016 at 10:46 AM, Tomaz Canabrava <tcanabr...@kde.org>
> wrote:
>
>> had the time to finish some patches today, and I also hope to continue
>> finishing others.
>> Those tests pass. :D
>>
>>
>>
>
From 3e9322d3426a4e9a1ae642bd7fd2aede7a1d514b Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabr...@kde.org>
Date: Sat, 15 Oct 2016 20:26:34 +0200
Subject: [PATCH 9/9] Make all current written tests pass
Fixes a couple of issues with the tests.
Also, a type in prefs.h is "short" while it's actually
an boolean, this made me write the wrong testcase for this.
fixed this by setting the Qt wrapper to bool, but I didn't
changed the c implementation because I tought I could break
something.
Signed-off-by: Tomaz Canabrava <tcanabr...@kde.org>
---
core/subsurface-qt/SettingsObjectWrapper.cpp | 4 ++--
core/subsurface-qt/SettingsObjectWrapper.h | 8 ++++----
tests/testpreferences.cpp | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index 417b904..009ca64 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
@@ -866,7 +866,7 @@ int ProxySettings::port() const
return prefs.proxy_port;
}
-short ProxySettings::auth() const
+bool ProxySettings::auth() const
{
return prefs.proxy_auth;
}
@@ -915,7 +915,7 @@ void ProxySettings::setPort(int value)
emit portChanged(value);
}
-void ProxySettings::setAuth(short value)
+void ProxySettings::setAuth(bool value)
{
if (value == prefs.proxy_auth)
return;
diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index eeec3ab..64e6a5a 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -288,7 +288,7 @@ class ProxySettings : public QObject {
Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged)
Q_PROPERTY(QString host READ host WRITE setHost NOTIFY hostChanged)
Q_PROPERTY(int port READ port WRITE setPort NOTIFY portChanged)
- Q_PROPERTY(short auth READ auth WRITE setAuth NOTIFY authChanged)
+ Q_PROPERTY(bool auth READ auth WRITE setAuth NOTIFY authChanged)
Q_PROPERTY(QString user READ user WRITE setUser NOTIFY userChanged)
Q_PROPERTY(QString pass READ pass WRITE setPass NOTIFY passChanged)
@@ -297,7 +297,7 @@ public:
int type() const;
QString host() const;
int port() const;
- short auth() const;
+ bool auth() const;
QString user() const;
QString pass() const;
@@ -305,7 +305,7 @@ public slots:
void setType(int value);
void setHost(const QString& value);
void setPort(int value);
- void setAuth(short value);
+ void setAuth(bool value);
void setUser(const QString& value);
void setPass(const QString& value);
@@ -313,7 +313,7 @@ signals:
void typeChanged(int value);
void hostChanged(const QString& value);
void portChanged(int value);
- void authChanged(short value);
+ void authChanged(bool value);
void userChanged(const QString& value);
void passChanged(const QString& value);
private:
diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp
index 069e78d..6847958 100644
--- a/tests/testpreferences.cpp
+++ b/tests/testpreferences.cpp
@@ -284,29 +284,29 @@ void TestPreferences::testPreferences()
auto proxy = pref->proxy;
proxy->setType(2);
proxy->setPort(80);
- proxy->setAuth((short) 5);
+ proxy->setAuth(true);
proxy->setHost("localhost");
proxy->setUser("unknown");
proxy->setPass("secret");
TEST(proxy->type(),2);
TEST(proxy->port(),80);
- TEST(proxy->auth(),(short) 5);
+ TEST(proxy->auth(),true);
TEST(proxy->host(),QStringLiteral("localhost"));
TEST(proxy->user(),QStringLiteral("unknown"));
TEST(proxy->pass(),QStringLiteral("secret"));
proxy->setType(3);
proxy->setPort(8080);
- proxy->setAuth((short) 6);
+ proxy->setAuth(false);
proxy->setHost("127.0.0.1");
proxy->setUser("unknown_1");
proxy->setPass("secret_1");
TEST(proxy->type(),3);
TEST(proxy->port(),8080);
- TEST(proxy->auth(),(short) 6);
- TEST(proxy->host(),QStringLiteral("localhost_1"));
+ TEST(proxy->auth(),false);
+ TEST(proxy->host(),QStringLiteral("127.0.0.1"));
TEST(proxy->user(),QStringLiteral("unknown_1"));
TEST(proxy->pass(),QStringLiteral("secret_1"));
--
2.10.0
_______________________________________________
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
