Rename test package to lower case
Change-Id: I892c99d0c9a40e407e3522ff2ae8eecc202d2937
diff --git a/src/test/examplesJava11/nestHostExample/BasicNestHostClassMerging.java b/src/test/examplesJava11/nesthostexample/BasicNestHostClassMerging.java
similarity index 97%
rename from src/test/examplesJava11/nestHostExample/BasicNestHostClassMerging.java
rename to src/test/examplesJava11/nesthostexample/BasicNestHostClassMerging.java
index 34b1b43..6e511a0 100644
--- a/src/test/examplesJava11/nestHostExample/BasicNestHostClassMerging.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class BasicNestHostClassMerging {
diff --git a/src/test/examplesJava11/nestHostExample/BasicNestHostTreePruning.java b/src/test/examplesJava11/nesthostexample/BasicNestHostTreePruning.java
similarity index 96%
rename from src/test/examplesJava11/nestHostExample/BasicNestHostTreePruning.java
rename to src/test/examplesJava11/nesthostexample/BasicNestHostTreePruning.java
index 1df6467..07ec806 100644
--- a/src/test/examplesJava11/nestHostExample/BasicNestHostTreePruning.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class BasicNestHostTreePruning {
diff --git a/src/test/examplesJava11/nestHostExample/BasicNestHostWithAnonymousInnerClass.java b/src/test/examplesJava11/nesthostexample/BasicNestHostWithAnonymousInnerClass.java
similarity index 97%
rename from src/test/examplesJava11/nestHostExample/BasicNestHostWithAnonymousInnerClass.java
rename to src/test/examplesJava11/nesthostexample/BasicNestHostWithAnonymousInnerClass.java
index f97282c..f014507 100644
--- a/src/test/examplesJava11/nestHostExample/BasicNestHostWithAnonymousInnerClass.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class BasicNestHostWithAnonymousInnerClass {
diff --git a/src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassConstructors.java b/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassConstructors.java
similarity index 98%
rename from src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassConstructors.java
rename to src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassConstructors.java
index 8a5f6c8..f3ee216 100644
--- a/src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassConstructors.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class BasicNestHostWithInnerClassConstructors {
diff --git a/src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassFields.java b/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassFields.java
similarity index 97%
rename from src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassFields.java
rename to src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassFields.java
index f23ef4b..a174723 100644
--- a/src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassFields.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class BasicNestHostWithInnerClassFields {
diff --git a/src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassMethods.java b/src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassMethods.java
similarity index 97%
rename from src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassMethods.java
rename to src/test/examplesJava11/nesthostexample/BasicNestHostWithInnerClassMethods.java
index 1b6e1f1..e22088a 100644
--- a/src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassMethods.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class BasicNestHostWithInnerClassMethods {
diff --git a/src/test/examplesJava11/nestHostExample/NestHostExample.java b/src/test/examplesJava11/nesthostexample/NestHostExample.java
similarity index 99%
rename from src/test/examplesJava11/nestHostExample/NestHostExample.java
rename to src/test/examplesJava11/nesthostexample/NestHostExample.java
index 17a6b45..3aa3546 100644
--- a/src/test/examplesJava11/nestHostExample/NestHostExample.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
// Warning: This requires Java 9+ to be compiled (private interface methods)
diff --git a/src/test/examplesJava11/nestHostExample/NestHostInlining.java b/src/test/examplesJava11/nesthostexample/NestHostInlining.java
similarity index 97%
rename from src/test/examplesJava11/nestHostExample/NestHostInlining.java
rename to src/test/examplesJava11/nesthostexample/NestHostInlining.java
index 3d63701..4748927 100644
--- a/src/test/examplesJava11/nestHostExample/NestHostInlining.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class NestHostInlining {
diff --git a/src/test/examplesJava11/nestHostExample/NestHostInliningSubclasses.java b/src/test/examplesJava11/nesthostexample/NestHostInliningSubclasses.java
similarity index 96%
rename from src/test/examplesJava11/nestHostExample/NestHostInliningSubclasses.java
rename to src/test/examplesJava11/nesthostexample/NestHostInliningSubclasses.java
index ba2bff0..a6283a0 100644
--- a/src/test/examplesJava11/nestHostExample/NestHostInliningSubclasses.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class NestHostInliningSubclasses {
diff --git a/src/test/examplesJava11/nestHostExample/NeverInline.java b/src/test/examplesJava11/nesthostexample/NeverInline.java
similarity index 93%
rename from src/test/examplesJava11/nestHostExample/NeverInline.java
rename to src/test/examplesJava11/nesthostexample/NeverInline.java
index 16ce752..d800658 100644
--- a/src/test/examplesJava11/nestHostExample/NeverInline.java
+++ b/src/test/examplesJava11/nesthostexample/NeverInline.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 nesthostexample;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
diff --git a/src/test/examplesJava11/nestHostExample/OutsideInliningNoAccess.java b/src/test/examplesJava11/nesthostexample/OutsideInliningNoAccess.java
similarity index 93%
rename from src/test/examplesJava11/nestHostExample/OutsideInliningNoAccess.java
rename to src/test/examplesJava11/nesthostexample/OutsideInliningNoAccess.java
index 63b32fa..86da4b1 100644
--- a/src/test/examplesJava11/nestHostExample/OutsideInliningNoAccess.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class OutsideInliningNoAccess extends NestHostInlining.EmptyNoPrivAccess {
diff --git a/src/test/examplesJava11/nestHostExample/OutsideInliningWithAccess.java b/src/test/examplesJava11/nesthostexample/OutsideInliningWithAccess.java
similarity index 94%
rename from src/test/examplesJava11/nestHostExample/OutsideInliningWithAccess.java
rename to src/test/examplesJava11/nesthostexample/OutsideInliningWithAccess.java
index dcd5946..c81e437 100644
--- a/src/test/examplesJava11/nestHostExample/OutsideInliningWithAccess.java
+++ b/src/test/examplesJava11/nesthostexample/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 nesthostexample;
public class OutsideInliningWithAccess extends NestHostInlining.EmptyWithPrivAccess {
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
index 45a6195..ce661cb 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
@@ -20,10 +20,10 @@
public class NestAccessControlTestUtils {
public static final Path JAR =
- Paths.get(ToolHelper.EXAMPLES_JAVA11_JAR_DIR).resolve("nestHostExample" + JAR_EXTENSION);
+ Paths.get(ToolHelper.EXAMPLES_JAVA11_JAR_DIR).resolve("nesthostexample" + JAR_EXTENSION);
public static final Path CLASSES_PATH =
- Paths.get(ToolHelper.EXAMPLES_JAVA11_BUILD_DIR).resolve("nestHostExample/");
- public static final String PACKAGE_NAME = "nestHostExample.";
+ Paths.get(ToolHelper.EXAMPLES_JAVA11_BUILD_DIR).resolve("nesthostexample/");
+ public static final String PACKAGE_NAME = "nesthostexample.";
public static final List<String> CLASS_NAMES =
ImmutableList.of(
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestClassMergingTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestClassMergingTest.java
index 934de31..b5488a8 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestClassMergingTest.java
@@ -96,7 +96,7 @@
options.enableClassInlining = false;
options.enableNestReduction = false;
})
- .enableInliningAnnotations("nestHostExample")
+ .enableInliningAnnotations("nesthostexample")
.setMinApi(parameters.getApiLevel())
.addProgramFiles(bothNestsAndOutsideClassToCompile)
.compile()
