From 54c3cbefcc0b6f5a6fb50b48fe2da915122238d6 Mon Sep 17 00:00:00 2001
From: corysmith <corysmith@google.com>
Date: Thu, 4 May 2017 19:47:56 +0200
Subject: Remove MergingException

Fixes https://github.com/bazelbuild/bazel/issues/2709

RELNOTES: None.
PiperOrigin-RevId: 155097576
---
 .../java/com/google/devtools/build/android/AndroidDataBuilder.java  | 2 +-
 .../java/com/google/devtools/build/android/DataResourceXmlTest.java | 2 +-
 .../com/google/devtools/build/android/ParsedAndroidDataTest.java    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/test/java/com/google/devtools/build/android')

diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java b/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java
index 3e92eb64a4..fb62c5bda2 100644
--- a/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java
+++ b/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java
@@ -13,10 +13,10 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import com.android.ide.common.res2.MergingException;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
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 b839b395a4..94fec38e55 100644
--- a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
+++ b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.android;
 import static com.google.common.truth.Truth.assertAbout;
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.ide.common.res2.MergingException;
 import com.android.resources.ResourceType;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -29,6 +28,7 @@ import com.google.common.io.RecursiveDeleteOption;
 import com.google.common.jimfs.Jimfs;
 import com.google.common.truth.FailureStrategy;
 import com.google.common.truth.SubjectFactory;
+import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
 import com.google.devtools.build.android.xml.ArrayXmlResourceValue;
 import com.google.devtools.build.android.xml.ArrayXmlResourceValue.ArrayType;
 import com.google.devtools.build.android.xml.AttrXmlResourceValue;
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");
-- 
cgit v1.2.3