From b485c7ae26fadc5870c2a55b38ac4f54845f28c7 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 8 Feb 2013 17:51:29 +0400 Subject: [PATCH] Switch class loading logic in blackBoxWithJava tests BoxWithJava tests now by default are loaded with the classloader which has test's classpath in itself, as in the former ClassPathInTheSameClassLoaderTest --- .../visibility/package}/kt2781.java | 0 .../visibility/package}/kt2781.kt | 0 .../visibility/package/packageClass.java | 0 .../visibility/package/packageClass.kt | 0 .../visibility/package/packageFun.java | 0 .../visibility/package/packageFun.kt | 0 .../visibility/package/packageProperty.java | 0 .../visibility/package/packageProperty.kt | 0 .../overrideProtectedFunInPackage.java | 0 .../overrideProtectedFunInPackage.kt | 0 .../protectedFunInPackage.java | 0 .../protectedFunInPackage.kt | 0 .../protectedPropertyInPackage.java | 0 .../protectedPropertyInPackage.kt | 0 .../protectedStaticClass.java | 0 .../protectedStaticClass.kt | 0 .../protectedStatic/funCallInConstructor.java | 0 .../protectedStatic/funCallInConstructor.kt | 0 .../protectedStatic/funClassObject.java | 0 .../protectedStatic/funClassObject.kt | 0 .../protectedStatic/funGenericClass.java | 0 .../protectedStatic/funGenericClass.kt | 0 .../protectedStatic/funNestedStaticClass.java | 0 .../protectedStatic/funNestedStaticClass.kt | 0 .../funNestedStaticClass2.java | 0 .../protectedStatic/funNestedStaticClass2.kt | 0 .../funNestedStaticGenericClass.java | 0 .../funNestedStaticGenericClass.kt | 0 .../funNotDirectSuperClass.java | 0 .../protectedStatic/funNotDirectSuperClass.kt | 0 .../protectedStatic/funObject.java | 0 .../protectedStatic/funObject.kt | 0 .../protectedStatic/simpleClass.java | 0 .../protectedStatic/simpleClass.kt | 0 .../protectedStatic/simpleClass2.java | 0 .../protectedStatic/simpleClass2.kt | 0 .../protectedStatic/simpleFun.java | 0 .../protectedStatic/simpleFun.kt | 0 .../protectedStatic/simpleProperty.java | 0 .../protectedStatic/simpleProperty.kt | 0 .../classPathInParentClassLoader/kt2781.java | 9 + .../classPathInParentClassLoader/kt2781.kt | 1 + .../codegen/AbstractJavaVisibilityTest.java | 28 --- .../ClassPathInParentClassLoaderTest.java | 49 ++++ .../ClassPathInTheSameClassLoaderTest.java | 32 --- .../jet/codegen/CodegenTestCase.java | 3 +- .../codegen/JavaVisibilityTestGenerated.java | 98 -------- .../BlackBoxWithJavaCodegenTestGenerated.java | 213 ++++++++++++------ .../jet/generators/tests/GenerateTests.java | 8 - 49 files changed, 203 insertions(+), 238 deletions(-) rename compiler/testData/codegen/{regressions => boxWithJava/visibility/package}/kt2781.java (100%) rename compiler/testData/codegen/{regressions => boxWithJava/visibility/package}/kt2781.kt (100%) rename compiler/testData/codegen/{ => boxWithJava}/visibility/package/packageClass.java (100%) rename compiler/testData/codegen/{ => boxWithJava}/visibility/package/packageClass.kt (100%) rename compiler/testData/codegen/{ => boxWithJava}/visibility/package/packageFun.java (100%) rename compiler/testData/codegen/{ => boxWithJava}/visibility/package/packageFun.kt (100%) rename compiler/testData/codegen/{ => boxWithJava}/visibility/package/packageProperty.java (100%) rename compiler/testData/codegen/{ => boxWithJava}/visibility/package/packageProperty.kt (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/overrideProtectedFunInPackage.java (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/overrideProtectedFunInPackage.kt (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/protectedFunInPackage.java (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/protectedFunInPackage.kt (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/protectedPropertyInPackage.java (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/protectedPropertyInPackage.kt (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/protectedStaticClass.java (100%) rename compiler/testData/codegen/{visibility/protected_and_package => boxWithJava/visibility/protectedAndPackage}/protectedStaticClass.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funCallInConstructor.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funCallInConstructor.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funClassObject.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funClassObject.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funGenericClass.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funGenericClass.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNestedStaticClass.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNestedStaticClass.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNestedStaticClass2.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNestedStaticClass2.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNestedStaticGenericClass.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNestedStaticGenericClass.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNotDirectSuperClass.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funNotDirectSuperClass.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funObject.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/funObject.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleClass.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleClass.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleClass2.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleClass2.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleFun.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleFun.kt (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleProperty.java (100%) rename compiler/testData/codegen/boxWithJava/{ => visibility}/protectedStatic/simpleProperty.kt (100%) create mode 100644 compiler/testData/codegen/classPathInParentClassLoader/kt2781.java create mode 100644 compiler/testData/codegen/classPathInParentClassLoader/kt2781.kt delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/AbstractJavaVisibilityTest.java create mode 100644 compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/ClassPathInTheSameClassLoaderTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java diff --git a/compiler/testData/codegen/regressions/kt2781.java b/compiler/testData/codegen/boxWithJava/visibility/package/kt2781.java similarity index 100% rename from compiler/testData/codegen/regressions/kt2781.java rename to compiler/testData/codegen/boxWithJava/visibility/package/kt2781.java diff --git a/compiler/testData/codegen/regressions/kt2781.kt b/compiler/testData/codegen/boxWithJava/visibility/package/kt2781.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2781.kt rename to compiler/testData/codegen/boxWithJava/visibility/package/kt2781.kt diff --git a/compiler/testData/codegen/visibility/package/packageClass.java b/compiler/testData/codegen/boxWithJava/visibility/package/packageClass.java similarity index 100% rename from compiler/testData/codegen/visibility/package/packageClass.java rename to compiler/testData/codegen/boxWithJava/visibility/package/packageClass.java diff --git a/compiler/testData/codegen/visibility/package/packageClass.kt b/compiler/testData/codegen/boxWithJava/visibility/package/packageClass.kt similarity index 100% rename from compiler/testData/codegen/visibility/package/packageClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/package/packageClass.kt diff --git a/compiler/testData/codegen/visibility/package/packageFun.java b/compiler/testData/codegen/boxWithJava/visibility/package/packageFun.java similarity index 100% rename from compiler/testData/codegen/visibility/package/packageFun.java rename to compiler/testData/codegen/boxWithJava/visibility/package/packageFun.java diff --git a/compiler/testData/codegen/visibility/package/packageFun.kt b/compiler/testData/codegen/boxWithJava/visibility/package/packageFun.kt similarity index 100% rename from compiler/testData/codegen/visibility/package/packageFun.kt rename to compiler/testData/codegen/boxWithJava/visibility/package/packageFun.kt diff --git a/compiler/testData/codegen/visibility/package/packageProperty.java b/compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.java similarity index 100% rename from compiler/testData/codegen/visibility/package/packageProperty.java rename to compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.java diff --git a/compiler/testData/codegen/visibility/package/packageProperty.kt b/compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.kt similarity index 100% rename from compiler/testData/codegen/visibility/package/packageProperty.kt rename to compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.kt diff --git a/compiler/testData/codegen/visibility/protected_and_package/overrideProtectedFunInPackage.java b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.java similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/overrideProtectedFunInPackage.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.java diff --git a/compiler/testData/codegen/visibility/protected_and_package/overrideProtectedFunInPackage.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/overrideProtectedFunInPackage.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt diff --git a/compiler/testData/codegen/visibility/protected_and_package/protectedFunInPackage.java b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.java similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/protectedFunInPackage.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.java diff --git a/compiler/testData/codegen/visibility/protected_and_package/protectedFunInPackage.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.kt similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/protectedFunInPackage.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.kt diff --git a/compiler/testData/codegen/visibility/protected_and_package/protectedPropertyInPackage.java b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.java similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/protectedPropertyInPackage.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.java diff --git a/compiler/testData/codegen/visibility/protected_and_package/protectedPropertyInPackage.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/protectedPropertyInPackage.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt diff --git a/compiler/testData/codegen/visibility/protected_and_package/protectedStaticClass.java b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.java similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/protectedStaticClass.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.java diff --git a/compiler/testData/codegen/visibility/protected_and_package/protectedStaticClass.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.kt similarity index 100% rename from compiler/testData/codegen/visibility/protected_and_package/protectedStaticClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funObject.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.java b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.java rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.java diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt b/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt rename to compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.kt diff --git a/compiler/testData/codegen/classPathInParentClassLoader/kt2781.java b/compiler/testData/codegen/classPathInParentClassLoader/kt2781.java new file mode 100644 index 00000000000..68924bb5134 --- /dev/null +++ b/compiler/testData/codegen/classPathInParentClassLoader/kt2781.java @@ -0,0 +1,9 @@ +import java.lang.String; + +class J { + String value; + + J(String value) { + this.value = value; + } +} diff --git a/compiler/testData/codegen/classPathInParentClassLoader/kt2781.kt b/compiler/testData/codegen/classPathInParentClassLoader/kt2781.kt new file mode 100644 index 00000000000..d8ef488e060 --- /dev/null +++ b/compiler/testData/codegen/classPathInParentClassLoader/kt2781.kt @@ -0,0 +1 @@ +fun doTest() = J("OK").value diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractJavaVisibilityTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractJavaVisibilityTest.java deleted file mode 100644 index 8aced67e6e5..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractJavaVisibilityTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * 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.jetbrains.jet.codegen; - -import org.jetbrains.annotations.NotNull; - -public abstract class AbstractJavaVisibilityTest extends CodegenTestCase { - @NotNull - @Override - protected GeneratedClassLoader createClassLoader(@NotNull ClassFileFactory factory) { - initializedClassLoader = new GeneratedClassLoader(factory, CodegenTestCase.class.getClassLoader(), getClassPathURLs()); - return initializedClassLoader; - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java new file mode 100644 index 00000000000..13620e48b2b --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java @@ -0,0 +1,49 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * 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.jetbrains.jet.codegen; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.TestJdkKind; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; + +import java.io.File; +import java.net.URLClassLoader; + +import static org.jetbrains.jet.codegen.CodegenTestUtil.assertThrows; +import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava; + +public class ClassPathInParentClassLoaderTest extends CodegenTestCase { + @NotNull + @Override + protected GeneratedClassLoader createClassLoader(@NotNull ClassFileFactory factory) { + ClassLoader parentClassLoader = new URLClassLoader(getClassPathURLs(), CodegenTestCase.class.getClassLoader()); + initializedClassLoader = new GeneratedClassLoader(factory, parentClassLoader); + return initializedClassLoader; + } + + public void testKt2781() throws Exception { + File javaClassesTempDirectory = compileJava("classPathInParentClassLoader/kt2781.java"); + + myEnvironment = new JetCoreEnvironment(getTestRootDisposable(), JetTestUtils.compilerConfigurationForTests( + ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), javaClassesTempDirectory)); + + loadFile("classPathInParentClassLoader/kt2781.kt"); + assertThrows(generateFunction(), IllegalAccessError.class, null); + } +} diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInTheSameClassLoaderTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassPathInTheSameClassLoaderTest.java deleted file mode 100644 index ebb482e0e32..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInTheSameClassLoaderTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * 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.jetbrains.jet.codegen; - -import org.jetbrains.annotations.NotNull; - -public class ClassPathInTheSameClassLoaderTest extends CodegenTestCase { - @NotNull - @Override - protected GeneratedClassLoader createClassLoader(@NotNull ClassFileFactory factory) { - initializedClassLoader = new GeneratedClassLoader(factory, CodegenTestCase.class.getClassLoader(), getClassPathURLs()); - return initializedClassLoader; - } - - public void testKt2781() { - blackBoxFileWithJava("regressions/kt2781.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index 44845f3c95d..28652cda190 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -166,8 +166,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { fail("Double initialization of class loader in same test"); } - ClassLoader parentClassLoader = new URLClassLoader(getClassPathURLs(), CodegenTestCase.class.getClassLoader()); - initializedClassLoader = new GeneratedClassLoader(factory, parentClassLoader); + initializedClassLoader = new GeneratedClassLoader(factory, CodegenTestCase.class.getClassLoader(), getClassPathURLs()); return initializedClassLoader; } diff --git a/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java deleted file mode 100644 index 45cc59961ae..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * 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.jetbrains.jet.codegen; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.io.File; -import java.util.regex.Pattern; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; - -import org.jetbrains.jet.codegen.AbstractJavaVisibilityTest; - -/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/visibility") -@InnerTestClasses({JavaVisibilityTestGenerated.Package.class, JavaVisibilityTestGenerated.Protected_and_package.class}) -public class JavaVisibilityTestGenerated extends AbstractJavaVisibilityTest { - public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("compiler/testData/codegen/visibility/package") - public static class Package extends AbstractJavaVisibilityTest { - public void testAllFilesPresentInPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("packageClass.kt") - public void testPackageClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/package/packageClass.kt"); - } - - @TestMetadata("packageFun.kt") - public void testPackageFun() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/package/packageFun.kt"); - } - - @TestMetadata("packageProperty.kt") - public void testPackageProperty() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/package/packageProperty.kt"); - } - - } - - @TestMetadata("compiler/testData/codegen/visibility/protected_and_package") - public static class Protected_and_package extends AbstractJavaVisibilityTest { - public void testAllFilesPresentInProtected_and_package() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/protected_and_package"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("overrideProtectedFunInPackage.kt") - public void testOverrideProtectedFunInPackage() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/protected_and_package/overrideProtectedFunInPackage.kt"); - } - - @TestMetadata("protectedFunInPackage.kt") - public void testProtectedFunInPackage() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/protected_and_package/protectedFunInPackage.kt"); - } - - @TestMetadata("protectedPropertyInPackage.kt") - public void testProtectedPropertyInPackage() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/protected_and_package/protectedPropertyInPackage.kt"); - } - - @TestMetadata("protectedStaticClass.kt") - public void testProtectedStaticClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/protected_and_package/protectedStaticClass.kt"); - } - - } - - public static Test suite() { - TestSuite suite = new TestSuite("JavaVisibilityTestGenerated"); - suite.addTestSuite(JavaVisibilityTestGenerated.class); - suite.addTestSuite(Package.class); - suite.addTestSuite(Protected_and_package.class); - return suite; - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 2b336efcf41..faed30bef8d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxWithJava") -@InnerTestClasses({BlackBoxWithJavaCodegenTestGenerated.Enum.class, BlackBoxWithJavaCodegenTestGenerated.Functions.class, BlackBoxWithJavaCodegenTestGenerated.ProtectedStatic.class, BlackBoxWithJavaCodegenTestGenerated.StaticFun.class}) +@InnerTestClasses({BlackBoxWithJavaCodegenTestGenerated.Enum.class, BlackBoxWithJavaCodegenTestGenerated.Functions.class, BlackBoxWithJavaCodegenTestGenerated.StaticFun.class, BlackBoxWithJavaCodegenTestGenerated.Visibility.class}) public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -88,74 +88,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege } - @TestMetadata("compiler/testData/codegen/boxWithJava/protectedStatic") - public static class ProtectedStatic extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInProtectedStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("funCallInConstructor.kt") - public void testFunCallInConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.kt"); - } - - @TestMetadata("funClassObject.kt") - public void testFunClassObject() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt"); - } - - @TestMetadata("funGenericClass.kt") - public void testFunGenericClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt"); - } - - @TestMetadata("funNestedStaticClass.kt") - public void testFunNestedStaticClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt"); - } - - @TestMetadata("funNestedStaticClass2.kt") - public void testFunNestedStaticClass2() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt"); - } - - @TestMetadata("funNestedStaticGenericClass.kt") - public void testFunNestedStaticGenericClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt"); - } - - @TestMetadata("funNotDirectSuperClass.kt") - public void testFunNotDirectSuperClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt"); - } - - @TestMetadata("funObject.kt") - public void testFunObject() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt"); - } - - @TestMetadata("simpleClass.kt") - public void testSimpleClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt"); - } - - @TestMetadata("simpleClass2.kt") - public void testSimpleClass2() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt"); - } - - @TestMetadata("simpleFun.kt") - public void testSimpleFun() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt"); - } - - @TestMetadata("simpleProperty.kt") - public void testSimpleProperty() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt"); - } - - } - @TestMetadata("compiler/testData/codegen/boxWithJava/staticFun") public static class StaticFun extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStaticFun() throws Exception { @@ -169,13 +101,154 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege } + @TestMetadata("compiler/testData/codegen/boxWithJava/visibility") + @InnerTestClasses({Visibility.Package.class, Visibility.ProtectedAndPackage.class, Visibility.ProtectedStatic.class}) + public static class Visibility extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInVisibility() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("compiler/testData/codegen/boxWithJava/visibility/package") + public static class Package extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInPackage() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("kt2781.kt") + public void testKt2781() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/kt2781.kt"); + } + + @TestMetadata("packageClass.kt") + public void testPackageClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/packageClass.kt"); + } + + @TestMetadata("packageFun.kt") + public void testPackageFun() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/packageFun.kt"); + } + + @TestMetadata("packageProperty.kt") + public void testPackageProperty() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.kt"); + } + + } + + @TestMetadata("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage") + public static class ProtectedAndPackage extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("overrideProtectedFunInPackage.kt") + public void testOverrideProtectedFunInPackage() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + } + + @TestMetadata("protectedFunInPackage.kt") + public void testProtectedFunInPackage() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.kt"); + } + + @TestMetadata("protectedPropertyInPackage.kt") + public void testProtectedPropertyInPackage() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); + } + + @TestMetadata("protectedStaticClass.kt") + public void testProtectedStaticClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.kt"); + } + + } + + @TestMetadata("compiler/testData/codegen/boxWithJava/visibility/protectedStatic") + public static class ProtectedStatic extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInProtectedStatic() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("funCallInConstructor.kt") + public void testFunCallInConstructor() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.kt"); + } + + @TestMetadata("funClassObject.kt") + public void testFunClassObject() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.kt"); + } + + @TestMetadata("funGenericClass.kt") + public void testFunGenericClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.kt"); + } + + @TestMetadata("funNestedStaticClass.kt") + public void testFunNestedStaticClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.kt"); + } + + @TestMetadata("funNestedStaticClass2.kt") + public void testFunNestedStaticClass2() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.kt"); + } + + @TestMetadata("funNestedStaticGenericClass.kt") + public void testFunNestedStaticGenericClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.kt"); + } + + @TestMetadata("funNotDirectSuperClass.kt") + public void testFunNotDirectSuperClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.kt"); + } + + @TestMetadata("funObject.kt") + public void testFunObject() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.kt"); + } + + @TestMetadata("simpleClass.kt") + public void testSimpleClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.kt"); + } + + @TestMetadata("simpleClass2.kt") + public void testSimpleClass2() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.kt"); + } + + @TestMetadata("simpleFun.kt") + public void testSimpleFun() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.kt"); + } + + @TestMetadata("simpleProperty.kt") + public void testSimpleProperty() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.kt"); + } + + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("Visibility"); + suite.addTestSuite(Visibility.class); + suite.addTestSuite(Package.class); + suite.addTestSuite(ProtectedAndPackage.class); + suite.addTestSuite(ProtectedStatic.class); + return suite; + } + } + public static Test suite() { TestSuite suite = new TestSuite("BlackBoxWithJavaCodegenTestGenerated"); suite.addTestSuite(BlackBoxWithJavaCodegenTestGenerated.class); suite.addTestSuite(Enum.class); suite.addTestSuite(Functions.class); - suite.addTestSuite(ProtectedStatic.class); suite.addTestSuite(StaticFun.class); + suite.addTest(Visibility.innerSuite()); return suite; } } diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index c06ff7da183..678dd8a43f5 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest; import org.jetbrains.jet.codegen.AbstractCheckLocalVariablesTableTest; -import org.jetbrains.jet.codegen.AbstractJavaVisibilityTest; import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCodegenTest; import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest; import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; @@ -97,13 +96,6 @@ public class GenerateTests { testModel("compiler/testData/codegen/boxWithStdlib", "doTestWithStdlib") ); - generateTest( - "compiler/tests/", - "JavaVisibilityTestGenerated", - AbstractJavaVisibilityTest.class, - testModel("compiler/testData/codegen/visibility", "blackBoxFileWithJavaByFullPath") - ); - generateTest( "compiler/tests/", "CheckLocalVariablesTableTestGenerated",