Merge lp:~marcustomlinson/unity-scopes-api/metadata_childtags_attr into lp:unity-scopes-api/devel

[Marcus Tomlinson]

[lp:~marcustomlinson/unity-scopes-api/metadata_childtags_attr]

555. By Marcus Tomlinson on 2014-11-28

Updated symbols

Unmerged revisions

555. By Marcus Tomlinson on 2014-11-28

Updated symbols

554. By Marcus Tomlinson on 2014-11-28

IsolatedScope_test.cpp

553. By Marcus Tomlinson on 2014-11-28

Added missing keys to known_entries in ScopeConfig

552. By Marcus Tomlinson on 2014-11-28

ChildScopes -> ChildTags in testscopeA.ini.in

551. By Marcus Tomlinson on 2014-11-28

ScopeMetadataImpl_test.cpp

550. By Marcus Tomlinson on 2014-11-28

ScopeConfig_test.cpp

549. By Marcus Tomlinson on 2014-11-28

Registry_test.cpp

548. By Marcus Tomlinson on 2014-11-28

ScopeMetadataBuilder.cpp

547. By Marcus Tomlinson on 2014-11-28

ScopeMetadataImpl.cpp

546. By Marcus Tomlinson on 2014-11-28

ScopeConfig.cpp

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2014-11-25 13:24:01 +0000
+++ CONFIGFILES	2014-11-28 07:21:08 +0000
@@ -359,9 +359,22 @@
   must be separated by semicolons. This list is translated to the names of
   children scopes when in the scopes overview page of the Unity Dash.
 
+  E.g. "ChildScopes = com.canonical.scopes.amazon;com.canonical.scopes.ebay"
+
   Note: make sure there are no trailing spaces following
   the ids, as they will be preserved.
 
+- ChildTags
+
+  The list of tags of scopes aggregated by this scope (if any). The values in this list
+  must be separated by semicolons. This list is translated to the names of
+  children scopes when in the scopes overview page of the Unity Dash.
+
+  E.g. "ChildTags = music;video"
+
+  Note: make sure there are no trailing spaces following
+  the tags, as they will be preserved.
+
 - Invisible
 
   Whether the scope is hidden in the UI. The default value is false.

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-11-26 07:39:35 +0000
+++ RELEASE_NOTES.md	2014-11-28 07:21:08 +0000
@@ -12,6 +12,7 @@
   - Added missing methods for settings_definitions(), location_data_needed(),
     and child_scope_ids() to testing::ScopeMetadataBuilder.
   - Added support for Tags scope .ini option.
+  - Added support for ChildTags scope .ini option.
 
 Changes in version 0.6.8
 ========================

=== modified file 'STRUCTS'
--- STRUCTS	2014-11-25 13:24:01 +0000
+++ STRUCTS	2014-11-28 07:21:08 +0000
@@ -78,6 +78,7 @@
  'settings_definitions'  : dictionary, optional
  'location_data_needed'  : bool, optional
  'child_scopes'          : array of strings, optional
+ 'child_tags'            : array of strings, optional
  'version'               : int, optional
  'tags'                  : array of strings, optional
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-26 07:39:35 +0000
+++ debian/changelog	2014-11-28 07:21:08 +0000
@@ -13,8 +13,9 @@
 
   [ Marcus Tomlinson ]
   * Added support for Tags scope .ini option.
+  * Added support for ChildTags scope .ini option.
 
- -- Marcus Tomlinson <[e-mail]>  Wed, 26 Nov 2014 09:36:56 +0200
+ -- Marcus Tomlinson <[e-mail]>  Fri, 28 Nov 2014 07:26:14 +0200
 
 unity-scopes-api (0.6.8+15.04.20141119-0ubuntu1) vivid; urgency=medium
 

=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2014-11-27 05:38:10 +0000
+++ debian/libunity-scopes3.symbols	2014-11-28 07:21:08 +0000
@@ -442,6 +442,7 @@
  (c++)"unity::scopes::internal::ScopeConfig::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::author() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::child_scope_ids() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeConfig::child_tags() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeConfig::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::internal::ScopeConfig::description() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::display_name() const@Base" 0.4.0+14.04.20140312.1
