Merge "Revert "Add package to Proxy2Test"" am: d6c5e7d143 am: f4b5c92b91 am: 3f26eb7e36

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

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

2 files changed, 37 insertions, 38 deletions

diff --git a/luni/src/test/api/common/Proxy2Test.java b/luni/src/test/api/common/Proxy2Test.java
new file mode 100644
index 0000000..6fdac49
--- /dev/null
+++ b/luni/src/test/api/common/Proxy2Test.java
@@ -0,0 +1,37 @@
+/*
+ *  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
deleted file mode 100644
index 0ef8cb9..0000000
--- a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/Proxy2Test.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 {
-
-}