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

[Ken VanDine]

Added well known type ContentType.Application

Added well known type ContentType.Application

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:276
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/562/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/562/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/1/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

276. By Ken VanDine on 2016-06-06

Added well known type ContentType.Application

=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2015-06-24 20:22:45 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2016-06-06 15:25:52 +0000
@@ -58,6 +58,12 @@
      \li ContentType.Text
      \li Text
    \row
+     \li ContentType.Events
+     \li Events
+   \row
+     \li ContentType.Application
+     \li Application
+   \row
      \li ContentType.All
      \li Any of the above content types
    \endtable
@@ -102,6 +108,7 @@
     case EBooks: return cuc::Type::Known::ebooks();
     case Text: return cuc::Type::Known::text();
     case Events: return cuc::Type::Known::events();
+    case Application: return cuc::Type::Known::application();
     default: return cuc::Type::unknown();
     }
 }
@@ -131,6 +138,8 @@
         return Text;
     else if (type ==  cuc::Type::Known::events().id())
         return Events;
+    else if (type ==  cuc::Type::Known::application().id())
+        return Application;
     else
       return Unknown;
 }

=== modified file 'import/Ubuntu/Content/contenttype.h'
--- import/Ubuntu/Content/contenttype.h	2015-09-02 12:43:49 +0000
+++ import/Ubuntu/Content/contenttype.h	2016-06-06 15:25:52 +0000
@@ -40,7 +40,8 @@
         Links = 6,
         EBooks = 7,
         Text = 8,
-        Events = 9
+        Events = 9,
+        Application = 10
     };
 
     ContentType(QObject *parent = nullptr);

=== modified file 'include/com/ubuntu/content/type.h'
--- include/com/ubuntu/content/type.h	2015-06-24 20:22:45 +0000
+++ include/com/ubuntu/content/type.h	2016-06-06 15:25:52 +0000
@@ -52,6 +52,7 @@
         static const Type& ebooks();
         static const Type& text();
         static const Type& events();
+        static const Type& application();
     };
 
     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-24 20:22:45 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2016-06-06 15:25:52 +0000
@@ -28,6 +28,9 @@
     <key name="events" type="as">
       <default>[]</default>
     </key>
+    <key name="application" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.source" path="/com/ubuntu/content/hub/source/">
     <key name="all" type="as">
@@ -60,6 +63,9 @@
     <key name="events" type="as">
       <default>[]</default>
     </key>
+    <key name="application" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.destination" path="/com/ubuntu/content/hub/destination/">
     <key name="all" type="as">
@@ -92,6 +98,9 @@
     <key name="events" type="as">
       <default>[]</default>
     </key>
+    <key name="application" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.share" path="/com/ubuntu/content/hub/share/">
     <key name="pictures" type="as">
@@ -121,5 +130,8 @@
     <key name="events" type="as">
       <default>[]</default>
     </key>
+    <key name="application" 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-24 20:22:45 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2016-06-06 15:25:52 +0000
@@ -126,7 +126,7 @@
     TRACE() << Q_FUNC_INFO << "Hook:" << result.filePath();
 
     QStringList knownTypes;
-    knownTypes << "all" << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text" << "events";
+    knownTypes << "all" << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text" << "events" << "application";
     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-24 20:22:45 +0000
+++ src/com/ubuntu/content/type.cpp	2016-06-06 15:25:52 +0000
@@ -136,3 +136,9 @@
     static cuc::Type t("events", nullptr);
     return t;
 }
+
+const cuc::Type& cuc::Type::Known::application()
+{
+    static cuc::Type t("application", nullptr);
+    return t;
+}

=== modified file 'src/com/ubuntu/content/utils.cpp'
--- src/com/ubuntu/content/utils.cpp	2015-10-23 15:12:48 +0000
+++ src/com/ubuntu/content/utils.cpp	2016-06-06 15:25:52 +0000
@@ -55,6 +55,7 @@
     types << cuc::Type::Known::ebooks();
     types << cuc::Type::Known::text();
     types << cuc::Type::Known::events();
+    types << cuc::Type::Known::application();
     return types;
 }
 

=== modified file 'tests/acceptance-tests/test_types.cpp'
--- tests/acceptance-tests/test_types.cpp	2015-07-01 13:49:26 +0000
+++ tests/acceptance-tests/test_types.cpp	2016-06-06 15:25:52 +0000
@@ -66,3 +66,8 @@
 {
     EXPECT_EQ(cuc::Type::Known::events().id(), "events");
 }
+
+TEST(Types, id_application)
+{
+    EXPECT_EQ(cuc::Type::Known::application().id(), "application");
+}

=== modified file 'tests/peers/importer/content-hub-test-importer.json'
--- tests/peers/importer/content-hub-test-importer.json	2015-03-10 19:00:08 +0000
+++ tests/peers/importer/content-hub-test-importer.json	2016-06-06 15:25:52 +0000
@@ -7,6 +7,8 @@
         "contacts",
         "links",
         "ebooks",
-        "text"
+        "text",
+        "events",
+        "application"
     ]
 }

=== modified file 'tests/peers/sharer/content-hub-test-sharer.json'
--- tests/peers/sharer/content-hub-test-sharer.json	2015-03-10 19:00:08 +0000
+++ tests/peers/sharer/content-hub-test-sharer.json	2016-06-06 15:25:52 +0000
@@ -7,6 +7,8 @@
         "contacts",
         "links",
         "ebooks",
-        "text"
+        "text",
+        "events",
+        "application"
     ]
 }