From 2904d1745b3bec493afc40a6791369d052a9322e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 27 Jan 2013 20:46:26 +0400 Subject: [PATCH] Remove generated black box java codegen test Move all testData to boxWithJava/ --- .../funCallInConstructor.java} | 6 +- .../protectedStatic/funCallInConstructor.kt} | 2 +- .../protectedStatic/funClassObject.java} | 3 +- .../protectedStatic/funClassObject.kt | 11 +++ .../protectedStatic/funGenericClass.java} | 3 +- .../protectedStatic/funGenericClass.kt | 9 ++ .../funNestedStaticClass.java} | 2 +- .../protectedStatic/funNestedStaticClass.kt | 9 ++ .../funNestedStaticClass2.java} | 2 +- .../protectedStatic/funNestedStaticClass2.kt | 9 ++ .../funNestedStaticGenericClass.java} | 4 +- .../funNestedStaticGenericClass.kt | 9 ++ .../funNotDirectSuperClass.java} | 2 +- .../protectedStatic/funNotDirectSuperClass.kt | 12 +++ .../protectedStatic/funObject.java} | 2 +- .../boxWithJava/protectedStatic/funObject.kt | 9 ++ .../protectedStatic/simpleClass.java} | 4 +- .../protectedStatic/simpleClass.kt | 9 ++ .../protectedStatic/simpleClass2.java} | 4 +- .../protectedStatic/simpleClass2.kt | 9 ++ .../protectedStatic/simpleFun.java | 5 + .../boxWithJava/protectedStatic/simpleFun.kt | 9 ++ .../protectedStatic/simpleProperty.java} | 2 +- .../protectedStatic/simpleProperty.kt | 10 ++ .../protected_static/protectedStaticClass.kt | 9 -- .../protected_static/protectedStaticClass2.kt | 9 -- .../protected_static/protectedStaticFun.kt | 9 -- .../protectedStaticFunClassObject.kt | 11 --- .../protectedStaticFunGenericClass.kt | 9 -- .../protectedStaticFunNestedStaticClass.kt | 9 -- .../protectedStaticFunNestedStaticClass2.kt | 9 -- ...tectedStaticFunNestedStaticGenericClass.kt | 9 -- ...protectedStaticFunNotDirectSuperClass.java | 5 - .../protectedStaticFunNotDirectSuperClass.kt | 12 --- .../protectedStaticFunObject.kt | 9 -- .../protectedStaticProperty.kt | 10 -- .../VisibilityGenWithJavaTestGenerated.java | 97 ------------------- .../jet/generators/tests/GenerateTests.java | 7 -- 38 files changed, 125 insertions(+), 235 deletions(-) rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunCallInConstructor.java => boxWithJava/protectedStatic/funCallInConstructor.java} (54%) rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunCallInConstructor.kt => boxWithJava/protectedStatic/funCallInConstructor.kt} (50%) rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFun.java => boxWithJava/protectedStatic/funClassObject.java} (68%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunClassObject.java => boxWithJava/protectedStatic/funGenericClass.java} (61%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.java => boxWithJava/protectedStatic/funNestedStaticClass.java} (70%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.java => boxWithJava/protectedStatic/funNestedStaticClass2.java} (76%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.java => boxWithJava/protectedStatic/funNestedStaticGenericClass.java} (66%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunGenericClass.java => boxWithJava/protectedStatic/funNotDirectSuperClass.java} (60%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticFunObject.java => boxWithJava/protectedStatic/funObject.java} (65%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticClass.java => boxWithJava/protectedStatic/simpleClass.java} (68%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticClass2.java => boxWithJava/protectedStatic/simpleClass2.java} (75%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.java create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt rename compiler/testData/codegen/{visibility/withJava/protected_static/protectedStaticProperty.java => boxWithJava/protectedStatic/simpleProperty.java} (61%) create mode 100644 compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.java delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.kt delete mode 100644 compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.kt delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/generated/VisibilityGenWithJavaTestGenerated.java diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.java similarity index 54% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.java index 26c2d723702..bd2de53a7de 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.java @@ -1,10 +1,8 @@ -import java.lang.String; - -public class protectedStaticFunCallInConstructor { +public class funCallInConstructor { protected final String protectedProperty; - public protectedStaticFunCallInConstructor(String str) { + public funCallInConstructor(String str) { protectedProperty = str; } diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.kt similarity index 50% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.kt rename to compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.kt index d698c601b72..f1cf3e893a2 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.kt +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funCallInConstructor.kt @@ -1,4 +1,4 @@ -class A: protectedStaticFunCallInConstructor(protectedStaticFunCallInConstructor.protectedFun()) { +class A: funCallInConstructor(funCallInConstructor.protectedFun()) { fun test(): String { return protectedProperty!! } diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.java similarity index 68% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.java index 0a43a2c99b2..065086cd1fb 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.java @@ -1,4 +1,5 @@ -public class protectedStaticFun { +public class funClassObject { + protected static String protectedFun() { return "OK"; } diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt new file mode 100644 index 00000000000..cad83d0b62e --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funClassObject.kt @@ -0,0 +1,11 @@ +class A { + class object: funClassObject() { + fun test(): String { + return funClassObject.protectedFun()!! + } + } +} + +fun box(): String { + return A.test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.java similarity index 61% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.java index c9a4240f99e..bfa4ed26b70 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.java @@ -1,5 +1,4 @@ -public class protectedStaticFunClassObject { - +public class funGenericClass { protected static String protectedFun() { return "OK"; } diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt new file mode 100644 index 00000000000..4eb9910c441 --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funGenericClass.kt @@ -0,0 +1,9 @@ +class Derived(): funGenericClass() { + fun test(): String { + return funGenericClass.protectedFun()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.java similarity index 70% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.java index d1b3ac3eb87..53c62202cb6 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.java @@ -1,4 +1,4 @@ -public class protectedStaticFunNestedStaticClass { +public class funNestedStaticClass { public static class Inner { protected static String protectedFun() { return "OK"; diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt new file mode 100644 index 00000000000..1a681f5c34a --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass.kt @@ -0,0 +1,9 @@ +class Derived(): funNestedStaticClass.Inner() { + fun test(): String { + return funNestedStaticClass.Inner.protectedFun()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.java similarity index 76% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.java index 78bf2b53985..449910aa583 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.java @@ -1,4 +1,4 @@ -public class protectedStaticFunNestedStaticClass2 { +public class funNestedStaticClass2 { public static class A { public static class B { protected static String protectedFun() { diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt new file mode 100644 index 00000000000..50d7d7b0f8b --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticClass2.kt @@ -0,0 +1,9 @@ +class Derived(): funNestedStaticClass2.A.B() { + fun test(): String { + return funNestedStaticClass2.A.B.protectedFun()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.java similarity index 66% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.java index d450ec630ad..c47c8420a3e 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.java @@ -1,7 +1,7 @@ -public class protectedStaticFunNestedStaticGenericClass { +public class funNestedStaticGenericClass { public static class Inner { protected static String protectedFun() { return "OK"; } } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt new file mode 100644 index 00000000000..f4e1741e70c --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNestedStaticGenericClass.kt @@ -0,0 +1,9 @@ +class Derived(): funNestedStaticGenericClass.Inner() { + fun test(): String { + return funNestedStaticGenericClass.Inner.protectedFun()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.java similarity index 60% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.java index 1f6b5dd9de6..c9a32d895a3 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.java @@ -1,4 +1,4 @@ -public class protectedStaticFunGenericClass { +public class funNotDirectSuperClass { protected static String protectedFun() { return "OK"; } diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt new file mode 100644 index 00000000000..64c6a6ff105 --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funNotDirectSuperClass.kt @@ -0,0 +1,12 @@ +open class A : funNotDirectSuperClass() {} + +class Derived(): A() { + fun test(): String { + return funNotDirectSuperClass.protectedFun()!! + } +} + +fun box(): String { + return Derived().test() +} + diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.java b/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.java similarity index 65% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/funObject.java index ea9fb8eb247..b0d41cfb4f9 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.java @@ -1,4 +1,4 @@ -public class protectedStaticFunObject { +public class funObject { protected static String protectedFun() { return "OK"; diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt new file mode 100644 index 00000000000..3d576508c6c --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/funObject.kt @@ -0,0 +1,9 @@ +object A: funObject() { + fun test(): String { + return funObject.protectedFun()!! + } +} + +fun box(): String { + return A.test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.java b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.java similarity index 68% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.java index 337f9a781d7..1af03cb7f01 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.java @@ -1,6 +1,4 @@ -import java.lang.String; - -public class protectedStaticClass { +public class simpleClass { protected static class Inner { public Inner() {} public String foo() { diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt new file mode 100644 index 00000000000..c10cb6bd87a --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass.kt @@ -0,0 +1,9 @@ +class Derived(): simpleClass() { + fun test(): String { + return simpleClass.Inner().foo()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.java b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.java similarity index 75% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.java index 16bf7b66ca9..eab24a999c3 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.java @@ -1,6 +1,4 @@ -import java.lang.String; - -public class protectedStaticClass2 { +public class simpleClass2 { public static class A { protected static class B { public B() { diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt new file mode 100644 index 00000000000..824b0f5458b --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleClass2.kt @@ -0,0 +1,9 @@ +class Derived(): simpleClass2.A() { + fun test(): String { + return simpleClass2.A.B().foo()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.java b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.java new file mode 100644 index 00000000000..03fea7a6196 --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.java @@ -0,0 +1,5 @@ +public class simpleFun { + protected static String protectedFun() { + return "OK"; + } +} diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt new file mode 100644 index 00000000000..7f76e10ba62 --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleFun.kt @@ -0,0 +1,9 @@ +class Derived(): simpleFun() { + fun test(): String { + return simpleFun.protectedFun()!! + } +} + +fun box(): String { + return Derived().test() +} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.java b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.java similarity index 61% rename from compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.java rename to compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.java index 262d8f4f36a..925543fa33f 100644 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.java +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.java @@ -1,3 +1,3 @@ -public class protectedStaticProperty { +public class simpleProperty { protected static final String protectedProperty = "OK"; } diff --git a/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt new file mode 100644 index 00000000000..9d0448338dd --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/protectedStatic/simpleProperty.kt @@ -0,0 +1,10 @@ +class Derived(): simpleProperty() { + fun test(): String { + return simpleProperty.protectedProperty!! + } +} + +fun box(): String { + return Derived().test() +} + diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.kt deleted file mode 100644 index a45d9886e08..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticClass() { - fun test(): String { - return protectedStaticClass.Inner().foo()!! - } -} - -fun box(): String { - return Derived().test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.kt deleted file mode 100644 index b1e5fe4c859..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticClass2.A() { - fun test(): String { - return protectedStaticClass2.A.B().foo()!! - } -} - -fun box(): String { - return Derived().test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.kt deleted file mode 100644 index 166c2635e3f..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticFun() { - fun test(): String { - return protectedStaticFun.protectedFun()!! - } -} - -fun box(): String { - return Derived().test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.kt deleted file mode 100644 index 6ce3f6f2817..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.kt +++ /dev/null @@ -1,11 +0,0 @@ -class A { - class object: protectedStaticFunClassObject() { - fun test(): String { - return protectedStaticFunClassObject.protectedFun()!! - } - } -} - -fun box(): String { - return A.test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.kt deleted file mode 100644 index 981d8451a77..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticFunGenericClass() { - fun test(): String { - return protectedStaticFunGenericClass.protectedFun()!! - } -} - -fun box(): String { - return Derived().test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.kt deleted file mode 100644 index 5afae19f923..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticFunNestedStaticClass.Inner() { - fun test(): String { - return protectedStaticFunNestedStaticClass.Inner.protectedFun()!! - } -} - -fun box(): String { - return Derived().test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.kt deleted file mode 100644 index 8db27a0c3e8..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticFunNestedStaticClass2.A.B() { - fun test(): String { - return protectedStaticFunNestedStaticClass2.A.B.protectedFun()!! - } -} - -fun box(): String { - return Derived().test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.kt deleted file mode 100644 index ba738b9c4bc..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Derived(): protectedStaticFunNestedStaticGenericClass.Inner() { - fun test(): String { - return protectedStaticFunNestedStaticGenericClass.Inner.protectedFun()!! - } -} - -fun box(): String { - return Derived().test() -} \ No newline at end of file diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.java b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.java deleted file mode 100644 index 01cd7475eb8..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.java +++ /dev/null @@ -1,5 +0,0 @@ -public class protectedStaticFunNotDirectSuperClass { - protected static String protectedFun() { - return "OK"; - } -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.kt deleted file mode 100644 index 186c2fcf906..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.kt +++ /dev/null @@ -1,12 +0,0 @@ -open class A : protectedStaticFunNotDirectSuperClass() {} - -class Derived(): A() { - fun test(): String { - return protectedStaticFunNotDirectSuperClass.protectedFun()!! - } -} - -fun box(): String { - return Derived().test() -} - diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.kt deleted file mode 100644 index 0ab6b98ed4b..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.kt +++ /dev/null @@ -1,9 +0,0 @@ -object A: protectedStaticFunObject() { - fun test(): String { - return protectedStaticFunObject.protectedFun()!! - } -} - -fun box(): String { - return A.test() -} diff --git a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.kt b/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.kt deleted file mode 100644 index c2255a617a3..00000000000 --- a/compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.kt +++ /dev/null @@ -1,10 +0,0 @@ -class Derived(): protectedStaticProperty() { - fun test(): String { - return protectedStaticProperty.protectedProperty!! - } -} - -fun box(): String { - return Derived().test() -} - diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/VisibilityGenWithJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/VisibilityGenWithJavaTestGenerated.java deleted file mode 100644 index ee0e45eff1a..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/VisibilityGenWithJavaTestGenerated.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2010-2012 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.generated; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.io.File; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; - -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/visibility/withJava/protected_static") -public class VisibilityGenWithJavaTestGenerated extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInProtected_static() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/withJava/protected_static"), "kt", true); - } - - @TestMetadata("protectedStaticClass.kt") - public void testProtectedStaticClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass.kt"); - } - - @TestMetadata("protectedStaticClass2.kt") - public void testProtectedStaticClass2() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticClass2.kt"); - } - - @TestMetadata("protectedStaticFun.kt") - public void testProtectedStaticFun() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFun.kt"); - } - - @TestMetadata("protectedStaticFunCallInConstructor.kt") - public void testProtectedStaticFunCallInConstructor() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunCallInConstructor.kt"); - } - - @TestMetadata("protectedStaticFunClassObject.kt") - public void testProtectedStaticFunClassObject() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunClassObject.kt"); - } - - @TestMetadata("protectedStaticFunGenericClass.kt") - public void testProtectedStaticFunGenericClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunGenericClass.kt"); - } - - @TestMetadata("protectedStaticFunNestedStaticClass.kt") - public void testProtectedStaticFunNestedStaticClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass.kt"); - } - - @TestMetadata("protectedStaticFunNestedStaticClass2.kt") - public void testProtectedStaticFunNestedStaticClass2() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticClass2.kt"); - } - - @TestMetadata("protectedStaticFunNestedStaticGenericClass.kt") - public void testProtectedStaticFunNestedStaticGenericClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNestedStaticGenericClass.kt"); - } - - @TestMetadata("protectedStaticFunNotDirectSuperClass.kt") - public void testProtectedStaticFunNotDirectSuperClass() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunNotDirectSuperClass.kt"); - } - - @TestMetadata("protectedStaticFunObject.kt") - public void testProtectedStaticFunObject() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticFunObject.kt"); - } - - @TestMetadata("protectedStaticProperty.kt") - public void testProtectedStaticProperty() throws Exception { - blackBoxFileWithJavaByFullPath("compiler/testData/codegen/visibility/withJava/protected_static/protectedStaticProperty.kt"); - } - -} diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 3d4c5b15310..fc17051c6ea 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -84,13 +84,6 @@ public class GenerateTests { testModel("compiler/testData/checkLocalVariablesTable", "doTest") ); - generateTest( - "compiler/tests/", - "VisibilityGenWithJavaTestGenerated", - AbstractBlackBoxCodegenTest.class, - testModel("compiler/testData/codegen/visibility/withJava/protected_static", "blackBoxFileWithJavaByFullPath") - ); - generateTest( "compiler/tests/", "WriteFlagsTestGenerated",