diff options
Diffstat (limited to 'src/test/java/com/google')
4 files changed, 27 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexBuilderTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexBuilderTest.java index 01236b3e4c..f5e01e46b7 100644 --- a/src/test/java/com/google/devtools/build/android/dexer/DexBuilderTest.java +++ b/src/test/java/com/google/devtools/build/android/dexer/DexBuilderTest.java @@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; import com.android.dex.Dex; +import com.android.dx.dex.code.PositionList; import com.google.common.io.ByteStreams; import java.nio.file.FileSystems; import java.nio.file.Path; @@ -43,7 +44,10 @@ public class DexBuilderTest { options.outputZip = FileSystems.getDefault().getPath(System.getenv("TEST_TMPDIR"), "dex_builder_test.zip"); options.maxThreads = 1; - DexBuilder.buildDexArchive(options, new Dexing(new Dexing.DexingOptions())); + Dexing.DexingOptions dexingOptions = new Dexing.DexingOptions(); + dexingOptions.optimize = true; + dexingOptions.positionInfo = PositionList.LINES; + DexBuilder.buildDexArchive(options, new Dexing(dexingOptions)); assertThat(options.outputZip.toFile().exists()).isTrue(); HashSet<String> files = new HashSet<>(); diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexConversionEnqueuerTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexConversionEnqueuerTest.java index 5f1bb828dc..b032f964ee 100644 --- a/src/test/java/com/google/devtools/build/android/dexer/DexConversionEnqueuerTest.java +++ b/src/test/java/com/google/devtools/build/android/dexer/DexConversionEnqueuerTest.java @@ -23,6 +23,7 @@ import com.android.dex.Dex; import com.android.dx.command.dexer.DxContext; import com.android.dx.dex.DexOptions; import com.android.dx.dex.cf.CfOptions; +import com.android.dx.dex.code.PositionList; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; @@ -149,10 +150,16 @@ public class DexConversionEnqueuerTest { Dex dex = new Dex(dexcode); assertThat(dex.classDefs()).hasSize(1); - assertThat(cache.getIfPresent(DexingKey.create(false, false, bytecode))).isSameAs(dexcode); - assertThat(cache.getIfPresent(DexingKey.create(true, false, bytecode))).isNull(); - assertThat(cache.getIfPresent(DexingKey.create(false, true, bytecode))).isNull(); - assertThat(cache.getIfPresent(DexingKey.create(true, true, bytecode))).isNull(); + assertThat(cache.getIfPresent(DexingKey.create(false, false, PositionList.LINES, bytecode))) + .isSameAs(dexcode); + assertThat(cache.getIfPresent(DexingKey.create(false, false, PositionList.NONE, bytecode))) + .isNull(); + assertThat(cache.getIfPresent(DexingKey.create(true, false, PositionList.LINES, bytecode))) + .isNull(); + assertThat(cache.getIfPresent(DexingKey.create(false, true, PositionList.LINES, bytecode))) + .isNull(); + assertThat(cache.getIfPresent(DexingKey.create(true, true, PositionList.LINES, bytecode))) + .isNull(); return dexcode; } diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java index 38c7f4f5a9..7ea6231d29 100644 --- a/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java +++ b/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.fail; import com.android.dex.ClassDef; import com.android.dex.Dex; import com.android.dx.command.dexer.DxContext; +import com.android.dx.dex.code.PositionList; import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.HashMultimap; @@ -292,7 +293,10 @@ public class DexFileMergerTest { options.outputZip = FileSystems.getDefault().getPath(System.getenv("TEST_TMPDIR"), "libtests.dex.zip"); options.maxThreads = 1; - DexBuilder.buildDexArchive(options, new Dexing(new DxContext(), new Dexing.DexingOptions())); + Dexing.DexingOptions dexingOptions = new Dexing.DexingOptions(); + dexingOptions.optimize = true; + dexingOptions.positionInfo = PositionList.LINES; + DexBuilder.buildDexArchive(options, new Dexing(new DxContext(), dexingOptions)); return options.outputZip; } diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexingKeyTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexingKeyTest.java index f7250c9bbb..5cc1d9afae 100644 --- a/src/test/java/com/google/devtools/build/android/dexer/DexingKeyTest.java +++ b/src/test/java/com/google/devtools/build/android/dexer/DexingKeyTest.java @@ -30,9 +30,10 @@ public class DexingKeyTest { @Test public void testOrderMatters() { - DexingKey key = DexingKey.create(false, true, new byte[0]); + DexingKey key = DexingKey.create(false, true, 2, new byte[0]); assertThat(key.localInfo()).isFalse(); assertThat(key.optimize()).isTrue(); + assertThat(key.positionInfo()).isEqualTo(2); } /** @@ -41,10 +42,10 @@ public class DexingKeyTest { */ @Test public void testContentMatters() { - assertThat(DexingKey.create(false, false, new byte[] { 1, 2, 3 })) - .isEqualTo(DexingKey.create(false, false, new byte[] { 1, 2, 3 })); - assertThat(DexingKey.create(false, false, new byte[] { 1, 2, 3 })) - .isNotEqualTo(DexingKey.create(false, false, new byte[] { 1, 3, 3 })); + assertThat(DexingKey.create(false, false, 1, new byte[] { 1, 2, 3 })) + .isEqualTo(DexingKey.create(false, false, 1, new byte[] { 1, 2, 3 })); + assertThat(DexingKey.create(false, false, 1, new byte[] { 1, 2, 3 })) + .isNotEqualTo(DexingKey.create(false, false, 1, new byte[] { 1, 3, 3 })); } /** |