diff options
| author |  corysmith <corysmith@google.com> | 2017-11-03 19:09:06 +0100 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-11-06 20:20:06 +0100 |
| commit | 3e4736f306e892977ac543b33c49edbaba5c2019 (patch) | |
| tree | ca440c057670d964cc908d743d05af9f994cecf9 /src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java | |
| parent | f30928815269bfa237c99e9f49c2703d32455b3e (diff) | |
Simplify the merge code, and fix a few incorrectly declared tests.
RELNOTES: None
PiperOrigin-RevId: 174485947
Diffstat (limited to 'src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java | 5 |
1 files changed, 1 insertions, 4 deletions
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 78d9789af4..6b2fe1baf4 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java @@ -337,8 +337,6 @@ 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( @@ -382,10 +380,9 @@ public class ParsedAndroidDataTest { ImmutableMap.<DataKey, DataResource>of( idSomeId, // key DataResourceXml.createWithNoNamespace( - rootValuesPath, IdXmlResourceValue.of()) // value + otherRootValuesPath, IdXmlResourceValue.of()) // value ), ImmutableMap.<DataKey, DataAsset>of())); - } @Test |