commit 0964cfc384398cdacd82030649b9c43b95ffa970
author Adam Lesinski <adamlesinski@google.com> Fri Mar 20 20:46:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 20 20:46:03 2015 +0000
tree ff7ac0d2fdbf3be81bf03b2bf6e0827a6a7c5d29
parent d746370fdd60fe20db6d50c75e03043eb3552273
parent 1c2dadddf78c3aa49129425d5f6ee480cfb54444

Merge "split-select: Languages should not be grouped exclusively"

tools/split-select/Grouper.cpp

diff --git a/tools/split-select/Grouper.cpp b/tools/split-select/Grouper.cpp
index 22685cd..55e52fc8 100644
--- a/tools/split-select/Grouper.cpp
+++ b/tools/split-select/Grouper.cpp
@@ -34,7 +34,6 @@
     // Find mutually exclusive splits and group them.
     KeyedVector<SplitDescription, SortedVector<SplitDescription> > densityGroups;
     KeyedVector<SplitDescription, SortedVector<SplitDescription> > abiGroups;
-    KeyedVector<SplitDescription, SortedVector<SplitDescription> > localeGroups;
     const size_t splitCount = splits.size();
     for (size_t i = 0; i < splitCount; i++) {
         const SplitDescription& split = splits[i];
@@ -47,10 +46,6 @@
             SplitDescription key(split);
             key.abi = abi::Variant_none;
             appendValue(abiGroups, key, split);
-        } else if (split.config.locale != 0) {
-            SplitDescription key(split);
-            key.config.clearLocale();
-            appendValue(localeGroups, key, split);
         } else {
             groups.add();
             groups.editTop().add(split);
@@ -67,10 +62,6 @@
         groups.add(abiGroups[i]);
     }
 
-    const size_t localeCount = localeGroups.size();
-    for (size_t i = 0; i < localeCount; i++) {
-        groups.add(localeGroups[i]);
-    }
     return groups;
 }
 

tools/split-select/Grouper_test.cpp

diff --git a/tools/split-select/Grouper_test.cpp b/tools/split-select/Grouper_test.cpp
index a5f9c5a..7294a86 100644
--- a/tools/split-select/Grouper_test.cpp
+++ b/tools/split-select/Grouper_test.cpp
@@ -37,6 +37,8 @@
         addSplit(splits, "en-rUS-sw300dp-xhdpi");
         addSplit(splits, "large");
         addSplit(splits, "pl-rPL");
+        addSplit(splits, "fr-rCA");
+        addSplit(splits, "fr");
         addSplit(splits, "xlarge");
         addSplit(splits, "en-rUS-sw600dp-xhdpi");
         addSplit(splits, "en-rUS-sw300dp-hdpi");
@@ -64,7 +66,7 @@
 };
 
 TEST_F(GrouperTest, shouldHaveCorrectNumberOfGroups) {
-    EXPECT_EQ(12u, mGroups.size());
+    EXPECT_EQ(15u, mGroups.size());
 }
 
 TEST_F(GrouperTest, shouldGroupDensities) {
@@ -79,7 +81,10 @@
 }
 
 TEST_F(GrouperTest, shouldGroupLocale) {
-    expectHasGroupWithSplits("pl-rPL", "de-rDE");
+    expectHasGroupWithSplits("pl-rPL");
+    expectHasGroupWithSplits("de-rDE");
+    expectHasGroupWithSplits("fr");
+    expectHasGroupWithSplits("fr-rCA");
 }
 
 TEST_F(GrouperTest, shouldGroupEachSplitIntoItsOwnGroup) {