Moving DefaultInterfaceMethodDesugaringWithStatic for better review
Change-Id: I429d683348e7133c4e46d1c7460c749b0281ad6c
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithStaticResolutionInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java
similarity index 96%
rename from src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithStaticResolutionInvokeVirtualTest.java
rename to src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java
index e2474ca..cd2b968 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithStaticResolutionInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java
@@ -22,7 +22,7 @@
import org.objectweb.asm.Opcodes;
@RunWith(Parameterized.class)
-public class DefaultInterfaceMethodDesugaringWithStaticResolutionInvokeVirtualTest
+public class DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest
extends TestBase {
private static final String EXPECTED = StringUtils.lines("I.m()");
@@ -36,7 +36,7 @@
getTestParameters().withAllRuntimesAndApiLevels().build(), BooleanUtils.values());
}
- public DefaultInterfaceMethodDesugaringWithStaticResolutionInvokeVirtualTest(
+ public DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest(
TestParameters parameters, boolean invalidInvoke) {
this.parameters = parameters;
this.invalidInvoke = invalidInvoke;
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithStaticResolutionTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java
similarity index 75%
rename from src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithStaticResolutionTest.java
rename to src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java
index c649c8d..3a55d74 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithStaticResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java
@@ -1,3 +1,6 @@
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.desugaring.interfacemethods;
import static org.junit.Assume.assumeTrue;
@@ -11,7 +14,7 @@
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class DefaultInterfaceMethodDesugaringWithStaticResolutionTest extends TestBase {
+public class DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest extends TestBase {
private static final String EXPECTED = StringUtils.lines("I.m()");
@@ -22,7 +25,8 @@
return getTestParameters().withAllRuntimesAndApiLevels().build();
}
- public DefaultInterfaceMethodDesugaringWithStaticResolutionTest(TestParameters parameters) {
+ public DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest(
+ TestParameters parameters) {
this.parameters = parameters;
}
@@ -39,7 +43,7 @@
public void testD8() throws Exception {
assumeTrue(parameters.isDexRuntime());
testForD8()
- .addInnerClasses(DefaultInterfaceMethodDesugaringWithStaticResolutionTest.class)
+ .addInnerClasses(DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.class)
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), TestClass.class)
@@ -49,7 +53,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .addInnerClasses(DefaultInterfaceMethodDesugaringWithStaticResolutionTest.class)
+ .addInnerClasses(DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.class)
.addKeepAllClassesRule()
.setMinApi(parameters.getApiLevel())
.compile()