@@ -483,6 +484,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::author() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::child_scope_ids() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::child_tags() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::create(std::unique_ptr<unity::scopes::internal::ScopeMetadataImpl, std::default_delete<unity::scopes::internal::ScopeMetadataImpl> >)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::description() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::deserialize(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
@@ -505,6 +507,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_art(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_author(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_child_scope_ids(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::set_child_tags(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_description(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_display_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_hot_key(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -771,6 +774,7 @@
  (c++)"unity::scopes::ScopeMetadata::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::author() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::child_scope_ids() const@Base" 0replaceme
+ (c++)"unity::scopes::ScopeMetadata::child_tags() const@Base" 0replaceme
  (c++)"unity::scopes::ScopeMetadata::description() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::display_name() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::hot_key() const@Base" 0.4.0+14.04.20140312.1
@@ -864,6 +868,7 @@
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::art(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::author(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.0+14.10.20140619
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::child_scope_ids(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 0replaceme
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::child_tags(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::description(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::display_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::hot_key(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2014-11-25 13:34:02 +0000
+++ doc/tutorial.dox	2014-11-28 07:21:08 +0000
@@ -1061,6 +1061,7 @@
     HotKey =
     ResultsTtlType = None, Small, Medium, or Large
     ChildScopes =
+    ChildTags =
     Tags =
 
     [Appearance]
@@ -1102,16 +1103,20 @@
 <li>http://remote-server.com/path/to/image</li>
 </ul>
 
-The value of `ChildScopes` key is to be used by aggregator scopes. It must be a semicolon separated list of scope identifiers that
-might be aggregated by this scope, for example:
+The value of the `ChildScopes` and `ChildTags` keys are to be used by aggregator scopes. `ChildScopes` must be a semicolon
+separated list of scope identifiers that might be aggregated by this scope, for example:
 
 `ChildScopes = com.foo.bar;com.foo.bar2`
 
-This list of scopes is translated to the names of children scopes when in the scopes overview page of the Unity Dash.
-
-The `Tags` key is optional, but we recommend that you use it. Tags are used by aggregators to collect results from scopes of
-similar type (E.g. The Music scope will aggregate scopes with the tag "music", and so on). The value of `Tags` should specify a
-list of tags your scope falls under. Like `ChildScopes`, this value must be a semicolon separated list (E.g. `Tags = music;video`).
+and `ChildTags` must be a semicolon separated list of tags of scopes that might be aggregated by this scope, for example:
+
+`ChildTags = music;video`
+
+These lists are translated to the names of children scopes when in the scopes overview page of the Unity Dash.
+
+The `Tags` key is optional, but we recommend that you use it. The value of `Tags` should specify a list of tags your scope falls
+under. Tags are used by aggregators to collect results from scopes of similar type (E.g. The Music scope will aggregate scopes
+with the tag "music", and so on). Like `ChildTags`, this value must be a semicolon separated list (E.g. `Tags = music;video`).
 
 \subsection scopetool The scope tool
 

=== modified file 'include/unity/scopes/ScopeMetadata.h'
--- include/unity/scopes/ScopeMetadata.h	2014-11-25 13:24:01 +0000
+++ include/unity/scopes/ScopeMetadata.h	2014-11-28 07:21:08 +0000
@@ -187,7 +187,7 @@
     \brief Return the list of scope identifiers aggregated by this scope.
 
     The list returned by this method comes from the .ini file.
-    The scope author must ensure that it contains all scopes that an aggregator
+    The scope author must ensure that it contains all scopes that this aggregator
     might collect results from. This list may contain scopes that are not currently
     installed and are optional for proper functioning of the aggregator scope.
 
@@ -196,6 +196,19 @@
     std::vector<std::string> child_scope_ids() const;
 
     /**
+    \brief Return the list of scope tags aggregated by this scope.
+
+    The list returned by this method comes from the .ini file.
+    The scope author must ensure that it contains all tags of the scopes that this
+    aggregator might collect results from. This list may contain tags for scopes
+    that are not currently installed and are optional for proper functioning of the
+    aggregator scope.
+
+    \return The list of scopes tags aggregated by this scope.
+    */
+    std::vector<std::string> child_tags() const;
+
+    /**
     \brief Return the version of the scope.
 
     \return The version or, if the scope does not define its version,

=== modified file 'include/unity/scopes/internal/ScopeConfig.h'
--- include/unity/scopes/internal/ScopeConfig.h	2014-11-25 13:24:01 +0000
+++ include/unity/scopes/internal/ScopeConfig.h	2014-11-28 07:21:08 +0000
@@ -53,6 +53,7 @@
     ScopeMetadata::ResultsTtlType results_ttl_type() const;  // Optional, returns none if not present
     bool debug_mode() const;               // Optional, returns false if not present
     std::vector<std::string> child_scope_ids() const;  // Optional, returns an empty vector if no ids are present
+    std::vector<std::string> child_tags() const;  // Optional, returns an empty vector if no tags are present
     int version() const;                   // Optional, returns 0 if not present
     std::vector<std::string> tags() const; // Optional, returns an empty vector if no tags are present
 
@@ -76,6 +77,7 @@
     ScopeMetadata::ResultsTtlType results_ttl_type_;
     bool debug_mode_;
     std::vector<std::string> child_scope_ids_;
+    std::vector<std::string> child_tags_;
     int version_;
     std::vector<std::string> tags_;
 

=== modified file 'include/unity/scopes/internal/ScopeMetadataImpl.h'
--- include/unity/scopes/internal/ScopeMetadataImpl.h	2014-11-25 13:24:01 +0000
+++ include/unity/scopes/internal/ScopeMetadataImpl.h	2014-11-28 07:21:08 +0000
@@ -58,6 +58,7 @@
     VariantArray settings_definitions() const;                   // optional (default: empty array)
     bool location_data_needed() const;                           // optional (default: false)
     std::vector<std::string> child_scope_ids() const;            // optional (default: empty array)
+    std::vector<std::string> child_tags() const;                 // optional (default: empty array)
     int version() const;                                         // optional (default: 0)
     std::vector<std::string> tags() const;                       // optional (default: empty array)
 
@@ -77,6 +78,7 @@
     void set_settings_definitions(VariantArray const& settings_definitions);
     void set_location_data_needed(bool location_data_needed);
     void set_child_scope_ids(std::vector<std::string> const& ids);
+    void set_child_tags(std::vector<std::string> const& tags);
     void set_version(int v);
     void set_tags(std::vector<std::string> const& tags);
 
@@ -104,6 +106,7 @@
     std::unique_ptr<VariantArray> settings_definitions_;  // Optional, hence a pointer
     std::unique_ptr<bool> location_data_needed_;          // Optional, hence a pointer
     std::vector<std::string> child_scope_ids_;
+    std::vector<std::string> child_tags_;
     int version_;
     std::vector<std::string> tags_;
 };

=== modified file 'include/unity/scopes/testing/ScopeMetadataBuilder.h'
--- include/unity/scopes/testing/ScopeMetadataBuilder.h	2014-11-26 07:46:31 +0000
+++ include/unity/scopes/testing/ScopeMetadataBuilder.h	2014-11-28 07:21:08 +0000
@@ -96,6 +96,7 @@
     ScopeMetadataBuilder& settings_definitions(Optional<VariantArray> const& value);
     ScopeMetadataBuilder& location_data_needed(Optional<bool> const& value);
     ScopeMetadataBuilder& child_scope_ids(Optional<std::vector<std::string>> const& value);
+    ScopeMetadataBuilder& child_tags(Optional<std::vector<std::string>> const& value);
     ScopeMetadataBuilder& version(Optional<int> const& value);
     ScopeMetadataBuilder& tags(Optional<std::vector<std::string>> const& value);
 

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-11-25 13:24:01 +0000
+++ scoperegistry/scoperegistry.cpp	2014-11-28 07:21:08 +0000
@@ -318,6 +318,7 @@
     mi->set_invisible(sc.invisible());
     mi->set_appearance_attributes(sc.appearance_attributes());
     mi->set_child_scope_ids(sc.child_scope_ids());
+    mi->set_child_tags(sc.child_tags());
     mi->set_version(sc.version());
     mi->set_tags(sc.tags());
 

=== modified file 'src/scopes/ScopeMetadata.cpp'
--- src/scopes/ScopeMetadata.cpp	2014-11-25 13:24:01 +0000
+++ src/scopes/ScopeMetadata.cpp	2014-11-28 07:21:08 +0000
@@ -152,6 +152,11 @@
     return p->child_scope_ids();
 }
 
+std::vector<std::string> ScopeMetadata::child_tags() const
+{
+    return p->child_tags();
+}
+
 int ScopeMetadata::version() const
 {
     return p->version();

=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2014-11-25 13:24:01 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2014-11-28 07:21:08 +0000
@@ -57,6 +57,7 @@
     const string results_ttl_key = "ResultsTtlType";
     const string debug_mode_key = "DebugMode";
     const string child_scope_ids_key = "ChildScopes";
+    const string child_tags_key = "ChildTags";
     const string version_key = "Version";
     const string tags_key = "Tags";
 
@@ -211,6 +212,22 @@
 
     try
     {
+        child_tags_ = parser()->get_string_array(scope_config_group, child_tags_key);
+    }
+    catch (LogicException const&)
+    {
+    }
+
+    for (auto const& tag: child_tags_)
+    {
+        if (tag.empty())
+        {
+            throw_ex("Invalid empty tag string found in \"ChildTags\" list");
+        }
+    }
+
+    try
+    {
         version_ = get_int(scope_config_group, version_key);
         if (version_ <= 0)
         {
@@ -277,7 +294,9 @@
                results_ttl_key,
                debug_mode_key,
                child_scope_ids_key,
-               version_key
+               child_tags_key,
+               version_key,
+               tags_key
            }
         },
         {  scope_appearance_group,
@@ -456,6 +475,11 @@
     return child_scope_ids_;
 }
 
+std::vector<std::string> ScopeConfig::child_tags() const
+{
+    return child_tags_;
+}
+
 int ScopeConfig::version() const
 {
     return version_;

=== modified file 'src/scopes/internal/ScopeMetadataImpl.cpp'
--- src/scopes/internal/ScopeMetadataImpl.cpp	2014-11-25 13:24:01 +0000
+++ src/scopes/internal/ScopeMetadataImpl.cpp	2014-11-28 07:21:08 +0000
@@ -60,6 +60,7 @@
     , appearance_attributes_(other.appearance_attributes_)
     , results_ttl_type_(other.results_ttl_type_)
     , child_scope_ids_(other.child_scope_ids_)
+    , child_tags_(other.child_tags_)
     , version_(other.version_)
     , tags_(other.tags_)
 {
@@ -118,6 +119,7 @@
         settings_definitions_.reset(rhs.settings_definitions_ ? new VariantArray(*rhs.settings_definitions_) : nullptr);
         location_data_needed_.reset(rhs.location_data_needed_ ? new bool(*rhs.location_data_needed_) : nullptr);
         child_scope_ids_ = rhs.child_scope_ids_;
+        child_tags_ = rhs.child_tags_;
         version_ = rhs.version_;
         tags_ = rhs.tags_;
     }
@@ -236,6 +238,11 @@
     return child_scope_ids_;
 }
 
+std::vector<std::string> ScopeMetadataImpl::child_tags() const
+{
+    return child_tags_;
+}
+
 int ScopeMetadataImpl::version() const
 {
     return version_;
@@ -326,6 +333,11 @@
     child_scope_ids_ = ids;
 }
 
+void ScopeMetadataImpl::set_child_tags(std::vector<std::string> const& tags)
+{
+    child_tags_ = tags;
+}
+
 void ScopeMetadataImpl::set_version(int v)
 {
     if (v < 0)
@@ -425,6 +437,15 @@
         }
         var["child_scopes"] = Variant(va);
     }
+    if (child_tags_.size())
+    {
+        VariantArray va;
+        for (auto const& tag: child_tags_)
+        {
+            va.push_back(Variant(tag));
+        }
+        var["child_tags"] = Variant(va);
+    }
     if (tags_.size())
     {
         VariantArray va;
@@ -579,6 +600,16 @@
         }
     }
 
+    child_tags_.clear();
+    it = var.find("child_tags");
+    if (it != var.end())
+    {
+        for (auto const& v: it->second.get_array())
+        {
+            child_tags_.push_back(v.get_string());
+        }
+    }
+
     tags_.clear();
     it = var.find("tags");
     if (it != var.end())

=== modified file 'src/scopes/testing/ScopeMetadataBuilder.cpp'
--- src/scopes/testing/ScopeMetadataBuilder.cpp	2014-11-26 07:46:31 +0000
+++ src/scopes/testing/ScopeMetadataBuilder.cpp	2014-11-28 07:21:08 +0000
@@ -47,6 +47,7 @@
     Optional<VariantArray> settings_definitions;
     Optional<bool> location_data_needed;
     Optional<std::vector<std::string>> child_scope_ids;
+    Optional<std::vector<std::string>> child_tags;
     Optional<int> version;
     Optional<std::vector<std::string>> tags;
 };
@@ -155,6 +156,12 @@
     return *this;
 }
 
+testing::ScopeMetadataBuilder& testing::ScopeMetadataBuilder::child_tags(Optional<std::vector<std::string>> const& value)
+{
+    p->child_tags = value;
+    return *this;
+}
+
 testing::ScopeMetadataBuilder& testing::ScopeMetadataBuilder::version(Optional<int> const& value)
 {
     p->version = value;
@@ -198,6 +205,8 @@
         impl->set_location_data_needed(*p->location_data_needed);
     if (p->child_scope_ids)
         impl->set_child_scope_ids(*p->child_scope_ids);
+    if (p->child_tags)
+        impl->set_child_tags(*p->child_tags);
     if (p->version)
         impl->set_version(*p->version);
     if (p->tags)

=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2014-11-25 13:24:01 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2014-11-28 07:21:08 +0000
@@ -109,6 +109,11 @@
     EXPECT_EQ("com.foo.bar", children[0]);
     EXPECT_EQ("com.foo.baz", children[1]);
     EXPECT_EQ(1, meta.version());
+    auto child_tags = meta.child_tags();
+    EXPECT_EQ(2u, child_tags.size());
+    EXPECT_EQ("games", child_tags[0]);
+    EXPECT_EQ("sport", child_tags[1]);
+    EXPECT_EQ(1, meta.version());
     auto tags = meta.tags();
     EXPECT_EQ(3u, tags.size());
     EXPECT_EQ("music", tags[0]);
@@ -145,6 +150,7 @@
     EXPECT_EQ(0, defs.size());
     EXPECT_FALSE(meta.location_data_needed());
     EXPECT_EQ(0, meta.child_scope_ids().size());
+    EXPECT_EQ(0, meta.child_tags().size());
     EXPECT_EQ(0, meta.tags().size());
     EXPECT_EQ(0, meta.version());
 }

=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in'
--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in	2014-11-25 13:24:01 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in	2014-11-28 07:21:08 +0000
@@ -8,6 +8,7 @@
 HotKey = scope-A.HotKey
 LocationDataNeeded = true
 ChildScopes = com.foo.bar;com.foo.baz
+ChildTags = games;sport
 Version = 1
 Tags = music;news;foo
 

=== modified file 'test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt'
--- test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2014-11-26 08:03:28 +0000
+++ test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2014-11-28 07:21:08 +0000
@@ -8,6 +8,7 @@
 configure_file(bad_child_ids.ini.in bad_child_ids.ini copyonly)
 configure_file(empty_child_ids.ini.in empty_child_ids.ini copyonly)
 configure_file(single_child_id.ini.in single_child_id.ini copyonly)
+configure_file(bad_child_tags.ini.in bad_child_tags.ini copyonly)
 configure_file(bad_tags.ini.in bad_tags.ini copyonly)
 configure_file(empty_tags.ini.in empty_tags.ini copyonly)
 configure_file(single_tag.ini.in single_tag.ini copyonly)
@@ -20,6 +21,7 @@
 add_definitions(-DBAD_CHILD_IDS="${CMAKE_CURRENT_BINARY_DIR}/bad_child_ids.ini")
 add_definitions(-DEMPTY_CHILD_IDS="${CMAKE_CURRENT_BINARY_DIR}/empty_child_ids.ini")
 add_definitions(-DSINGLE_CHILD_ID="${CMAKE_CURRENT_BINARY_DIR}/single_child_id.ini")
+add_definitions(-DBAD_CHILD_TAGS="${CMAKE_CURRENT_BINARY_DIR}/bad_child_tags.ini")
 add_definitions(-DBAD_TTL="${CMAKE_CURRENT_BINARY_DIR}/bad_ttl.ini")
 add_definitions(-DBAD_VERSION="${CMAKE_CURRENT_BINARY_DIR}/bad_version.ini")
 add_definitions(-DBAD_TAGS="${CMAKE_CURRENT_BINARY_DIR}/bad_tags.ini")

=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-11-26 08:03:28 +0000
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-11-28 07:21:08 +0000
@@ -57,6 +57,13 @@
         EXPECT_EQ("com.foo.bar2", children[1]);
         EXPECT_EQ("com.foo.boo", children[2]);
 
+        auto child_tags = cfg.child_tags();
+        EXPECT_EQ(4u, child_tags.size());
+        EXPECT_EQ("fee", child_tags[0]);
+        EXPECT_EQ("fi", child_tags[1]);
+        EXPECT_EQ("fo", child_tags[2]);
+        EXPECT_EQ("fum", child_tags[3]);
+
         auto tags = cfg.tags();
         EXPECT_EQ(2u, tags.size());
         EXPECT_EQ("foo", tags[0]);
@@ -142,6 +149,19 @@
     EXPECT_EQ(cfg.child_scope_ids().size(), 1);
 }
 
+TEST(ScopeConfig, bad_child_tags)
+{
+    try
+    {
+        ScopeConfig cfg(BAD_CHILD_TAGS);
+    }
+    catch(ConfigException const& e)
+    {
+        boost::regex r("unity::scopes::ConfigException: \".*\": Invalid empty tag string found in \"ChildTags\" list");
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
+    }
+}
+
 TEST(ScopeConfig, bad_timeout)
 {
     try

=== added file 'test/gtest/scopes/internal/ScopeConfig/bad_child_tags.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/bad_child_tags.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/bad_child_tags.ini.in	2014-11-28 07:21:08 +0000
@@ -0,0 +1,5 @@
+[ScopeConfig]
+DisplayName = Scope name
+Description = Scope description
+Author = Canonical
+ChildTags = ;bar;

=== modified file 'test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-11-26 08:03:28 +0000
+++ test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-11-28 07:21:08 +0000
@@ -19,6 +19,7 @@
 DebugMode = true
 Version = 1
 ChildScopes = com.foo.bar;com.foo.bar2;com.foo.boo
+ChildTags = fee;fi;fo;fum
 Tags = foo;bar
 
 [Appearance]

=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp'
--- test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-11-25 13:24:01 +0000
+++ test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-11-28 07:21:08 +0000
@@ -162,6 +162,7 @@
     mi2->set_settings_definitions(va);
     mi2->set_location_data_needed(true);
     mi2->set_child_scope_ids(vector<string>{"abc", "def"});
+    mi2->set_child_tags(vector<string>{"foo", "bar"});
     mi2->set_tags(vector<string>{"music", "video", "news"});
 
     // Make another copy, so we get coverage on the entire copy constructor
@@ -176,6 +177,7 @@
     EXPECT_EQ(va, m.settings_definitions());
     EXPECT_TRUE(m.location_data_needed());
     EXPECT_EQ((vector<string>{"abc", "def"}), m.child_scope_ids());
+    EXPECT_EQ((vector<string>{"foo", "bar"}), m.child_tags());
     EXPECT_EQ((vector<string>{"music", "video", "news"}), m.tags());
 
     // Make another value
@@ -200,6 +202,7 @@
     ti->set_settings_definitions(tmp_va);
     ti->set_location_data_needed(true);
     ti->set_child_scope_ids(vector<string>{"tmp abc", "tmp def"});
+    ti->set_child_tags(vector<string>{"tmp foo", "tmp bar"});
     ti->set_tags(vector<string>{"music", "video"});
 
     // Check impl assignment operator
@@ -222,6 +225,7 @@
     EXPECT_EQ(tmp_va, ci.settings_definitions());
     EXPECT_TRUE(ci.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), ci.child_scope_ids());
+    EXPECT_EQ((vector<string>{"tmp foo", "tmp bar"}), ci.child_tags());
     EXPECT_EQ(99, ci.version());
     EXPECT_EQ((vector<string>{"music", "video"}), ci.tags());
 
@@ -246,6 +250,7 @@
     EXPECT_EQ(tmp_va, m.settings_definitions());
     EXPECT_TRUE(m.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), m.child_scope_ids());
+    EXPECT_EQ((vector<string>{"tmp foo", "tmp bar"}), m.child_tags());
     EXPECT_EQ((vector<string>{"music", "video"}), m.tags());
 
     // Self-assignment
@@ -268,6 +273,7 @@
     EXPECT_EQ(tmp_va, tmp.settings_definitions());
     EXPECT_TRUE(tmp.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), tmp.child_scope_ids());
+    EXPECT_EQ((vector<string>{"tmp foo", "tmp bar"}), tmp.child_tags());
     EXPECT_EQ((vector<string>{"music", "video"}), tmp.tags());
 
     // Copy constructor
@@ -290,6 +296,7 @@
     EXPECT_EQ(tmp_va, tmp2.settings_definitions());
     EXPECT_TRUE(tmp2.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), tmp2.child_scope_ids());
+    EXPECT_EQ((vector<string>{"tmp foo", "tmp bar"}), tmp2.child_tags());
     EXPECT_EQ((vector<string>{"music", "video"}), tmp2.tags());
 }
 
@@ -322,12 +329,13 @@
     mi->set_settings_definitions(va);
     mi->set_location_data_needed(false);
     mi->set_child_scope_ids({"com.foo.bar", "com.foo.baz"});
+    mi->set_child_tags({"music", "video"});
     mi->set_tags({"news", "games"});
 
     // Check that serialize() sets the map values correctly
     auto m = ScopeMetadataImpl::create(move(mi));
     auto var = m.serialize();
-    EXPECT_EQ(18u, var.size());
+    EXPECT_EQ(19u, var.size());
     EXPECT_EQ("scope_id", var["scope_id"].get_string());
     EXPECT_EQ("display_name", var["display_name"].get_string());
     EXPECT_EQ("description", var["description"].get_string());
@@ -348,6 +356,9 @@
     EXPECT_EQ(2u, var["child_scopes"].get_array().size());
     EXPECT_EQ("com.foo.bar", var["child_scopes"].get_array()[0].get_string());
     EXPECT_EQ("com.foo.baz", var["child_scopes"].get_array()[1].get_string());
+    EXPECT_EQ(2u, var["child_tags"].get_array().size());
+    EXPECT_EQ("music", var["child_tags"].get_array()[0].get_string());
+    EXPECT_EQ("video", var["child_tags"].get_array()[1].get_string());
     EXPECT_EQ(2u, var["tags"].get_array().size());
     EXPECT_EQ("news", var["tags"].get_array()[0].get_string());
     EXPECT_EQ("games", var["tags"].get_array()[1].get_string());
@@ -372,6 +383,15 @@
     EXPECT_FALSE(c.invisible());
     EXPECT_EQ(va, c.settings_definitions());
     EXPECT_FALSE(c.location_data_needed());
+    EXPECT_EQ(2u, c.child_scope_ids().size());
+    EXPECT_EQ("com.foo.bar", c.child_scope_ids()[0]);
+    EXPECT_EQ("com.foo.baz", c.child_scope_ids()[1]);
+    EXPECT_EQ(2u, c.child_tags().size());
+    EXPECT_EQ("music", c.child_tags()[0]);
+    EXPECT_EQ("video", c.child_tags()[1]);
+    EXPECT_EQ(2u, c.tags().size());
+    EXPECT_EQ("news", c.tags()[0]);
+    EXPECT_EQ("games", c.tags()[1]);
 }
 
 TEST(ScopeMetadataImpl, serialize_exceptions)

=== modified file 'test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp'
--- test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp	2014-11-12 02:15:46 +0000
+++ test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp	2014-11-28 07:21:08 +0000
@@ -94,6 +94,8 @@
     settings_defs.push_back(unity::scopes::Variant(a_setting));
 
     std::vector<std::string> child_scope_ids{ "joe", "mary" };
+    std::vector<std::string> child_tags{ "bits", "bobs" };
+    std::vector<std::string> tags{ "people", "things" };
 
     unity::scopes::testing::ScopeMetadataBuilder builder;
     builder.scope_id(scope_id)
@@ -112,7 +114,9 @@
         .settings_definitions(settings_defs)
         .location_data_needed(true)
         .child_scope_ids(child_scope_ids)
-        .version(42);
+        .child_tags(child_tags)
+        .version(42)
+        .tags(tags);
     unity::scopes::ScopeMetadata metadata = builder();
     EXPECT_EQ(scope_id, metadata.scope_id());
     EXPECT_EQ("display_name", metadata.display_name());
@@ -129,7 +133,9 @@
     EXPECT_EQ(settings_defs, metadata.settings_definitions());
     EXPECT_TRUE(metadata.location_data_needed());
     EXPECT_EQ(child_scope_ids, metadata.child_scope_ids());
+    EXPECT_EQ(child_tags, metadata.child_tags());
     EXPECT_EQ(42, metadata.version());
+    EXPECT_EQ(tags, metadata.tags());
 }
 
 TEST(ScopeMetadataBuilder, construction_in_case_of_missing_mandatory_arguments_aborts)