diff options
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 | 6 |
1 files changed, 3 insertions, 3 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 51971ceb17..7a8e9c9d1d 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java @@ -15,7 +15,6 @@ package com.google.devtools.build.android; import static com.google.common.truth.Truth.assertThat; -import com.android.ide.common.res2.MergingException; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -24,6 +23,7 @@ import com.google.common.jimfs.Jimfs; import com.google.common.truth.FailureStrategy; import com.google.common.truth.SubjectFactory; import com.google.common.truth.Truth; +import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.FullyQualifiedName.Factory; import com.google.devtools.build.android.xml.AttrXmlResourceValue; import com.google.devtools.build.android.xml.IdXmlResourceValue; @@ -604,7 +604,7 @@ public class ParsedAndroidDataTest { builder.buildParsed(); Assert.fail("expected MergingException"); } catch (MergingException e) { - assertThat(e).hasMessageThat().isEqualTo("Error: 3 Parse Error(s)"); + assertThat(e).hasMessageThat().isEqualTo("3 Parse Error(s)"); String combinedSuberrors = Joiner.on('\n').join(e.getSuppressed()); assertThat(combinedSuberrors) .contains("values/unique_strings.xml: ParseError at [row,col]:[3,35]"); @@ -648,7 +648,7 @@ public class ParsedAndroidDataTest { builder.buildParsed(); Assert.fail("expected exception"); } catch (MergingException e) { - assertThat(e).hasMessageThat().isEqualTo("Error: 5 Parse Error(s)"); + assertThat(e).hasMessageThat().isEqualTo("5 Parse Error(s)"); String combinedSuberrors = Joiner.on('\n').join(e.getSuppressed()); assertThat(combinedSuberrors).contains("values/missing_name.xml"); assertThat(combinedSuberrors).contains("resource name is required for public"); |