mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make all current written tests pass

Browse source 
Fixes a couple of issues with the tests.
Also, a type in prefs.h is "short" while it's actually
a 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 <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-10-15 20:26:34 +02:00 • committed by Dirk Hohndel
parent c1fbc70d83
commit 9c4b0170bf
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/subsurface-qt/SettingsObjectWrapper.cpp
View file

@ -866,7 +866,7 @@ int ProxySettings::port() const
return prefs.proxy_port; return prefs.proxy_port;
} }
short ProxySettings::auth() const bool ProxySettings::auth() const
{ {
return prefs.proxy_auth; return prefs.proxy_auth;
} }
@ -915,7 +915,7 @@ void ProxySettings::setPort(int value)
emit portChanged(value); emit portChanged(value);
} }
void ProxySettings::setAuth(short value) void ProxySettings::setAuth(bool value)
{ {
if (value == prefs.proxy_auth) if (value == prefs.proxy_auth)
return; return;

8
core/subsurface-qt/SettingsObjectWrapper.h
View file

@ -288,7 +288,7 @@ class ProxySettings : public QObject {
Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged) Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged)
Q_PROPERTY(QString host READ host WRITE setHost NOTIFY hostChanged) Q_PROPERTY(QString host READ host WRITE setHost NOTIFY hostChanged)
Q_PROPERTY(int port READ port WRITE setPort NOTIFY portChanged) 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 user READ user WRITE setUser NOTIFY userChanged)
Q_PROPERTY(QString pass READ pass WRITE setPass NOTIFY passChanged) Q_PROPERTY(QString pass READ pass WRITE setPass NOTIFY passChanged)
@ -297,7 +297,7 @@ public:
int type() const; int type() const;
QString host() const; QString host() const;
int port() const; int port() const;
short auth() const; bool auth() const;
QString user() const; QString user() const;
QString pass() const; QString pass() const;
@ -305,7 +305,7 @@ public slots:
void setType(int value); void setType(int value);
void setHost(const QString& value); void setHost(const QString& value);
void setPort(int value); void setPort(int value);
void setAuth(short value); void setAuth(bool value);
void setUser(const QString& value); void setUser(const QString& value);
void setPass(const QString& value); void setPass(const QString& value);
@ -313,7 +313,7 @@ signals:
void typeChanged(int value); void typeChanged(int value);
void hostChanged(const QString& value); void hostChanged(const QString& value);
void portChanged(int value); void portChanged(int value);
void authChanged(short value); void authChanged(bool value);
void userChanged(const QString& value); void userChanged(const QString& value);
void passChanged(const QString& value); void passChanged(const QString& value);
private: private:

10
tests/testpreferences.cpp
View file

@ -284,29 +284,29 @@ void TestPreferences::testPreferences()
auto proxy = pref->proxy; auto proxy = pref->proxy;
proxy->setType(2); proxy->setType(2);
proxy->setPort(80); proxy->setPort(80);
proxy->setAuth((short) 5); proxy->setAuth(true);
proxy->setHost("localhost"); proxy->setHost("localhost");
proxy->setUser("unknown"); proxy->setUser("unknown");
proxy->setPass("secret"); proxy->setPass("secret");
TEST(proxy->type(),2); TEST(proxy->type(),2);
TEST(proxy->port(),80); TEST(proxy->port(),80);
TEST(proxy->auth(),(short) 5); TEST(proxy->auth(),true);
TEST(proxy->host(),QStringLiteral("localhost")); TEST(proxy->host(),QStringLiteral("localhost"));
TEST(proxy->user(),QStringLiteral("unknown")); TEST(proxy->user(),QStringLiteral("unknown"));
TEST(proxy->pass(),QStringLiteral("secret")); TEST(proxy->pass(),QStringLiteral("secret"));
proxy->setType(3); proxy->setType(3);
proxy->setPort(8080); proxy->setPort(8080);
proxy->setAuth((short) 6); proxy->setAuth(false);
proxy->setHost("127.0.0.1"); proxy->setHost("127.0.0.1");
proxy->setUser("unknown_1"); proxy->setUser("unknown_1");
proxy->setPass("secret_1"); proxy->setPass("secret_1");
TEST(proxy->type(),3); TEST(proxy->type(),3);
TEST(proxy->port(),8080); TEST(proxy->port(),8080);
TEST(proxy->auth(),(short) 6); TEST(proxy->auth(),false);
TEST(proxy->host(),QStringLiteral("localhost_1")); TEST(proxy->host(),QStringLiteral("127.0.0.1"));
TEST(proxy->user(),QStringLiteral("unknown_1")); TEST(proxy->user(),QStringLiteral("unknown_1"));
TEST(proxy->pass(),QStringLiteral("secret_1")); TEST(proxy->pass(),QStringLiteral("secret_1"));