diff options
author | 2017-11-03 21:04:40 +0100 | |
---|---|---|
committer | 2017-11-06 20:20:15 +0100 | |
commit | c28b4ce92294a62b26f814d35d0bcaae9b605324 (patch) | |
tree | 8e31e68351a26cb46deca3e3bb9e25338cd9d023 /src/test/java | |
parent | f675cb77cbd9a7290a0e5b4c71f0de1a09d71c62 (diff) |
Automated rollback of commit 3181c2f1362622985aca24747ed9512573d25dc0.
RELNOTES: None
PiperOrigin-RevId: 174502289
Diffstat (limited to 'src/test/java')
4 files changed, 41 insertions, 42 deletions
diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java index 46177e7eac..e28d65ceb3 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java @@ -22,7 +22,8 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.jimfs.Jimfs; -import com.google.common.truth.Subject; +import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SubjectFactory; import com.google.devtools.build.android.AndroidDataBuilder.ResourceType; import com.google.devtools.build.android.AndroidDataMerger.MergeConflictException; import com.google.devtools.build.android.AndroidDataMerger.SourceChecker; @@ -179,7 +180,7 @@ public class AndroidDataMergerTest { file("layout/exit").root(directRoot).source("res/layout/exit.xml")) .combining( xml("id/exit") - .root(transitiveRoot) + .root(directRoot) .source("values/ids.xml") .value(IdXmlResourceValue.of())) .build()); @@ -243,7 +244,7 @@ public class AndroidDataMergerTest { file("layout/exit").root(directRoot).source("res/layout/exit.xml")) .combining( xml("id/exit") - .root(transitiveRoot) + .root(directRoot) .source("values/ids.xml") .value(IdXmlResourceValue.of())) .build()); @@ -462,11 +463,6 @@ public class AndroidDataMergerTest { Path primaryRoot = fileSystem.getPath("primary"); Path directRoot = fileSystem.getPath("direct"); Path transitiveRoot = fileSystem.getPath("transitive"); - DataSource primaryStrings = DataSource.of(primaryRoot.resolve("res/values/strings.xml")); - DataSource transitive1String = - DataSource.of(transitiveRoot.resolve("1/res/values/strings.xml")); - DataSource transitive2String = - DataSource.of(transitiveRoot.resolve("2/res/values/strings.xml")); ParsedAndroidData transitiveDependency = ParsedAndroidDataBuilder.buildOn(transitiveRoot, fqnFactory) @@ -502,7 +498,7 @@ public class AndroidDataMergerTest { .overwritable( xml("string/exit") .root(primaryRoot) - .source(primaryStrings.overwrite(transitive1String, transitive2String)) + .source("values/strings.xml") .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out"))) .build(), ParsedAndroidDataBuilder.empty()); @@ -589,13 +585,13 @@ public class AndroidDataMergerTest { assertThat(loggingHandler.warnings) .containsExactly( MergeConflict.of( - fullyQualifiedName, - DataResourceXml.createWithNoNamespace( - primaryRoot.resolve("res/values/strings.xml"), - SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")), - DataResourceXml.createWithNoNamespace( - transitiveRoot.resolve("res/values/strings.xml"), - SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out"))) + fullyQualifiedName, + DataResourceXml.createWithNoNamespace( + directRoot.resolve("res/values/strings.xml"), + SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")), + DataResourceXml.createWithNoNamespace( + transitiveRoot.resolve("res/values/strings.xml"), + SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out"))) .toConflictMessage()); } @@ -681,7 +677,7 @@ public class AndroidDataMergerTest { ParsedAndroidDataBuilder.buildOn(fqnFactory) .overwritable( xml("string/exit") - .source(primaryStrings.overwrite(directStrings, transitiveStrings)) + .source(primaryStrings.overwrite(directStrings)) .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out"))) .build(), ParsedAndroidDataBuilder.empty()); @@ -949,7 +945,7 @@ public class AndroidDataMergerTest { file("layout/zzDirect").source(directLayout)) .combining( xml("id/back_door").source(transitiveLayout).value(IdXmlResourceValue.of()), - xml("id/slide").source(transitiveLayout).value(IdXmlResourceValue.of())) + xml("id/slide").source(directLayout).value(IdXmlResourceValue.of())) .build()); assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected); } @@ -1168,14 +1164,10 @@ public class AndroidDataMergerTest { public void mergeAssetsTransitiveConflictWithPrimaryOverride() throws Exception { Path primaryRoot = fileSystem.getPath("primary"); Path transitiveRoot = fileSystem.getPath("transitive"); - DataSource transitiveSource = - DataSource.of(transitiveRoot.resolve("assets/hunting/of/the/snark.txt")); - DataSource primarySource = - DataSource.of(primaryRoot.resolve("assets/hunting/of/the/snark.txt")); ParsedAndroidData transitiveDependency = ParsedAndroidDataBuilder.buildOn(transitiveRoot) - .assets(file().source(transitiveSource)) + .assets(file().source("hunting/of/the/snark.txt")) .build(); ParsedAndroidData directDependency = ParsedAndroidDataBuilder.empty(); @@ -1193,7 +1185,7 @@ public class AndroidDataMergerTest { UnwrittenMergedAndroidData.of( primary.getManifest(), ParsedAndroidDataBuilder.buildOn(primaryRoot) - .assets(file().source(primarySource.overwrite(transitiveSource))) + .assets(file().source("hunting/of/the/snark.txt")) .build(), ParsedAndroidDataBuilder.empty()); assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected); @@ -1263,13 +1255,13 @@ public class AndroidDataMergerTest { MergeConflict.of( RelativeAssetPath.Factory.of(directRoot.resolve("assets")) .create(directRoot.resolve("assets/hunting/of/the/snark.txt")), - DataValueFile.of(primaryRoot.resolve("assets/hunting/of/the/snark.txt")), + DataValueFile.of(directRoot.resolve("assets/hunting/of/the/snark.txt")), DataValueFile.of(transitiveRoot.resolve("assets/hunting/of/the/snark.txt"))) .toConflictMessage()); } @Test - public void imergeAssetsDirectTransitivePrimaryConflictWithPrimaryOverride() throws Exception { + public void mergeAssetsDirectTransitivePrimaryConflictWithPrimaryOverride() throws Exception { Path primaryRoot = fileSystem.getPath("primary"); Path directRoot = fileSystem.getPath("direct"); Path transitiveRoot = fileSystem.getPath("transitive"); @@ -1277,8 +1269,6 @@ public class AndroidDataMergerTest { DataSource primarySource = DataSource.of(primaryRoot.resolve("assets/hunting/of/the/snark.txt")); DataSource directSource = DataSource.of(directRoot.resolve("assets/hunting/of/the/snark.txt")); - DataSource transitiveSource = - DataSource.of(transitiveRoot.resolve("assets/hunting/of/the/snark.txt")); ParsedAndroidData transitiveDependency = ParsedAndroidDataBuilder.buildOn(transitiveRoot) @@ -1299,19 +1289,26 @@ public class AndroidDataMergerTest { UnwrittenMergedAndroidData data = AndroidDataMerger.createWithDefaults() .merge(transitiveDependency, directDependency, primary, true, true); - + UnwrittenMergedAndroidData expected = UnwrittenMergedAndroidData.of( primary.getManifest(), ParsedAndroidDataBuilder.buildOn(primaryRoot) - .assets(file().source(primarySource.overwrite(directSource, transitiveSource))) + .assets(file().source(primarySource.overwrite(directSource))) .build(), ParsedAndroidDataBuilder.empty()); assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected); } - final Subject.Factory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> - unwrittenMergedAndroidData = UnwrittenMergedAndroidDataSubject.FACTORY; + final SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> + unwrittenMergedAndroidData = + new SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData>() { + @Override + public UnwrittenMergedAndroidDataSubject getSubject( + FailureStrategy fs, UnwrittenMergedAndroidData that) { + return new UnwrittenMergedAndroidDataSubject(fs, that); + } + }; private static final class TestLoggingHandler extends Handler { public final List<String> warnings = new ArrayList<String>(); diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java index a9e6dae9c6..a8cbd2161e 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java @@ -251,8 +251,6 @@ public class AndroidDataWriterTest { source.resolve("AndroidManifest.xml"), direct, ParsedAndroidDataBuilder.empty()) .write(mergedDataWriter); - - assertAbout(paths).that(actual.getManifest()).exists(); assertAbout(paths).that(actual.getResourceDir().resolve("values/values.xml")).exists(); assertAbout(paths) @@ -264,9 +262,9 @@ public class AndroidDataWriterTest { "<integer name='zoo'>54321</integer>", "<!-- " + fs.getPath("source/res/values/strings.xml") + " --><eat-comment/>", "<string name='foo'>meow</string>", + "<!-- " + fs.getPath("source/res/values/integers.xml") + " --><eat-comment/>", "<public name='foo' type='integer' id='0x7f040000'/>", "<public name='foo' type='string' id='0x7f050000'/>", - "<!-- " + fs.getPath("source/res/values/integers.xml") + " --><eat-comment/>", "<public name='zoo' type='integer' />", END_RESOURCES); } diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java index 6b2fe1baf4..78d9789af4 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java @@ -337,6 +337,8 @@ public class ParsedAndroidDataTest { DataSource otherRootValuesPath = DataSource.of(otherRoot.resolve("res/values/attr.xml")); FullyQualifiedName idSomeId = fqnFactory.parse("id/some_id"); + + Truth.assertAbout(parsedAndroidData) .that(dataSet) .isEqualTo( @@ -380,9 +382,10 @@ public class ParsedAndroidDataTest { ImmutableMap.<DataKey, DataResource>of( idSomeId, // key DataResourceXml.createWithNoNamespace( - otherRootValuesPath, IdXmlResourceValue.of()) // value + rootValuesPath, IdXmlResourceValue.of()) // value ), ImmutableMap.<DataKey, DataAsset>of())); + } @Test diff --git a/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java b/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java index 3a72ddae99..5d774a1155 100644 --- a/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java +++ b/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java @@ -16,25 +16,26 @@ package com.google.devtools.build.android; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Objects; -import com.google.common.truth.FailureMetadata; +import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; +import com.google.common.truth.SubjectFactory; import javax.annotation.Nullable; class UnwrittenMergedAndroidDataSubject extends Subject<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> { - static final Subject.Factory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> + static final SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> FACTORY = - new Subject.Factory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData>() { + new SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData>() { @Override - public UnwrittenMergedAndroidDataSubject createSubject( - FailureMetadata fs, UnwrittenMergedAndroidData that) { + public UnwrittenMergedAndroidDataSubject getSubject( + FailureStrategy fs, UnwrittenMergedAndroidData that) { return new UnwrittenMergedAndroidDataSubject(fs, that); } }; public UnwrittenMergedAndroidDataSubject( - FailureMetadata failureStrategy, @Nullable UnwrittenMergedAndroidData subject) { + FailureStrategy failureStrategy, @Nullable UnwrittenMergedAndroidData subject) { super(failureStrategy, subject); } |