Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0964cfc3 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

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

parents d746370f 1c2daddd

tools/split-select/Grouper.cpp

+0 −9
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ groupByMutualExclusivity(const Vector<SplitDescription>& splits) { 
    // 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 @@ groupByMutualExclusivity(const Vector<SplitDescription>& splits) { 
            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 @@ groupByMutualExclusivity(const Vector<SplitDescription>& splits) { 
        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

+7 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ protected: 
        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 @@ protected: 
};



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, shouldGroupAbi) { 
}



TEST_F(GrouperTest, shouldGroupLocale) {

    expectHasGroupWithSplits("pl-rPL", "de-rDE");

    expectHasGroupWithSplits("pl-rPL");

    expectHasGroupWithSplits("de-rDE");

    expectHasGroupWithSplits("fr");

    expectHasGroupWithSplits("fr-rCA");

}



TEST_F(GrouperTest, shouldGroupEachSplitIntoItsOwnGroup) {