diff options
author | 2017-11-15 11:55:15 -0800 | |
---|---|---|
committer | 2017-11-15 11:57:13 -0800 | |
commit | 7925d5b265249466bff385602e94509a05de6870 (patch) | |
tree | 9543038c23171dd93261a792a6f0571591e3cb09 /src/test/java/com/google/devtools | |
parent | 1e0b7cb49b5d22f72d9e32018d15972a9f28878c (diff) |
Create merge action and data deserializer for aapt2 compiled resources.
RELNOTES: None
PiperOrigin-RevId: 175858467
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java | 12 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java index 0afaf0cfa5..94529e3db3 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java @@ -66,7 +66,7 @@ public class AndroidDataSerializerAndDeserializerTest { expected.serializeTo(serializer); serializer.flushTo(binaryPath); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); TestMapConsumer<DataAsset> assets = TestMapConsumer.ofAssets(); deserializer.read(binaryPath, KeyValueConsumers.of(null, null, assets)); Truth.assertThat(assets).isEqualTo(expected.getPrimary().getAssets()); @@ -87,7 +87,7 @@ public class AndroidDataSerializerAndDeserializerTest { expected.serializeTo(serializer); serializer.flushTo(binaryPath); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); TestMapConsumer<DataResource> resources = TestMapConsumer.ofResources(); deserializer.read( binaryPath, @@ -113,7 +113,7 @@ public class AndroidDataSerializerAndDeserializerTest { expected.serializeTo(serializer); serializer.flushTo(binaryPath); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); TestMapConsumer<DataResource> resources = TestMapConsumer.ofResources(); deserializer.read( binaryPath, @@ -166,7 +166,7 @@ public class AndroidDataSerializerAndDeserializerTest { expected.serializeTo(serializer); serializer.flushTo(binaryPath); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); TestMapConsumer<DataResource> overwriting = TestMapConsumer.ofResources(); TestMapConsumer<DataResource> combining = TestMapConsumer.ofResources(); deserializer.read( @@ -213,7 +213,7 @@ public class AndroidDataSerializerAndDeserializerTest { TestMapConsumer.ofAssets() // assets ); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); deserializer.read(binaryPath, primary); Truth.assertThat(primary.overwritingConsumer) .isEqualTo(expected.getPrimary().getOverwritingResources()); @@ -249,7 +249,7 @@ public class AndroidDataSerializerAndDeserializerTest { serializer.flushTo(binaryPath); AndroidDataDeserializer deserializer = - AndroidDataDeserializer.withFilteredResources( + AndroidParsedDataDeserializer.withFilteredResources( ImmutableList.of("the/boojum", "values/ids.xml", "layout/banker.xml")); KeyValueConsumers primary = diff --git a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java index 315a9c9ae6..aa91bf91c3 100644 --- a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java +++ b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java @@ -1071,7 +1071,7 @@ public class DataResourceXmlTest { serializer.queueForSerialization(dimenKey, dimenValue); serializer.flushTo(serialized); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); final Map<DataKey, DataResource> toOverwrite = new HashMap<>(); final Map<DataKey, DataResource> toCombine = new HashMap<>(); deserializer.read( @@ -1132,7 +1132,7 @@ public class DataResourceXmlTest { serializer.queueForSerialization(themeKey, themeValue); serializer.flushTo(serialized); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); final Map<DataKey, DataResource> toOverwrite = new HashMap<>(); final Map<DataKey, DataResource> toCombine = new HashMap<>(); deserializer.read( @@ -1258,7 +1258,7 @@ public class DataResourceXmlTest { serializer.queueForSerialization(key, value); serializer.flushTo(serialized); - AndroidDataDeserializer deserializer = AndroidDataDeserializer.create(); + AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.create(); final Map<DataKey, DataResource> toOverwrite = new HashMap<>(); final Map<DataKey, DataResource> toCombine = new HashMap<>(); deserializer.read( |