Remove generated black box java codegen test

Move all testData to boxWithJava/
2013-01-27 20:46:26 +04:00
parent 86938f57b1
commit 2904d1745b
38 changed files with 125 additions and 235 deletions
@@ -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;
    }

@@ -1,4 +1,4 @@
-class A: protectedStaticFunCallInConstructor(protectedStaticFunCallInConstructor.protectedFun()) {
+class A: funCallInConstructor(funCallInConstructor.protectedFun()) {
  fun test(): String {
    return protectedProperty!!
  }
@@ -1,4 +1,5 @@
-public class protectedStaticFun {
+public class funClassObject {
+
    protected static String protectedFun() {
        return "OK";
    }
@@ -0,0 +1,11 @@
+class A {
+  class object: funClassObject() {
+    fun test(): String {
+      return funClassObject.protectedFun()!!
+    }
+  }
+}
+
+fun box(): String {
+  return A.test()
+}
@@ -1,5 +1,4 @@
-public class protectedStaticFunClassObject {
-
+public class funGenericClass<T> {
    protected static String protectedFun() {
        return "OK";
    }
@@ -0,0 +1,9 @@
+class Derived(): funGenericClass<String>() {
+    fun test(): String {
+        return funGenericClass.protectedFun()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -1,4 +1,4 @@
-public class protectedStaticFunNestedStaticClass {
+public class funNestedStaticClass {
    public static class Inner {
        protected static String protectedFun() {
            return "OK";
@@ -0,0 +1,9 @@
+class Derived(): funNestedStaticClass.Inner() {
+    fun test(): String {
+        return funNestedStaticClass.Inner.protectedFun()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -1,4 +1,4 @@
-public class protectedStaticFunNestedStaticClass2 {
+public class funNestedStaticClass2 {
    public static class A {
        public static class B {
            protected static String protectedFun() {
@@ -0,0 +1,9 @@
+class Derived(): funNestedStaticClass2.A.B() {
+    fun test(): String {
+        return funNestedStaticClass2.A.B.protectedFun()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -1,7 +1,7 @@
-public class protectedStaticFunNestedStaticGenericClass<T> {
+public class funNestedStaticGenericClass<T> {
    public static class Inner<S> {
        protected static String protectedFun() {
            return "OK";
        }
    }
-}
+}
@@ -0,0 +1,9 @@
+class Derived(): funNestedStaticGenericClass<String>.Inner<String>() {
+    fun test(): String {
+        return funNestedStaticGenericClass.Inner.protectedFun()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -1,4 +1,4 @@
-public class protectedStaticFunGenericClass<T> {
+public class funNotDirectSuperClass {
    protected static String protectedFun() {
        return "OK";
    }
@@ -0,0 +1,12 @@
+open class A : funNotDirectSuperClass() {}
+
+class Derived(): A() {
+    fun test(): String {
+        return funNotDirectSuperClass.protectedFun()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
+
@@ -1,4 +1,4 @@
-public class protectedStaticFunObject {
+public class funObject {

    protected static String protectedFun() {
        return "OK";
@@ -0,0 +1,9 @@
+object A: funObject() {
+  fun test(): String {
+    return funObject.protectedFun()!!
+  }
+}
+
+fun box(): String {
+  return A.test()
+}
@@ -1,6 +1,4 @@
-import java.lang.String;
-
-public class protectedStaticClass {
+public class simpleClass {
    protected static class Inner {
        public Inner() {}
        public String foo() {
@@ -0,0 +1,9 @@
+class Derived(): simpleClass() {
+    fun test(): String {
+        return simpleClass.Inner().foo()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -1,6 +1,4 @@
-import java.lang.String;
-
-public class protectedStaticClass2 {
+public class simpleClass2 {
    public static class A {
        protected static class B {
            public B() {
@@ -0,0 +1,9 @@
+class Derived(): simpleClass2.A() {
+    fun test(): String {
+        return simpleClass2.A.B().foo()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -0,0 +1,5 @@
+public class simpleFun {
+    protected static String protectedFun() {
+        return "OK";
+    }
+}
@@ -0,0 +1,9 @@
+class Derived(): simpleFun() {
+    fun test(): String {
+        return simpleFun.protectedFun()!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
@@ -1,3 +1,3 @@
-public class protectedStaticProperty {
+public class simpleProperty {
    protected static final String protectedProperty = "OK";
 }
@@ -0,0 +1,10 @@
+class Derived(): simpleProperty() {
+    fun test(): String {
+        return simpleProperty.protectedProperty!!
+    }
+}
+
+fun box(): String {
+   return Derived().test()
+}
+
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticClass() {
-    fun test(): String {
-        return protectedStaticClass.Inner().foo()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticClass2.A() {
-    fun test(): String {
-        return protectedStaticClass2.A.B().foo()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticFun() {
-    fun test(): String {
-        return protectedStaticFun.protectedFun()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,11 +0,0 @@
-class A {
-  class object: protectedStaticFunClassObject() {
-    fun test(): String {
-      return protectedStaticFunClassObject.protectedFun()!!
-    }
-  }
-}
-
-fun box(): String {
-  return A.test()
-}
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticFunGenericClass<String>() {
-    fun test(): String {
-        return protectedStaticFunGenericClass.protectedFun()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticFunNestedStaticClass.Inner() {
-    fun test(): String {
-        return protectedStaticFunNestedStaticClass.Inner.protectedFun()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticFunNestedStaticClass2.A.B() {
-    fun test(): String {
-        return protectedStaticFunNestedStaticClass2.A.B.protectedFun()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,9 +0,0 @@
-class Derived(): protectedStaticFunNestedStaticGenericClass<String>.Inner<String>() {
-    fun test(): String {
-        return protectedStaticFunNestedStaticGenericClass.Inner.protectedFun()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
@@ -1,5 +0,0 @@
-public class protectedStaticFunNotDirectSuperClass {
-    protected static String protectedFun() {
-        return "OK";
-    }
-}
@@ -1,12 +0,0 @@
-open class A : protectedStaticFunNotDirectSuperClass() {}
-
-class Derived(): A() {
-    fun test(): String {
-        return protectedStaticFunNotDirectSuperClass.protectedFun()!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
-
@@ -1,9 +0,0 @@
-object A: protectedStaticFunObject() {
-  fun test(): String {
-    return protectedStaticFunObject.protectedFun()!!
-  }
-}
-
-fun box(): String {
-  return A.test()
-}
@@ -1,10 +0,0 @@
-class Derived(): protectedStaticProperty() {
-    fun test(): String {
-        return protectedStaticProperty.protectedProperty!!
-    }
-}
-
-fun box(): String {
-   return Derived().test()
-}
-
@@ -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");
-    }
-    
-}
@@ -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",