Make DexTagTests compatible with CLI testing

Change-Id: Ib5cc13c4f58c3815be691a886b79c308d12ea873

1 files changed, 13 insertions, 3 deletions

diff --git a/jack-tests/tests/com/android/jack/dextag/DexTagTests.java b/jack-tests/tests/com/android/jack/dextag/DexTagTests.java
index 8a5fae3..fd3498c 100644
--- a/jack-tests/tests/com/android/jack/dextag/DexTagTests.java
+++ b/jack-tests/tests/com/android/jack/dextag/DexTagTests.java
@@ -27,6 +27,9 @@ import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
+
+import javax.annotation.Nonnull;
 
 public class DexTagTests {
 
@@ -46,8 +49,15 @@ public class DexTagTests {
     Assert.assertTrue(hasTag(classesDex));
   }
 
-  private boolean hasTag(File dexFile) throws IOException {
-    DexBuffer dex = new DexBuffer(dexFile);
-    return dex.strings().contains(DexWriter.getJackDexTag());
+  private boolean hasTag(@Nonnull File dexFile) throws IOException {
+    Iterator<String> stringsIt = new DexBuffer(dexFile).strings().iterator();
+
+    while (stringsIt.hasNext()) {
+      if (DexWriter.isJackDexTag(stringsIt.next())) {
+        return true;
+      }
+    }
+
+    return false;
   }
 }