diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java | 57 |
1 files changed, 28 insertions, 29 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 7f388c30b8..94529e3db3 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java @@ -47,7 +47,7 @@ public class AndroidDataSerializerAndDeserializerTest { @Before public void createCleanEnvironment() throws Exception { fs = Jimfs.newFileSystem(); - fqnFactory = FullyQualifiedName.Factory.from(ImmutableList.of()); + fqnFactory = FullyQualifiedName.Factory.from(ImmutableList.<String>of()); source = Files.createDirectory(fs.getPath("source")); manifest = Files.createFile(source.resolve("AndroidManifest.xml")); } @@ -80,7 +80,8 @@ public class AndroidDataSerializerAndDeserializerTest { UnwrittenMergedAndroidData.of( manifest, ParsedAndroidDataBuilder.buildOn(source, fqnFactory) - .combining(xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) + .combining( + xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) .build(), ParsedAndroidDataBuilder.empty()); expected.serializeTo(serializer); @@ -158,7 +159,10 @@ public class AndroidDataSerializerAndDeserializerTest { .createManifest("AndroidManifest.xml", "com.carroll.lewis", "") .buildParsed(); UnwrittenMergedAndroidData expected = - UnwrittenMergedAndroidData.of(manifest, direct, ParsedAndroidDataBuilder.empty()); + UnwrittenMergedAndroidData.of( + manifest, + direct, + ParsedAndroidDataBuilder.empty()); expected.serializeTo(serializer); serializer.flushTo(binaryPath); @@ -168,8 +172,10 @@ public class AndroidDataSerializerAndDeserializerTest { deserializer.read( binaryPath, KeyValueConsumers.of( - overwriting, combining, null // assets - )); + overwriting, + combining, + null // assets + )); Truth.assertThat(overwriting).isEqualTo(expected.getPrimary().getOverwritingResources()); Truth.assertThat(combining).isEqualTo(expected.getPrimary().getCombiningResources()); } @@ -184,17 +190,17 @@ public class AndroidDataSerializerAndDeserializerTest { ParsedAndroidDataBuilder.buildOn(source, fqnFactory) .overwritable( file("layout/banker").source("layout/banker.xml"), - xml("<resources>/foo") - .source("values/ids.xml") - .value( - ResourcesAttribute.of( - fqnFactory.parse("<resources>/foo"), "foo", "fooVal"))) - .combining(xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) + xml("<resources>/foo").source("values/ids.xml") + .value(ResourcesAttribute.of( + fqnFactory.parse("<resources>/foo"), "foo", "fooVal"))) + .combining( + xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) .assets(file().source("hunting/of/the/boojum")) .build(), ParsedAndroidDataBuilder.buildOn(source, fqnFactory) .overwritable(file("layout/butcher").source("layout/butcher.xml")) - .combining(xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) + .combining( + xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) .assets(file().source("hunting/of/the/snark")) .build()); expected.serializeTo(serializer); @@ -226,43 +232,36 @@ public class AndroidDataSerializerAndDeserializerTest { ParsedAndroidDataBuilder.buildOn(source, fqnFactory) .overwritable( file("layout/banker").source("layout/banker.xml"), - xml("<resources>/foo") - .source("values/res.xml") - .value( - ResourcesAttribute.of( - fqnFactory.parse("<resources>/foo"), "foo", "fooVal"))) - .combining(xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) + xml("<resources>/foo").source("values/ids.xml") + .value(ResourcesAttribute.of( + fqnFactory.parse("<resources>/foo"), "foo", "fooVal"))) + .combining( + xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) .assets(file().source("hunting/of/the/boojum")) .build(), ParsedAndroidDataBuilder.buildOn(source, fqnFactory) .overwritable(file("layout/butcher").source("layout/butcher.xml")) - .combining(xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) + .combining( + xml("id/snark").source("values/ids.xml").value(IdXmlResourceValue.of())) .assets(file().source("hunting/of/the/snark")) .build()); expected.serializeTo(serializer); serializer.flushTo(binaryPath); - // Create a file to demonstrate an overmatched filtering - Files.createDirectories(source.resolve("res/values/ids.xml")); - AndroidDataDeserializer deserializer = AndroidParsedDataDeserializer.withFilteredResources( - ImmutableList.of( - "the/boojum", "values/ids.xml", "layout/banker.xml", "values/res.xml")); + ImmutableList.of("the/boojum", "values/ids.xml", "layout/banker.xml")); KeyValueConsumers primary = KeyValueConsumers.of( TestMapConsumer.ofResources(), // overwriting TestMapConsumer.ofResources(), // combining - TestMapConsumer.ofAssets() // assets + null // assets ); deserializer.read(binaryPath, primary); Truth.assertThat(primary.overwritingConsumer).isEqualTo(Collections.emptyMap()); - Truth.assertThat(primary.combiningConsumer) - .named("Filtered resources that exist should not be filtered.") - .isEqualTo(expected.getPrimary().getCombiningResources()); - Truth.assertThat(primary.assetConsumer).isEqualTo(Collections.emptyMap()); + Truth.assertThat(primary.combiningConsumer).isEqualTo(Collections.emptyMap()); } private static class TestMapConsumer<T extends DataValue> |