Merge lp:~ken-vandine/gsettings-qt/lp1349787_tests into lp:gsettings-qt

[Ken VanDine]

added tests for a{ss}

added tests for a{ss}

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/gsettings-qt-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-qt-ci/33/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/com.canonical.gsettings.test.gschema.xml'
--- tests/com.canonical.gsettings.test.gschema.xml	2013-07-19 12:07:43 +0000
+++ tests/com.canonical.gsettings.test.gschema.xml	2014-08-01 16:49:03 +0000
@@ -24,5 +24,8 @@
     <key name="test-string-list" type="as">
       <default>['one', 'two', 'three']</default>
     </key>
+    <key name="test-map" type="a{ss}">
+      <default>{'foo': 'one', 'bar': 'two'}</default>
+    </key>
   </schema>
 </schemalist>
 
=== modified file 'tests/tst_GSettings.qml'
--- tests/tst_GSettings.qml	2014-04-08 09:28:52 +0000
+++ tests/tst_GSettings.qml	2014-08-01 16:49:03 +0000
@@ -31,6 +31,7 @@
     compare(settings.testBoolean, false);
     compare(settings.testString, 'hello');
     compare(settings.testStringList, ['one', 'two', 'three']);
+    compare(settings.testMap, {'foo': 'one', 'bar': 'two'});
 
     compare(testCase.bindingTest, 'hello');
   }
@@ -53,6 +54,11 @@
     settings.testStringList = [];
     compare(settings.testStringList, []);
 
+    settings.testMap = {'baz': 'three'}
+    compare(settings.testMap, {'baz': 'three'});
+    settings.testMap = {};
+    compare(settings.testMap, {});
+
     settings.testEnum = 'two';
     compare(settings.testEnum, 'two');