commit 9c338e970728bfd0a6e5575fa5fcddae82179838
author Ian Zerny <zerny@google.com> Tue Dec 03 11:19:12 2019 +0100
committer Ian Zerny <zerny@google.com> Tue Dec 03 11:19:12 2019 +0100
tree e08601e7df46dac32fb724aef1fc3baaa001aee0
parent 07024ee7007ba0d9c1ef6c941b31f901e5b4e497

Fix names after implicit merge conflict.

Change-Id: I937780417a9a1ed4f353ed15d29c49eb85902fa9

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibrary2Test.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibrary2Test.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibrary2Test.java
index f3c3f18..220147f 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibrary2Test.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibrary2Test.java
@@ -31,7 +31,7 @@
  * a class with the two conflicting interfaces as the immediate interfaces.
  */
 @RunWith(Parameterized.class)
-public class DefaultMethodOverrideConflictWithLibrary2Test extends CoreLibDesugarTestBase {
+public class DefaultMethodOverrideConflictWithLibrary2Test extends DesugaredLibraryTestBase {
 
   private final TestParameters parameters;
 

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibraryTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibraryTest.java
index 39a186b..d244909 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideConflictWithLibraryTest.java
@@ -33,7 +33,7 @@
  * for removeIf will cause a conflict throwing ICCE.
  */
 @RunWith(Parameterized.class)
-public class DefaultMethodOverrideConflictWithLibraryTest extends CoreLibDesugarTestBase {
+public class DefaultMethodOverrideConflictWithLibraryTest extends DesugaredLibraryTestBase {
 
   private static List<Class<?>> CLASSES = ImmutableList.of(Main.class, MyRemoveIf.class);
 

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideInLibraryTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideInLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideInLibraryTest.java
index 67c92ef..7716c96 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideInLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DefaultMethodOverrideInLibraryTest.java
@@ -34,7 +34,7 @@
  * methods.
  */
 @RunWith(Parameterized.class)
-public class DefaultMethodOverrideInLibraryTest extends CoreLibDesugarTestBase {
+public class DefaultMethodOverrideInLibraryTest extends DesugaredLibraryTestBase {
 
   static final String EXPECTED = StringUtils.lines("0", "42");
 

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NoDefaultMethodOverrideInLibraryTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NoDefaultMethodOverrideInLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NoDefaultMethodOverrideInLibraryTest.java
index e764381..d9f93b9 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NoDefaultMethodOverrideInLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NoDefaultMethodOverrideInLibraryTest.java
@@ -31,7 +31,7 @@
  * removeIf is overridden or a new default method is added should target those extensions.
  */
 @RunWith(Parameterized.class)
-public class NoDefaultMethodOverrideInLibraryTest extends CoreLibDesugarTestBase {
+public class NoDefaultMethodOverrideInLibraryTest extends DesugaredLibraryTestBase {
 
   static final String EXPECTED = StringUtils.lines("MyIntegerList::removeIf", "false", "false");