Move package nesthostexample in module tests_java_11
New package com.android.tools.r8.jdk11.desugar.nest
Change-Id: I055c6e621b7718c586ce01358238c337e76a6659
Bug: b/337801526
diff --git a/src/test/examplesJava11/nesthostexample/BasicNestHostClassMerging.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostClassMerging.java
similarity index 94%
rename from src/test/examplesJava11/nesthostexample/BasicNestHostClassMerging.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostClassMerging.java
index 184c201..f2de820 100644
--- a/src/test/examplesJava11/nesthostexample/BasicNestHostClassMerging.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/nesthostexample/BasicNestHostTreePruning.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostTreePruning.java
similarity index 93%
rename from src/test/examplesJava11/nesthostexample/BasicNestHostTreePruning.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostTreePruning.java
index 484c81a..6928d73 100644
--- a/src/test/examplesJava11/nesthostexample/BasicNestHostTreePruning.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/nesthostexample/BasicNestHostWithAnonymousInnerClass.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithAnonymousInnerClass.java
similarity index 96%
rename from src/test/examplesJava11/nesthostexample/BasicNestHostWithAnonymousInnerClass.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithAnonymousInnerClass.java
index 93ad558..cd9a474 100644
--- a/src/test/examplesJava11/nesthostexample/BasicNestHostWithAnonymousInnerClass.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassConstructors.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassConstructors.java
similarity index 97%
rename from src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassConstructors.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassConstructors.java
index 80fe3fe..744599b 100644
--- a/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassConstructors.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassFields.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassFields.java
similarity index 96%
rename from src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassFields.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassFields.java
index 070d886..83d536a 100644
--- a/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassFields.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassMethods.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassMethods.java
similarity index 96%
rename from src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassMethods.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/BasicNestHostWithInnerClassMethods.java
index 2766914..c1b50c8 100644
--- a/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassMethods.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/nesthostexample/FullNestOnProgramPathTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/FullNestOnProgramPathTest.java
similarity index 99%
rename from src/test/examplesJava11/nesthostexample/FullNestOnProgramPathTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/FullNestOnProgramPathTest.java
index 5bc8808..d7aaad1 100644
--- a/src/test/examplesJava11/nesthostexample/FullNestOnProgramPathTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/src/test/examplesJava11/nesthostexample/NestAttributesUpdateTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestAttributesUpdateTest.java
similarity index 89%
rename from src/test/examplesJava11/nesthostexample/NestAttributesUpdateTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestAttributesUpdateTest.java
index ecac6fb..15e6b6a 100644
--- a/src/test/examplesJava11/nesthostexample/NestAttributesUpdateTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertFalse;
@@ -31,7 +31,6 @@
@RunWith(Parameterized.class)
public class NestAttributesUpdateTest extends TestBase {
- private static final String PACKAGE_NAME = "nesthostexample.";
private static final Class<?> MERGING_OUTER_CLASS = BasicNestHostClassMerging.class;
private static final Class<?> PRUNING_OUTER_CLASS = BasicNestHostTreePruning.class;
@@ -133,7 +132,7 @@
})
.addProgramClassesAndInnerClasses(outerNestClass)
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
- .addKeepPackageNamesRule("nesthostexample")
+ .addKeepPackageNamesRule(getClass().getPackageName())
.addInliningAnnotations()
.apply(testBuilderConsumer)
.compile()
@@ -154,19 +153,25 @@
if (clazz.isNestHost()) {
// All members are present with the clazz as host
for (NestMemberClassAttribute attr : clazz.getNestMembersClassAttributes()) {
- String memberName = attr.getNestMember().getName();
- ClassSubject inner = inspector.clazz(PACKAGE_NAME + memberName);
+ ClassSubject inner = inspector.clazz(attr.getNestMember().toSourceString());
assertNotNull(
- "The nest member " + memberName + " of " + clazz.type.getName() + " is missing",
+ "The nest member "
+ + attr.getNestMember().toSourceString()
+ + " of "
+ + clazz.type.toSourceString()
+ + " is missing",
inner.getDexProgramClass());
assertSame(inner.getDexProgramClass().getNestHost(), clazz.type);
}
} else {
// Nest host is present and with the clazz as member
- String hostName = clazz.getNestHost().getName();
- ClassSubject host = inspector.clazz(PACKAGE_NAME + hostName);
+ ClassSubject host = inspector.clazz(clazz.getNestHost().toSourceString());
assertNotNull(
- "The nest host " + hostName + " of " + clazz.type.getName() + " is missing",
+ "The nest host "
+ + clazz.getNestHost().toSourceString()
+ + " of "
+ + clazz.type.toSourceString()
+ + " is missing",
host.getDexProgramClass());
assertTrue(
host.getDexProgramClass().getNestMembersClassAttributes().stream()
diff --git a/src/test/examplesJava11/nesthostexample/NestClassMergingTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestClassMergingTest.java
similarity index 98%
rename from src/test/examplesJava11/nesthostexample/NestClassMergingTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestClassMergingTest.java
index 273b7ec..e1af3fb 100644
--- a/src/test/examplesJava11/nesthostexample/NestClassMergingTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import com.android.tools.r8.Jdk9TestUtils;
import com.android.tools.r8.R8TestCompileResult;
diff --git a/src/test/examplesJava11/nesthostexample/NestConstructorRemovedArgTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestConstructorRemovedArgTest.java
similarity index 93%
rename from src/test/examplesJava11/nesthostexample/NestConstructorRemovedArgTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestConstructorRemovedArgTest.java
index 216673a..36ad284 100644
--- a/src/test/examplesJava11/nesthostexample/NestConstructorRemovedArgTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestConstructorRemovedArgTest.java
@@ -2,9 +2,9 @@
// 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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
-import static nesthostexample.BasicNestHostWithInnerClassConstructors.getExpectedResult;
+import static com.android.tools.r8.jdk11.desugar.nest.BasicNestHostWithInnerClassConstructors.getExpectedResult;
import com.android.tools.r8.Jdk9TestUtils;
import com.android.tools.r8.TestBase;
diff --git a/src/test/examplesJava11/nesthostexample/NestHierachy.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHierachy.java
similarity index 96%
rename from src/test/examplesJava11/nesthostexample/NestHierachy.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHierachy.java
index ba971d2..5ec36f1 100644
--- a/src/test/examplesJava11/nesthostexample/NestHierachy.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
public class NestHierachy {
abstract static class InnerSuper {
diff --git a/src/test/examplesJava11/nesthostexample/NestHostExample.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostExample.java
similarity index 99%
rename from src/test/examplesJava11/nesthostexample/NestHostExample.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostExample.java
index b892be3..2d908b1 100644
--- a/src/test/examplesJava11/nesthostexample/NestHostExample.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import java.util.List;
diff --git a/src/test/examplesJava11/nesthostexample/NestHostInlining.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInlining.java
similarity index 94%
rename from src/test/examplesJava11/nesthostexample/NestHostInlining.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInlining.java
index 4748927..1ca8c17 100644
--- a/src/test/examplesJava11/nesthostexample/NestHostInlining.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
public class NestHostInlining {
diff --git a/src/test/examplesJava11/nesthostexample/NestHostInliningSubclasses.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInliningSubclasses.java
similarity index 94%
rename from src/test/examplesJava11/nesthostexample/NestHostInliningSubclasses.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestHostInliningSubclasses.java
index 4221307..b862e57 100644
--- a/src/test/examplesJava11/nesthostexample/NestHostInliningSubclasses.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/nesthostexample/NestInitArgumentContextClass.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextClass.java
similarity index 92%
rename from src/test/examplesJava11/nesthostexample/NestInitArgumentContextClass.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextClass.java
index cc8b8f3..73aaae8 100644
--- a/src/test/examplesJava11/nesthostexample/NestInitArgumentContextClass.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
class NestInitArgumentContextClass {
public class Inner1 {
diff --git a/src/test/examplesJava11/nesthostexample/NestInitArgumentContextTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextTest.java
similarity index 98%
rename from src/test/examplesJava11/nesthostexample/NestInitArgumentContextTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestInitArgumentContextTest.java
index 2de3600..8041082 100644
--- a/src/test/examplesJava11/nesthostexample/NestInitArgumentContextTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/examplesJava11/nesthostexample/NestMemberPropagatedTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMemberPropagatedTest.java
similarity index 97%
rename from src/test/examplesJava11/nesthostexample/NestMemberPropagatedTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMemberPropagatedTest.java
index dc1a1d3..a6a00ec 100644
--- a/src/test/examplesJava11/nesthostexample/NestMemberPropagatedTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/examplesJava11/nesthostexample/NestMethodInlinedTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMethodInlinedTest.java
similarity index 98%
rename from src/test/examplesJava11/nesthostexample/NestMethodInlinedTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestMethodInlinedTest.java
index ef93446..791d1fc 100644
--- a/src/test/examplesJava11/nesthostexample/NestMethodInlinedTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertTrue;
diff --git a/src/test/examplesJava11/nesthostexample/NestOnProgramAndClasspathAndLibraryTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramAndClasspathAndLibraryTest.java
similarity index 98%
rename from src/test/examplesJava11/nesthostexample/NestOnProgramAndClasspathAndLibraryTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramAndClasspathAndLibraryTest.java
index 767b7df..e720d8b 100644
--- a/src/test/examplesJava11/nesthostexample/NestOnProgramAndClasspathAndLibraryTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static org.junit.Assert.assertThrows;
diff --git a/src/test/examplesJava11/nesthostexample/NestOnProgramOnClassPathTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramOnClassPathTest.java
similarity index 98%
rename from src/test/examplesJava11/nesthostexample/NestOnProgramOnClassPathTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestOnProgramOnClassPathTest.java
index 974683a..1bb55a2 100644
--- a/src/test/examplesJava11/nesthostexample/NestOnProgramOnClassPathTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/examplesJava11/nesthostexample/NestPvtFieldPropagated.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtFieldPropagated.java
similarity index 89%
rename from src/test/examplesJava11/nesthostexample/NestPvtFieldPropagated.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtFieldPropagated.java
index 2cbdf25..05579e2 100644
--- a/src/test/examplesJava11/nesthostexample/NestPvtFieldPropagated.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
public class NestPvtFieldPropagated {
diff --git a/src/test/examplesJava11/nesthostexample/NestPvtMethodCallInlined.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtMethodCallInlined.java
similarity index 97%
rename from src/test/examplesJava11/nesthostexample/NestPvtMethodCallInlined.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/NestPvtMethodCallInlined.java
index 9670e69..6944b3c 100644
--- a/src/test/examplesJava11/nesthostexample/NestPvtMethodCallInlined.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
import com.android.tools.r8.AlwaysInline;
import com.android.tools.r8.NeverInline;
diff --git a/src/test/examplesJava11/nesthostexample/OutsideInliningNoAccess.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningNoAccess.java
similarity index 88%
rename from src/test/examplesJava11/nesthostexample/OutsideInliningNoAccess.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningNoAccess.java
index 86da4b1..55cad20 100644
--- a/src/test/examplesJava11/nesthostexample/OutsideInliningNoAccess.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
public class OutsideInliningNoAccess extends NestHostInlining.EmptyNoPrivAccess {
diff --git a/src/test/examplesJava11/nesthostexample/OutsideInliningWithAccess.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningWithAccess.java
similarity index 90%
rename from src/test/examplesJava11/nesthostexample/OutsideInliningWithAccess.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/OutsideInliningWithAccess.java
index c81e437..f6b8dce 100644
--- a/src/test/examplesJava11/nesthostexample/OutsideInliningWithAccess.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample;
+package com.android.tools.r8.jdk11.desugar.nest;
public class OutsideInliningWithAccess extends NestHostInlining.EmptyWithPrivAccess {
diff --git a/src/test/examplesJava11/com/android/tools/r8/shaking/b169045091/examples/NestHost.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestHost.java
similarity index 83%
rename from src/test/examplesJava11/com/android/tools/r8/shaking/b169045091/examples/NestHost.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestHost.java
index 5c1453e..d49dcfe 100644
--- a/src/test/examplesJava11/com/android/tools/r8/shaking/b169045091/examples/NestHost.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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.shaking.b169045091.examples;
+package com.android.tools.r8.jdk11.desugar.nest.b169045091;
public class NestHost {
/*private*/ int f;
diff --git a/src/test/examplesJava11/nesthostexample/b169045091/NestMemberAccessibilityTest.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestMemberAccessibilityTest.java
similarity index 94%
rename from src/test/examplesJava11/nesthostexample/b169045091/NestMemberAccessibilityTest.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NestMemberAccessibilityTest.java
index 71e5b47..6f14432 100644
--- a/src/test/examplesJava11/nesthostexample/b169045091/NestMemberAccessibilityTest.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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 nesthostexample.b169045091;
+package com.android.tools.r8.jdk11.desugar.nest.b169045091;
import static com.android.tools.r8.references.Reference.INT;
import static org.junit.Assert.assertTrue;
@@ -15,11 +15,9 @@
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.references.Reference;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
-import com.android.tools.r8.shaking.b169045091.examples.NestHost;
-import com.android.tools.r8.shaking.b169045091.examples.NestHost.NestMember;
-import com.android.tools.r8.shaking.b169045091.examples.NonNestMember;
import com.android.tools.r8.utils.AndroidApp;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/src/test/examplesJava11/com/android/tools/r8/shaking/b169045091/examples/NonNestMember.java b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NonNestMember.java
similarity index 81%
rename from src/test/examplesJava11/com/android/tools/r8/shaking/b169045091/examples/NonNestMember.java
rename to src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/nest/b169045091/NonNestMember.java
index 02fd5e7..f5923f6 100644
--- a/src/test/examplesJava11/com/android/tools/r8/shaking/b169045091/examples/NonNestMember.java
+++ b/src/test/examplesJava11/com/android/tools/r8/jdk11/desugar/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.shaking.b169045091.examples;
+package com.android.tools.r8.jdk11.desugar.nest.b169045091;
public class NonNestMember extends NestHost.NestMember {}
