commit 61ffd4029032862c871c98ac04f12d4141d59383
author Ryan Mitchell <rtmitchell@google.com> Mon Apr 16 18:21:14 2018 +0000
committer Ryan Mitchell <rtmitchell@google.com> Mon Apr 16 18:21:14 2018 +0000
tree b49449dd559ce7c717750d9da9684fdfce5ce481
parent 35ecb89a8aa68f24d2e991df5bb9964ad15075dc

Revert "AAPT: Modified StringPool uniqueness detection"

This reverts commit 35ecb89a8aa68f24d2e991df5bb9964ad15075dc.

Reason for revert: <Long make duration (infinite loop)>

Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab

tools/aapt2/StringPool_test.cpp

diff --git a/tools/aapt2/StringPool_test.cpp b/tools/aapt2/StringPool_test.cpp
index 5f7d3d6..58a03de 100644
--- a/tools/aapt2/StringPool_test.cpp
+++ b/tools/aapt2/StringPool_test.cpp
@@ -61,17 +61,6 @@
   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, MaxEncodingLength) {
   StdErrDiagnostics diag;
   using namespace android;  // For NO_ERROR on Windows.