Merge lp:~ken-vandine/content-hub/events_type into lp:content-hub

[Ken VanDine]

* Added ContentType.Events
* Added tests for the well known types

Added ContentType.Events

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:222
http://jenkins.qa.ubuntu.com/job/content-hub-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/262/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

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

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * 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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

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

 * No change

If you changed UI labels, did you update the pot file?

 * No change

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

 * No change

[lp:~ken-vandine/content-hub/events_type]

223. By Ken VanDine on 2015-06-29

merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/content-hub-ci/263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/263/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

I think the copyright on the new file should be 2015 (highlighted with inline diff comment)

[lp:~ken-vandine/content-hub/events_type]

224. By Ken VanDine on 2015-07-01

fixed copyright date in new file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/content-hub-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/264/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

 * Yes (ran test plan minus gmail test which fails due to bug #1466892, and modified hub-importer & hub-exporter to send fake Events)

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
--- import/Ubuntu/Content/contentpeermodel.cpp	2015-06-15 13:51:39 +0000
+++ import/Ubuntu/Content/contentpeermodel.cpp	2015-07-01 13:49:38 +0000
@@ -104,6 +104,7 @@
         appendPeersForContentType(ContentType::Links);
         appendPeersForContentType(ContentType::EBooks);
         appendPeersForContentType(ContentType::Text);
+        appendPeersForContentType(ContentType::Events);
         appendPeersForContentType(ContentType::Unknown);
     } else {
         appendPeersForContentType(m_contentType);

=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2015-06-10 13:54:03 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2015-07-01 13:49:38 +0000
@@ -101,6 +101,7 @@
     case Links: return cuc::Type::Known::links();
     case EBooks: return cuc::Type::Known::ebooks();
     case Text: return cuc::Type::Known::text();
+    case Events: return cuc::Type::Known::events();
     default: return cuc::Type::unknown();
     }
 }
@@ -128,6 +129,8 @@
         return EBooks;
     else if (type ==  cuc::Type::Known::text().id())
         return Text;
+    else if (type ==  cuc::Type::Known::events().id())
+        return Events;
     else
       return Unknown;
 }

=== modified file 'import/Ubuntu/Content/contenttype.h'
--- import/Ubuntu/Content/contenttype.h	2015-03-10 19:32:07 +0000
+++ import/Ubuntu/Content/contenttype.h	2015-07-01 13:49:38 +0000
@@ -38,7 +38,8 @@
         Videos = 5,
         Links = 6,
         EBooks = 7,
-        Text = 8
+        Text = 8,
+        Events = 9
     };
 
     ContentType(QObject *parent = nullptr);

=== modified file 'include/com/ubuntu/content/type.h'
--- include/com/ubuntu/content/type.h	2015-06-15 17:29:43 +0000
+++ include/com/ubuntu/content/type.h	2015-07-01 13:49:38 +0000
@@ -51,6 +51,7 @@
         static const Type& links();
         static const Type& ebooks();
         static const Type& text();
+        static const Type& events();
     };
 
     virtual ~Type();

=== modified file 'src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml'
--- src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2015-06-08 13:39:51 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2015-07-01 13:49:38 +0000
@@ -25,6 +25,9 @@
     <key name="text" type="as">
       <default>[]</default>
     </key>
+    <key name="events" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.source" path="/com/ubuntu/content/hub/source/">
     <key name="all" type="as">
@@ -54,6 +57,9 @@
     <key name="text" type="as">
       <default>[]</default>
     </key>
+    <key name="events" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.destination" path="/com/ubuntu/content/hub/destination/">
     <key name="all" type="as">
@@ -83,6 +89,9 @@
     <key name="text" type="as">
       <default>[]</default>
     </key>
+    <key name="events" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.share" path="/com/ubuntu/content/hub/share/">
     <key name="pictures" type="as">
@@ -109,5 +118,8 @@
     <key name="text" type="as">
       <default>[]</default>
     </key>
+    <key name="events" type="as">
+      <default>[]</default>
+    </key>
   </schema>
 </schemalist>

=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2015-06-08 13:39:51 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2015-07-01 13:49:38 +0000
@@ -126,7 +126,7 @@
     TRACE() << Q_FUNC_INFO << "Hook:" << result.filePath();
 
     QStringList knownTypes;
-    knownTypes << "all" << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text";
+    knownTypes << "all" << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text" << "events";
     QString app_id = result.fileName();
     auto peer = cuc::Peer(app_id);
 

=== modified file 'src/com/ubuntu/content/type.cpp'
--- src/com/ubuntu/content/type.cpp	2015-06-15 17:29:43 +0000
+++ src/com/ubuntu/content/type.cpp	2015-07-01 13:49:38 +0000
@@ -130,3 +130,9 @@
     static cuc::Type t("text", nullptr);
     return t;
 }
+
+const cuc::Type& cuc::Type::Known::events()
+{
+    static cuc::Type t("events", nullptr);
+    return t;
+}

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2015-06-08 13:39:51 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2015-07-01 13:49:38 +0000
@@ -53,6 +53,11 @@
 )
 
 add_executable(
+  test_types
+  test_types.cpp
+)
+
+add_executable(
   test_hook
   test_hook.cpp
   ${MOCS}
@@ -78,6 +83,7 @@
 target_link_libraries(app_hub_communication_transfer content-hub gmock gtest gtest_main)
 target_link_libraries(app_hub_communication_handler content-hub gmock gtest gtest_main)
 target_link_libraries(test_utils content-hub gmock gtest gtest_main)
+target_link_libraries(test_types content-hub gmock gtest gtest_main)
 target_link_libraries(test_hook content-hub gmock gtest gtest_main ${GSETTINGS_LDFLAGS})
 
 add_test(app_hub_communication_default_source app_hub_communication_default_source)
@@ -86,6 +92,7 @@
 add_test(app_hub_communication_transfer app_hub_communication_transfer)
 add_test(app_hub_communication_handler app_hub_communication_handler)
 add_test(test_utils test_utils)
+add_test(test_types test_types)
 add_test(test_hook test_hook)
 
 set_target_properties(

=== added file 'tests/acceptance-tests/test_types.cpp'
--- tests/acceptance-tests/test_types.cpp	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/test_types.cpp	2015-07-01 13:49:38 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#include <com/ubuntu/content/type.h>
+
+#include <gtest/gtest.h>
+
+namespace cuc = com::ubuntu::content;
+
+TEST(Types, id_documents)
+{
+    EXPECT_EQ(cuc::Type::Known::documents().id(), "documents");
+}
+
+TEST(Types, id_pictures)
+{
+    EXPECT_EQ(cuc::Type::Known::pictures().id(), "pictures");
+}
+
+TEST(Types, id_music)
+{
+    EXPECT_EQ(cuc::Type::Known::music().id(), "music");
+}
+
+TEST(Types, id_contacts)
+{
+    EXPECT_EQ(cuc::Type::Known::contacts().id(), "contacts");
+}
+
+TEST(Types, id_videos)
+{
+    EXPECT_EQ(cuc::Type::Known::videos().id(), "videos");
+}
+
+TEST(Types, id_links)
+{
+    EXPECT_EQ(cuc::Type::Known::links().id(), "links");
+}
+
+TEST(Types, id_ebooks)
+{
+    EXPECT_EQ(cuc::Type::Known::ebooks().id(), "ebooks");
+}
+
+TEST(Types, id_text)
+{
+    EXPECT_EQ(cuc::Type::Known::text().id(), "text");
+}
+
+TEST(Types, id_events)
+{
+    EXPECT_EQ(cuc::Type::Known::events().id(), "events");
+}