summaryrefslogtreecommitdiff
path: root/tools/aapt2/StringPool_test.cpp
diff options
context:
space:
mode:
authorRyan Mitchell <rtmitchell@google.com>2018-04-16 18:21:14 +0000
committerRyan Mitchell <rtmitchell@google.com>2018-04-16 18:21:14 +0000
commit61ffd4029032862c871c98ac04f12d4141d59383 (patch)
treeb49449dd559ce7c717750d9da9684fdfce5ce481 /tools/aapt2/StringPool_test.cpp
parent35ecb89a8aa68f24d2e991df5bb9964ad15075dc (diff)
Revert "AAPT: Modified StringPool uniqueness detection"
This reverts commit 35ecb89a8aa68f24d2e991df5bb9964ad15075dc. Reason for revert: <Long make duration (infinite loop)> Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab
Diffstat (limited to 'tools/aapt2/StringPool_test.cpp')
-rw-r--r--tools/aapt2/StringPool_test.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/tools/aapt2/StringPool_test.cpp b/tools/aapt2/StringPool_test.cpp
index 5f7d3d6b1d03..58a03de60f93 100644
--- a/tools/aapt2/StringPool_test.cpp
+++ b/tools/aapt2/StringPool_test.cpp
@@ -61,17 +61,6 @@ TEST(StringPoolTest, DoNotInsertNewDuplicateString) {
EXPECT_THAT(pool.size(), Eq(1u));
}
-TEST(StringPoolTest, DoNotDedupeSameStringDifferentPriority) {
- StringPool pool;
-
- StringPool::Ref ref_a = pool.MakeRef("wut", StringPool::Context(1));
- StringPool::Ref ref_b = pool.MakeRef("wut", StringPool::Context(2));
-
- EXPECT_THAT(*ref_a, Eq("wut"));
- EXPECT_THAT(*ref_b, Eq("wut"));
- EXPECT_THAT(pool.size(), Eq(2u));
-}
-
TEST(StringPoolTest, MaintainInsertionOrderIndex) {
StringPool pool;
@@ -303,6 +292,7 @@ TEST(StringPoolTest, Flatten) {
}
}
+
TEST(StringPoolTest, MaxEncodingLength) {
StdErrDiagnostics diag;
using namespace android; // For NO_ERROR on Windows.