Move EmptyRecordAnnotationTest to java 17 package
Bug: b/363926134
Change-Id: Ib4fc4676d51e8d0f1ad692a9a1aa2139df55f263
diff --git a/src/test/examplesJava17/records/EmptyRecordAnnotation.java b/src/test/examplesJava17/records/EmptyRecordAnnotation.java
deleted file mode 100644
index 350e8ce..0000000
--- a/src/test/examplesJava17/records/EmptyRecordAnnotation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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 records;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-public class EmptyRecordAnnotation {
-
- record Empty() {}
-
- @Retention(RetentionPolicy.RUNTIME)
- @interface ClassAnnotation {
- Class<? extends Record> theClass();
- }
-
- @ClassAnnotation(theClass = Record.class)
- public static void annotatedMethod1() {}
-
- @ClassAnnotation(theClass = Empty.class)
- public static void annotatedMethod2() {}
-
- public static void main(String[] args) throws Exception {
- Class<?> annotatedMethod1Content =
- EmptyRecordAnnotation.class
- .getDeclaredMethod("annotatedMethod1")
- .getAnnotation(ClassAnnotation.class)
- .theClass();
- System.out.println(annotatedMethod1Content);
- Class<?> annotatedMethod2Content =
- EmptyRecordAnnotation.class
- .getDeclaredMethod("annotatedMethod2")
- .getAnnotation(ClassAnnotation.class)
- .theClass();
- System.out.println(annotatedMethod2Content);
- }
-}
diff --git a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java b/src/test/examplesJava17/records/EmptyRecordAnnotationTest.java
similarity index 64%
rename from src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java
rename to src/test/examplesJava17/records/EmptyRecordAnnotationTest.java
index 84f3ea9..1759f97 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java
+++ b/src/test/examplesJava17/records/EmptyRecordAnnotationTest.java
@@ -2,14 +2,16 @@
// 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.desugar.records;
+package records;
-
+import com.android.tools.r8.JdkClassFileProvider;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.TestRuntime.CfVm;
import com.android.tools.r8.utils.StringUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -17,14 +19,11 @@
@RunWith(Parameterized.class)
public class EmptyRecordAnnotationTest extends TestBase {
- private static final String RECORD_NAME = "EmptyRecordAnnotation";
- private static final byte[][] PROGRAM_DATA = RecordTestUtils.getProgramData(RECORD_NAME);
- private static final String MAIN_TYPE = RecordTestUtils.getMainType(RECORD_NAME);
private static final String EXPECTED_RESULT_NATIVE_OR_PARTIALLY_DESUGARED_RECORD =
- StringUtils.lines("class java.lang.Record", "class records.EmptyRecordAnnotation$Empty");
+ StringUtils.lines("class java.lang.Record", "class records.EmptyRecordAnnotationTest$Empty");
private static final String EXPECTED_RESULT_DESUGARED_RECORD =
StringUtils.lines(
- "class com.android.tools.r8.RecordTag", "class records.EmptyRecordAnnotation$Empty");
+ "class com.android.tools.r8.RecordTag", "class records.EmptyRecordAnnotationTest$Empty");
private final TestParameters parameters;
@@ -45,8 +44,8 @@
public void testJvm() throws Exception {
parameters.assumeJvmTestParameters();
testForJvm(parameters)
- .addProgramClassFileData(PROGRAM_DATA)
- .run(parameters.getRuntime(), MAIN_TYPE)
+ .addInnerClassesAndStrippedOuter(getClass())
+ .run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_RESULT_NATIVE_OR_PARTIALLY_DESUGARED_RECORD);
}
@@ -54,10 +53,10 @@
public void testD8() throws Exception {
parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
- .addProgramClassFileData(PROGRAM_DATA)
+ .addInnerClassesAndStrippedOuter(getClass())
.setMinApi(parameters)
.compile()
- .run(parameters.getRuntime(), MAIN_TYPE)
+ .run(parameters.getRuntime(), TestClass.class)
.applyIf(
isRecordsFullyDesugaredForD8(parameters),
r -> r.assertSuccessWithOutput(EXPECTED_RESULT_DESUGARED_RECORD),
@@ -68,23 +67,54 @@
public void testR8() throws Exception {
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
- .addLibraryFiles(RecordTestUtils.getJdk15LibraryFiles(temp))
- .addProgramClassFileData(PROGRAM_DATA)
+ .addLibraryProvider(JdkClassFileProvider.fromSystemJdk())
+ .addInnerClassesAndStrippedOuter(getClass())
.setMinApi(parameters)
- .addKeepRules("-keep class records.EmptyRecordAnnotation { *; }")
+ .addKeepRules("-keep class records.EmptyRecordAnnotationTest$TestClass { *; }")
.addKeepRules("-keepattributes *Annotation*")
- .addKeepRules("-keep class records.EmptyRecordAnnotation$Empty")
- .addKeepMainRule(MAIN_TYPE)
+ .addKeepRules("-keep class records.EmptyRecordAnnotationTest$Empty")
+ .addKeepMainRule(TestClass.class)
// This is used to avoid renaming com.android.tools.r8.RecordTag.
.applyIf(
isRecordsFullyDesugaredForR8(parameters),
b -> b.addKeepRules("-keep class java.lang.Record"))
.compile()
.applyIf(parameters.isCfRuntime(), r -> r.inspect(RecordTestUtils::assertRecordsAreRecords))
- .run(parameters.getRuntime(), MAIN_TYPE)
+ .run(parameters.getRuntime(), TestClass.class)
.applyIf(
isRecordsFullyDesugaredForR8(parameters),
r -> r.assertSuccessWithOutput(EXPECTED_RESULT_DESUGARED_RECORD),
r -> r.assertSuccessWithOutput(EXPECTED_RESULT_NATIVE_OR_PARTIALLY_DESUGARED_RECORD));
}
+
+ record Empty() {}
+
+ @Retention(RetentionPolicy.RUNTIME)
+ @interface ClassAnnotation {
+ Class<? extends Record> theClass();
+ }
+
+ public class TestClass {
+
+ @ClassAnnotation(theClass = Record.class)
+ public static void annotatedMethod1() {}
+
+ @ClassAnnotation(theClass = Empty.class)
+ public static void annotatedMethod2() {}
+
+ public static void main(String[] args) throws Exception {
+ Class<?> annotatedMethod1Content =
+ TestClass.class
+ .getDeclaredMethod("annotatedMethod1")
+ .getAnnotation(ClassAnnotation.class)
+ .theClass();
+ System.out.println(annotatedMethod1Content);
+ Class<?> annotatedMethod2Content =
+ TestClass.class
+ .getDeclaredMethod("annotatedMethod2")
+ .getAnnotation(ClassAnnotation.class)
+ .theClass();
+ System.out.println(annotatedMethod2Content);
+ }
+ }
}
