Merge lp:~larsu/gsettings-qt/add-basic-testing into lp:gsettings-qt

[Lars Karlitski]

Add basic testing

Add basic testing.

[Ken VanDine (ken-vandine)]

merge conflicts

review: Needs Fixing

[lp:~larsu/gsettings-qt/add-basic-testing]

8. By Lars Karlitski on 2013-06-25

Merge trunk

[Lars Karlitski (larsu)]

Argh, I shouldn't have merged your branch first :P

[Ken VanDine (ken-vandine)]

Ah, one more thing then i'll approve it. Using xvfb-run to run the tests, you should add a "-a" to automatically get a server port.

review: Needs Fixing

[lp:~larsu/gsettings-qt/add-basic-testing]

9. By Lars Karlitski on 2013-06-25

debian: run xvfb with -a

[Lars Karlitski (larsu)]

Thanks, done.

[Ken VanDine (ken-vandine)]

Great, thanks!

review: Approve

=== modified file 'GSettings/gsettings-qt.pro'
--- GSettings/gsettings-qt.pro	2013-06-25 12:52:19 +0000
+++ GSettings/gsettings-qt.pro	2013-06-25 16:44:35 +0000
@@ -1,6 +1,7 @@
 TEMPLATE = lib
 INCLUDEPATH += .
 QT += qml
+QT -= gui
 CONFIG += qt plugin no_keywords link_pkgconfig
 PKGCONFIG += gio-2.0
 

=== modified file 'debian/control'
--- debian/control	2013-06-21 18:30:54 +0000
+++ debian/control	2013-06-25 16:44:35 +0000
@@ -9,6 +9,7 @@
                qtbase5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,
+               xvfb,
 Standards-Version: 3.9.4
 Section: libs
 Homepage: https://launchpad.net/gsettings-qt

=== modified file 'debian/rules'
--- debian/rules	2013-06-20 19:24:56 +0000
+++ debian/rules	2013-06-25 16:44:35 +0000
@@ -8,5 +8,8 @@
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_auto_test:
+	xvfb-run -a dh_auto_test
+
 %:
 	dh $@ 

=== modified file 'gsettings-qt.pro'
--- gsettings-qt.pro	2013-06-20 19:24:56 +0000
+++ gsettings-qt.pro	2013-06-25 16:44:35 +0000
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += GSettings/gsettings-qt.pro
+SUBDIRS += GSettings/gsettings-qt.pro tests/tests.pro

=== added directory 'tests'
=== added file 'tests/com.canonical.gsettings.test.gschema.xml'
--- tests/com.canonical.gsettings.test.gschema.xml	1970-01-01 00:00:00 +0000
+++ tests/com.canonical.gsettings.test.gschema.xml	2013-06-25 16:44:35 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="com.canonical.gsettings.Test" path="/com/canonical/gsettings/test/">
+    <key name="test-integer" type="i">
+      <default>42</default>
+    </key>
+    <key name="test-double" type="d">
+      <default>1.5</default>
+    </key>
+    <key name="test-boolean" type="b">
+      <default>false</default>
+    </key>
+    <key name="test-string" type="s">
+      <default>"hello"</default>
+    </key>
+  </schema>
+</schemalist>

=== added file 'tests/test.cpp'
--- tests/test.cpp	1970-01-01 00:00:00 +0000
+++ tests/test.cpp	2013-06-25 16:44:35 +0000
@@ -0,0 +1,3 @@
+#include <QtQuickTest/quicktest.h>
+
+QUICK_TEST_MAIN(GSettings)

=== added file 'tests/tests.pro'
--- tests/tests.pro	1970-01-01 00:00:00 +0000
+++ tests/tests.pro	2013-06-25 16:44:35 +0000
@@ -0,0 +1,16 @@
+TEMPLATE = app
+QT += qml testlib
+QT -= gui
+CONFIG += qmltestcase
+TARGET = test
+IMPORTPATH = $$PWD/..
+SOURCES = test.cpp
+
+schema.target = gschemas.compiled
+schema.commands = glib-compile-schemas $$PWD
+schema.depends = com.canonical.gsettings.test.gschema.xml
+QMAKE_EXTRA_TARGETS += schema
+PRE_TARGETDEPS = gschemas.compiled
+
+# qmake prepends this to the command line executed by `make check`
+check.commands = GSETTINGS_BACKEND=memory GSETTINGS_SCHEMA_DIR=$$PWD

=== added file 'tests/tst_GSettings.qml'
--- tests/tst_GSettings.qml	1970-01-01 00:00:00 +0000
+++ tests/tst_GSettings.qml	2013-06-25 16:44:35 +0000
@@ -0,0 +1,23 @@
+
+import QtTest 1.0
+import GSettings 1.0
+
+TestCase {
+  GSettings {
+    id: settings
+    schema: "com.canonical.gsettings.Test"
+  }
+
+  function readWriteKey(key, expectedValue, newValue) {
+    compare(settings[key], expectedValue, "read " + key);
+    settings[key] = newValue;
+    compare(settings[key], newValue, "write " + key);
+  }
+
+  function test_types() {
+    readWriteKey("testInteger", 42, 2);
+    readWriteKey("testDouble", 1.5, 2.5);
+    readWriteKey("testBoolean", false, true);
+    readWriteKey("testString", "hello", "bye");
+  }
+}