Restructure internal java 11 tests
Bug: b/344503104
Change-Id: I9a1524e85dea5923a818fbfd310a177f0fc17d76
diff --git a/src/test/examplesJava11/backport/CharSequenceBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/CharSequenceBackportJava11Test.java
similarity index 98%
rename from src/test/examplesJava11/backport/CharSequenceBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/CharSequenceBackportJava11Test.java
index dad526c..0171a34 100644
--- a/src/test/examplesJava11/backport/CharSequenceBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/CharSequenceBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/backport/OptionalBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalBackportJava11Test.java
similarity index 97%
rename from src/test/examplesJava11/backport/OptionalBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalBackportJava11Test.java
index ebbf952..fe678be 100644
--- a/src/test/examplesJava11/backport/OptionalBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/backport/OptionalDoubleBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalDoubleBackportJava11Test.java
similarity index 97%
rename from src/test/examplesJava11/backport/OptionalDoubleBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalDoubleBackportJava11Test.java
index de629a1..f578f0c 100644
--- a/src/test/examplesJava11/backport/OptionalDoubleBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalDoubleBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/backport/OptionalIntBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalIntBackportJava11Test.java
similarity index 97%
rename from src/test/examplesJava11/backport/OptionalIntBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalIntBackportJava11Test.java
index 90d40ef..cf5fbd1 100644
--- a/src/test/examplesJava11/backport/OptionalIntBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalIntBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/backport/OptionalLongBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalLongBackportJava11Test.java
similarity index 97%
rename from src/test/examplesJava11/backport/OptionalLongBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalLongBackportJava11Test.java
index b6f9e43..104a43d 100644
--- a/src/test/examplesJava11/backport/OptionalLongBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/OptionalLongBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/backport/PredicateBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/PredicateBackportJava11Test.java
similarity index 97%
rename from src/test/examplesJava11/backport/PredicateBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/PredicateBackportJava11Test.java
index e8a28c6..e6c8982 100644
--- a/src/test/examplesJava11/backport/PredicateBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/PredicateBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/backport/StringBackportJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/StringBackportJava11Test.java
similarity index 98%
rename from src/test/examplesJava11/backport/StringBackportJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/backport/StringBackportJava11Test.java
index bb11b5e..eb9a416 100644
--- a/src/test/examplesJava11/backport/StringBackportJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/backport/StringBackportJava11Test.java
@@ -2,7 +2,7 @@
// 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 backport;
+package com.android.tools.r8.jdk11.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava11/buffercovariantreturntype/BufferCovariantReturnTypeTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
similarity index 99%
rename from src/test/examplesJava11/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
index ea93966..f812991 100644
--- a/src/test/examplesJava11/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
@@ -2,7 +2,7 @@
// 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 buffercovariantreturntype;
+package com.android.tools.r8.jdk11.buffercovariantreturntype;
import static com.android.tools.r8.TestRuntime.CfVm.JDK11;
diff --git a/src/test/examplesJava11/collectiontoarray/CollectionToArrayTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/CollectionToArrayTest.java
similarity index 98%
rename from src/test/examplesJava11/collectiontoarray/CollectionToArrayTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/CollectionToArrayTest.java
index 5777aa3..b9089aa 100644
--- a/src/test/examplesJava11/collectiontoarray/CollectionToArrayTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/CollectionToArrayTest.java
@@ -2,7 +2,7 @@
// 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 collectiontoarray;
+package com.android.tools.r8.jdk11.desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.SPECIFICATIONS_WITH_CF2CF;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11;
diff --git a/src/test/examplesJava11/file/FilesJava11Test.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/FilesJava11Test.java
similarity index 98%
rename from src/test/examplesJava11/file/FilesJava11Test.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/FilesJava11Test.java
index 1458917..edc3d4b 100644
--- a/src/test/examplesJava11/file/FilesJava11Test.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/FilesJava11Test.java
@@ -2,7 +2,7 @@
// 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 file;
+package com.android.tools.r8.jdk11.desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11_PATH;
diff --git a/src/test/examplesJava11/path/PathOfTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/PathOfTest.java
similarity index 97%
rename from src/test/examplesJava11/path/PathOfTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/PathOfTest.java
index b4b65e5..6c7c525 100644
--- a/src/test/examplesJava11/path/PathOfTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/PathOfTest.java
@@ -2,7 +2,7 @@
// 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 path;
+package com.android.tools.r8.jdk11.desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11_PATH;
diff --git a/src/test/examplesJava11/timeunit/TimeUnitTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/TimeUnitTest.java
similarity index 97%
rename from src/test/examplesJava11/timeunit/TimeUnitTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/TimeUnitTest.java
index 3eed340..3b717db 100644
--- a/src/test/examplesJava11/timeunit/TimeUnitTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugaredlibrary/TimeUnitTest.java
@@ -2,7 +2,7 @@
// 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 timeunit;
+package com.android.tools.r8.jdk11.desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11;
diff --git a/src/test/examplesJava11/horizontalclassmerging/NestClassMergingTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestClassMergingTest.java
similarity index 89%
rename from src/test/examplesJava11/horizontalclassmerging/NestClassMergingTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestClassMergingTest.java
index b8ef472..2aa1ad2 100644
--- a/src/test/examplesJava11/horizontalclassmerging/NestClassMergingTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestClassMergingTest.java
@@ -2,7 +2,7 @@
// 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 horizontalclassmerging;
+package com.android.tools.r8.jdk11.horizontalclassmerging;
public class NestClassMergingTest {
diff --git a/src/test/examplesJava11/horizontalclassmerging/NestClassMergingTestRunner.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestClassMergingTestRunner.java
similarity index 91%
rename from src/test/examplesJava11/horizontalclassmerging/NestClassMergingTestRunner.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestClassMergingTestRunner.java
index f640e6f..7772eae 100644
--- a/src/test/examplesJava11/horizontalclassmerging/NestClassMergingTestRunner.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestClassMergingTestRunner.java
@@ -2,15 +2,15 @@
// 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 horizontalclassmerging;
+package com.android.tools.r8.jdk11.horizontalclassmerging;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestClassMergingTest;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostA;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostA$NestMemberA;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostA$NestMemberB;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostB;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostB$NestMemberA;
-import static horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostB$NestMemberB;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestClassMergingTest;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostA;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostA$NestMemberA;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostA$NestMemberB;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostB;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostB$NestMemberA;
+import static com.android.tools.r8.jdk11.horizontalclassmerging.NestClassMergingTestRunner.HorizontalClassMergingTestSources.nestHostB$NestMemberB;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeTrue;
@@ -240,7 +240,7 @@
.addProgramClassesAndInnerClasses(
NestClassMergingTest.class, NestHostB.class, NestHostA.class)
.addKeepRules(
- "-keeppackagenames horizontalclassmerging",
+ "-keeppackagenames com.android.tools.r8.jdk11.horizontalclassmerging",
"-nomethodstaticizing class * { void privatePrint(...); }")
.apply(configuration)
.enableInliningAnnotations()
diff --git a/src/test/examplesJava11/horizontalclassmerging/NestHostA.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestHostA.java
similarity index 93%
rename from src/test/examplesJava11/horizontalclassmerging/NestHostA.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestHostA.java
index 338d176..60ea0f6 100644
--- a/src/test/examplesJava11/horizontalclassmerging/NestHostA.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestHostA.java
@@ -2,7 +2,7 @@
// 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 horizontalclassmerging;
+package com.android.tools.r8.jdk11.horizontalclassmerging;
import com.android.tools.r8.NeverClassInline;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/horizontalclassmerging/NestHostB.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestHostB.java
similarity index 93%
rename from src/test/examplesJava11/horizontalclassmerging/NestHostB.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestHostB.java
index dc06f74..d9f9763 100644
--- a/src/test/examplesJava11/horizontalclassmerging/NestHostB.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/horizontalclassmerging/NestHostB.java
@@ -2,7 +2,7 @@
// 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 horizontalclassmerging;
+package com.android.tools.r8.jdk11.horizontalclassmerging;
import com.android.tools.r8.NeverClassInline;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostClassMerging.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostClassMerging.java
similarity index 95%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostClassMerging.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostClassMerging.java
index f2de820..32af914 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostClassMerging.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostClassMerging.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostTreePruning.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostTreePruning.java
similarity index 93%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostTreePruning.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostTreePruning.java
index 6928d73..0ef347bc 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostTreePruning.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostTreePruning.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithAnonymousInnerClass.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithAnonymousInnerClass.java
similarity index 96%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithAnonymousInnerClass.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithAnonymousInnerClass.java
index cd9a474..7477866 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithAnonymousInnerClass.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithAnonymousInnerClass.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassConstructors.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassConstructors.java
similarity index 97%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassConstructors.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassConstructors.java
index 744599b..3b3cccc 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassConstructors.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassConstructors.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassFields.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassFields.java
similarity index 96%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassFields.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassFields.java
index 83d536a..d204ac9 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassFields.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassFields.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassMethods.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassMethods.java
similarity index 96%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassMethods.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassMethods.java
index c1b50c8..a4e6f57 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassMethods.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/BasicNestHostWithInnerClassMethods.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/FullNestOnProgramPathTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/FullNestOnProgramPathTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/FullNestOnProgramPathTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/FullNestOnProgramPathTest.java
index d7aaad1..81a70c6 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/FullNestOnProgramPathTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/FullNestOnProgramPathTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestAttributesUpdateTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestAttributesUpdateTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestAttributesUpdateTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestAttributesUpdateTest.java
index 95f06d8..4f8e85a 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestAttributesUpdateTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestAttributesUpdateTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertFalse;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestClassMergingTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestClassMergingTest.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestClassMergingTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestClassMergingTest.java
index e1af3fb..b76ca35 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestClassMergingTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestClassMergingTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import com.android.tools.r8.Jdk9TestUtils;
import com.android.tools.r8.R8TestCompileResult;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestCompilationExceptionTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestCompilationExceptionTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestCompilationExceptionTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestCompilationExceptionTest.java
index 26b7a21..3c9487c 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestCompilationExceptionTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestCompilationExceptionTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticType;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestConstructorRemovedArgTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestConstructorRemovedArgTest.java
similarity index 89%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestConstructorRemovedArgTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestConstructorRemovedArgTest.java
index 36ad284..3e2f691 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestConstructorRemovedArgTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestConstructorRemovedArgTest.java
@@ -2,9 +2,7 @@
// 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.jdk11.desugar.nest;
-
-import static com.android.tools.r8.jdk11.desugar.nest.BasicNestHostWithInnerClassConstructors.getExpectedResult;
+package com.android.tools.r8.jdk11.nest;
import com.android.tools.r8.Jdk9TestUtils;
import com.android.tools.r8.TestBase;
@@ -49,7 +47,7 @@
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
.compile()
.run(parameters.getRuntime(), MAIN_CLASS)
- .assertSuccessWithOutputLines(getExpectedResult());
+ .assertSuccessWithOutputLines(BasicNestHostWithInnerClassConstructors.getExpectedResult());
}
@Test
@@ -65,6 +63,6 @@
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
.compile()
.run(parameters.getRuntime(), MAIN_CLASS)
- .assertSuccessWithOutputLines(getExpectedResult());
+ .assertSuccessWithOutputLines(BasicNestHostWithInnerClassConstructors.getExpectedResult());
}
}
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostExample.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostExample.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostExample.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostExample.java
index 2d908b1..54af594 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostExample.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostExample.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInlining.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostInlining.java
similarity index 94%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInlining.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostInlining.java
index 1ca8c17..c429a32 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInlining.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostInlining.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
public class NestHostInlining {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInliningSubclasses.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostInliningSubclasses.java
similarity index 94%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInliningSubclasses.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostInliningSubclasses.java
index b862e57..67002c6 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInliningSubclasses.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestHostInliningSubclasses.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextClass.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestInitArgumentContextClass.java
similarity index 92%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextClass.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestInitArgumentContextClass.java
index 73aaae8..7651c47 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextClass.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestInitArgumentContextClass.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
class NestInitArgumentContextClass {
public class Inner1 {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestInitArgumentContextTest.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestInitArgumentContextTest.java
index 8041082..0eaf39a 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestInitArgumentContextTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMemberPropagatedTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestMemberPropagatedTest.java
similarity index 97%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMemberPropagatedTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestMemberPropagatedTest.java
index a6a00ec..b5a3aff 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMemberPropagatedTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestMemberPropagatedTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMethodInlinedTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestMethodInlinedTest.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMethodInlinedTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestMethodInlinedTest.java
index 791d1fc..7f13a19 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMethodInlinedTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestMethodInlinedTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertTrue;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramAndClasspathAndLibraryTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestOnProgramAndClasspathAndLibraryTest.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramAndClasspathAndLibraryTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestOnProgramAndClasspathAndLibraryTest.java
index e720d8b..62f6040 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramAndClasspathAndLibraryTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestOnProgramAndClasspathAndLibraryTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static org.junit.Assert.assertThrows;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramOnClassPathTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestOnProgramOnClassPathTest.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramOnClassPathTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestOnProgramOnClassPathTest.java
index 1bb55a2..5551da0 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramOnClassPathTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestOnProgramOnClassPathTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtFieldPropagated.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestPvtFieldPropagated.java
similarity index 89%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtFieldPropagated.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestPvtFieldPropagated.java
index 05579e2..28711c0 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtFieldPropagated.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestPvtFieldPropagated.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
public class NestPvtFieldPropagated {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtMethodCallInlined.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestPvtMethodCallInlined.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtMethodCallInlined.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestPvtMethodCallInlined.java
index 6944b3c..47b8a4b 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtMethodCallInlined.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/NestPvtMethodCallInlined.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
import com.android.tools.r8.AlwaysInline;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningNoAccess.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/OutsideInliningNoAccess.java
similarity index 88%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningNoAccess.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/OutsideInliningNoAccess.java
index 55cad20..114a5e2 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningNoAccess.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/OutsideInliningNoAccess.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
public class OutsideInliningNoAccess extends NestHostInlining.EmptyNoPrivAccess {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningWithAccess.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/OutsideInliningWithAccess.java
similarity index 90%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningWithAccess.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/OutsideInliningWithAccess.java
index f6b8dce..64aee86 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningWithAccess.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/OutsideInliningWithAccess.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest;
+package com.android.tools.r8.jdk11.nest;
public class OutsideInliningWithAccess extends NestHostInlining.EmptyWithPrivAccess {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestHost.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NestHost.java
similarity index 83%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestHost.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NestHost.java
index d49dcfe..f9b178d 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestHost.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NestHost.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest.b169045091;
+package com.android.tools.r8.jdk11.nest.b169045091;
public class NestHost {
/*private*/ int f;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestMemberAccessibilityTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NestMemberAccessibilityTest.java
similarity index 96%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestMemberAccessibilityTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NestMemberAccessibilityTest.java
index 6f14432..ffa0f69 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestMemberAccessibilityTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NestMemberAccessibilityTest.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest.b169045091;
+package com.android.tools.r8.jdk11.nest.b169045091;
import static com.android.tools.r8.references.Reference.INT;
import static org.junit.Assert.assertTrue;
@@ -15,7 +15,7 @@
import com.android.tools.r8.graph.DexField;
import com.android.tools.r8.graph.DexItemFactory;
import com.android.tools.r8.graph.DexProgramClass;
-import com.android.tools.r8.jdk11.desugar.nest.b169045091.NestHost.NestMember;
+import com.android.tools.r8.jdk11.nest.b169045091.NestHost.NestMember;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
import com.android.tools.r8.utils.AndroidApp;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NonNestMember.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NonNestMember.java
similarity index 81%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NonNestMember.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NonNestMember.java
index f5923f6..c9101af 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NonNestMember.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/b169045091/NonNestMember.java
@@ -2,6 +2,6 @@
// 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.jdk11.desugar.nest.b169045091;
+package com.android.tools.r8.jdk11.nest.b169045091;
public class NonNestMember extends NestHost.NestMember {}
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/Host.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/Host.java
similarity index 84%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/Host.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/Host.java
index 72e8cd9..7087de4 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/Host.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/Host.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
class Host {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeInterfaceTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeInterfaceTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeInterfaceTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeInterfaceTest.java
index 6442bab..722eff7 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeInterfaceTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeInterfaceTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2022, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
import static org.hamcrest.CoreMatchers.containsString;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeSpecialTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeSpecialTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeSpecialTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeSpecialTest.java
index 22b02be..ebbda78 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeSpecialTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeSpecialTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2023, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
import static com.google.common.base.Predicates.alwaysTrue;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeSuperTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeSuperTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeSuperTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeSuperTest.java
index 28967bd..a327fd8 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeSuperTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeSuperTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2023, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
import static org.hamcrest.CoreMatchers.containsString;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeVirtualTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeVirtualTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeVirtualTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeVirtualTest.java
index f032116..ace8343 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexRewriteInvokeVirtualTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexRewriteInvokeVirtualTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2022, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
import static org.hamcrest.CoreMatchers.containsString;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexShrinkingFieldsTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexShrinkingFieldsTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexShrinkingFieldsTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexShrinkingFieldsTest.java
index abd2a73..19b0298 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexShrinkingFieldsTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexShrinkingFieldsTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2022, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexShrinkingMethodsTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexShrinkingMethodsTest.java
similarity index 99%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexShrinkingMethodsTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexShrinkingMethodsTest.java
index 8aa6865..80c7b1b 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexShrinkingMethodsTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexShrinkingMethodsTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2022, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexTest.java
similarity index 98%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexTest.java
index c0c8a15..7bd72ce 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2022, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -14,8 +14,8 @@
import com.android.tools.r8.TestRunResult;
import com.android.tools.r8.TestRuntime.CfVm;
import com.android.tools.r8.ToolHelper.DexVm.Version;
-import com.android.tools.r8.jdk11.desugar.nest.dex.Host.Member1;
-import com.android.tools.r8.jdk11.desugar.nest.dex.Host.Member2;
+import com.android.tools.r8.jdk11.nest.dex.Host.Member1;
+import com.android.tools.r8.jdk11.nest.dex.Host.Member2;
import com.android.tools.r8.transformers.ClassFileTransformer;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.DescriptorUtils;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexTestBase.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexTestBase.java
similarity index 95%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexTestBase.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexTestBase.java
index 0834659..7a7b587 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesInDexTestBase.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesInDexTestBase.java
@@ -1,7 +1,7 @@
// Copyright (c) 2022, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestRuntime;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesNotInDexWithForceNestDesugaringTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesNotInDexWithForceNestDesugaringTest.java
similarity index 93%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesNotInDexWithForceNestDesugaringTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesNotInDexWithForceNestDesugaringTest.java
index ca9a44e..09c7ae3 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestAttributesNotInDexWithForceNestDesugaringTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestAttributesNotInDexWithForceNestDesugaringTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2023, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentIf;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -11,8 +11,8 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.graph.MethodAccessFlags;
-import com.android.tools.r8.jdk11.desugar.nest.dex.NestAttributesNotInDexWithForceNestDesugaringTest.Host.Member1;
-import com.android.tools.r8.jdk11.desugar.nest.dex.NestAttributesNotInDexWithForceNestDesugaringTest.Host.Member2;
+import com.android.tools.r8.jdk11.nest.dex.NestAttributesNotInDexWithForceNestDesugaringTest.Host.Member1;
+import com.android.tools.r8.jdk11.nest.dex.NestAttributesNotInDexWithForceNestDesugaringTest.Host.Member2;
import com.android.tools.r8.synthesis.SyntheticItemsTestUtils;
import com.android.tools.r8.transformers.ClassFileTransformer;
import com.android.tools.r8.transformers.ClassFileTransformer.MethodPredicate;
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestHierachy.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestHierachy.java
similarity index 96%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestHierachy.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestHierachy.java
index 10d024a..b2e233e 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/NestHierachy.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/NestHierachy.java
@@ -2,7 +2,7 @@
// 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
public class NestHierachy {
abstract static class InnerSuper {
diff --git a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/OtherHost.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/OtherHost.java
similarity index 81%
rename from src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/OtherHost.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/OtherHost.java
index 907e038..9db30a8 100644
--- a/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/dex/OtherHost.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/nest/dex/OtherHost.java
@@ -1,6 +1,6 @@
// Copyright (c) 2024, 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.jdk11.desugar.nest.dex;
+package com.android.tools.r8.jdk11.nest.dex;
class OtherHost {}
