Merge lp:~renatofilho/buteo-syncfw-qml/rename-uoa-service into lp:buteo-syncfw-qml

[Renato Araujo Oliveira Filho]

Rename uoa contacts service to avoid conflict with old services.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/9/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGE.

If you changed UI labels, did you update the pot file?
NO LABEL CHANGE.

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGE CHANGED

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

=== modified file 'tests/qml/buteo-syncfw.py'
--- tests/qml/buteo-syncfw.py	2015-09-01 03:50:01 +0000
+++ tests/qml/buteo-syncfw.py	2015-10-06 14:56:23 +0000
@@ -35,7 +35,7 @@
 """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <profile type=\"sync\" name=\"test-profile\">
     <key value=\"45\" name=\"accountid\"/>
-    <key value=\"contacts\" name=\"category\"/>
+    <key value=\"buteo-contacts\" name=\"category\"/>
     <key value=\"google.Contacts-\" name=\"displayname\"/>
     <key value=\"true\" name=\"enabled\"/>
     <key value=\"true\" name=\"hidden\"/>
@@ -58,7 +58,7 @@
 """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <profile name=\"63807467\" type=\"sync\">
     <key value=\"110\" name=\"accountid\"/>
-    <key value=\"contacts\" name=\"category\"/>
+    <key value=\"buteo-contacts\" name=\"category\"/>
     <key value=\"online\" name=\"destinationtype\"/>
     <key value=\"[e-mail]\" name=\"displayname\"/>
     <key value=\"true\" name=\"enabled\"/>
@@ -81,7 +81,7 @@
 </profile>""",
 """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <profile type=\"sync\" name=\"template-profile\">
-    <key value=\"contacts\" name=\"category\"/>
+    <key value=\"buteo-contacts\" name=\"category\"/>
     <key value=\"false\" name=\"enabled\"/>
     <schedule syncconfiguredtime=\"\" interval=\"0\" days=\"\" externalsync=\"true\" time=\"\" enabled=\"false\">
         <rush interval=\"0\" days=\"\" externalsync=\"false\" begin=\"\" enabled=\"false\" end=\"\"/>
@@ -105,7 +105,7 @@
     def syncProfilesByKey(self, key, value):
         print ("syncProfilesByKey:", key, value)
         if key == 'category':
-            if value == 'contacts':
+            if value == 'buteo-contacts':
                 return [ButeoSyncFw.PROFILES[0], ButeoSyncFw.PROFILES[2], ButeoSyncFw.PROFILES[3]]
             if value == 'calendar':
                 return [ButeoSyncFw.PROFILES[1]]

=== modified file 'tests/qml/tst_ButeoSyncFW.qml'
--- tests/qml/tst_ButeoSyncFW.qml	2015-09-01 12:33:18 +0000
+++ tests/qml/tst_ButeoSyncFW.qml	2015-10-06 14:56:23 +0000
@@ -161,7 +161,7 @@
 
         function test_sync_by_profile_by_category()
         {
-            var profiles = buteoComponent.syncProfilesByCategory('contacts')
+            var profiles = buteoComponent.syncProfilesByCategory('buteo-contacts')
             compare(profiles.length, 2)
             compare(profiles[0], '63807467')
             compare(profiles[1], 'test-profile')
@@ -173,7 +173,7 @@
             spy.target = buteoComponent
             spy.signalName = "syncStatus"
 
-            compare(buteoComponent.startSyncByCategory('contacts'), true)
+            compare(buteoComponent.startSyncByCategory('buteo-contacts'), true)
 
             // wait for two signals (since we have two contacts profiles)
             tryCompare(spy, "count", 2)