diff options
| -rw-r--r-- | runtime/class_linker_test.cc | 7 | ||||
| -rw-r--r-- | test/ForClassLoaderD/java/lang/JavaLangFromD.java | 21 | ||||
| -rw-r--r-- | test/ForClassLoaderD/java/lang/String.java | 19 |
3 files changed, 1 insertions, 46 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index a156229b55..03cc6c59c4 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -1603,7 +1603,7 @@ TEST_F(ClassLinkerClassLoaderTest, CreateClassLoaderChain) { // ClassLoaderC (PathClassLoader, defines: C, AC, BC, CD) // ^ // | - // ClassLoaderD (DelegateLastClassLoader, defines: D, AD, BD, CD, Ljava/lang/String;) + // ClassLoaderD (DelegateLastClassLoader, defines: D, AD, BD, CD) jobject class_loader_a = LoadDexInPathClassLoader("ForClassLoaderA", nullptr); jobject class_loader_b = LoadDexInDelegateLastClassLoader("ForClassLoaderB", class_loader_a); @@ -1635,11 +1635,6 @@ TEST_F(ClassLinkerClassLoaderTest, CreateClassLoaderChain) { // in the top parent. VerifyClassResolution("LDefinedInAC;", class_loader_d, class_loader_a); - // Boot classes should be found in the boot class loader even if they are redefined locally. - VerifyClassResolution("Ljava/lang/String;", class_loader_d, nullptr); - // Sanity check that what seems like a boot class is actually loaded from D. - VerifyClassResolution("Ljava/lang/JavaLangFromD;", class_loader_d, class_loader_d); - // Sanity check that we don't find an undefined class. VerifyClassResolution("LNotDefined;", class_loader_d, nullptr, /*should_find*/ false); } diff --git a/test/ForClassLoaderD/java/lang/JavaLangFromD.java b/test/ForClassLoaderD/java/lang/JavaLangFromD.java deleted file mode 100644 index 9abae7053d..0000000000 --- a/test/ForClassLoaderD/java/lang/JavaLangFromD.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2017 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 java.lang; - -public class JavaLangFromD { - -} diff --git a/test/ForClassLoaderD/java/lang/String.java b/test/ForClassLoaderD/java/lang/String.java deleted file mode 100644 index 11afb3d133..0000000000 --- a/test/ForClassLoaderD/java/lang/String.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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. - */ - -public final class String { - -} |