Merge "Add package to Proxy2Test" am: 23ed55cf97

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2056087

Change-Id: If08d22071162df153db41f880e86904b20ad9c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 38 insertions, 37 deletions

diff --git a/luni/src/test/api/common/Proxy2Test.java b/luni/src/test/api/common/Proxy2Test.java
deleted file mode 100644
index 6fdac49..0000000
--- a/luni/src/test/api/common/Proxy2Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import java.lang.reflect.Proxy;
-
-import junit.framework.TestCase;
-
-
-/*
- * This test is required to be run with "DefaultPkgIntf" defined in the default package
- * Do not move.  See HARMONY-6000
- */
-public class Proxy2Test extends TestCase {
-    public void test_getProxyClass_DefaultPackage() {
-        Class pc = Proxy.getProxyClass(DefaultPkgIntf.class.getClassLoader(),
-                new Class[] { DefaultPkgIntf.class });
-        assertTrue(pc.getName().startsWith("$Proxy"));
-    }
-}
-
-interface DefaultPkgIntf {
-
-}
diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Proxy2Test.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Proxy2Test.java
new file mode 100644
index 0000000..0ef8cb9
--- /dev/null
+++ b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Proxy2Test.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.harmony.luni.tests.java.lang;
+
+import java.lang.reflect.Proxy;
+
+import junit.framework.TestCase;
+
+
+/*
+ * This test is required to be run with "DefaultPkgIntf" defined in the default package
+ * Do not move.  See HARMONY-6000
+ */
+public class Proxy2Test extends TestCase {
+    public void test_getProxyClass_DefaultPackage() {
+        Class pc = Proxy.getProxyClass(DefaultPkgIntf.class.getClassLoader(),
+                new Class[] { DefaultPkgIntf.class });
+        assertTrue(pc.getName().startsWith("$Proxy"));
+    }
+}
+
+interface DefaultPkgIntf {
+
+}