diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 1385b1cc4523..ec9c6074b1b5 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -1624,17 +1624,12 @@
-
-
-
+
-
+
typesToInitialValues = new HashMap();
- private static final Logger LOG = Logger.getInstance("org.jetbrains.plugins.groovy.refactoring.convertToJava.GroovyToJavaGenerator");
+ private static final Map typesToInitialValues = new HashMap<>();
static {
typesToInitialValues.put("boolean", "false");
@@ -53,80 +42,6 @@ public class GroovyToJavaGenerator {
typesToInitialValues.put("void", "");
}
- private final Set myAllToCompile;
- private final Project myProject;
-
-
- public GroovyToJavaGenerator(Project project, Set allToCompile) {
- myProject = project;
- myAllToCompile = allToCompile;
- }
-
- public Map generateStubs(GroovyFile file) {
- Set classNames = new THashSet();
- for (final GrTypeDefinition typeDefinition : file.getTypeDefinitions()) {
- classNames.add(typeDefinition.getName());
- }
-
- final Map output = new LinkedHashMap();
-
- if (file.isScript()) {
- VirtualFile virtualFile = file.getVirtualFile();
- assert virtualFile != null;
- String fileDefinitionName = virtualFile.getNameWithoutExtension();
- if (!classNames.contains(StringUtil.capitalize(fileDefinitionName)) &&
- !classNames.contains(StringUtil.decapitalize(fileDefinitionName))) {
- final PsiClass scriptClass = file.getScriptClass();
- if (scriptClass != null) {
- generateClassStub(scriptClass, output);
- }
- }
- }
-
- for (final GrTypeDefinition typeDefinition : file.getTypeDefinitions()) {
- generateClassStub(typeDefinition, output);
- }
- return output;
- }
-
- private void generateClassStub(PsiClass clazz, Map output) {
- final CharSequence text = generateClass(clazz);
- final String filename = getFileNameForClass(clazz);
- output.put(filename, text);
- }
-
- private static String getFileNameForClass(PsiClass clazz) {
- final PsiFile containingFile = clazz.getContainingFile();
- final GrPackageDefinition packageDefinition = ((GroovyFile)containingFile).getPackageDefinition();
- return getPackageDirectory(packageDefinition) + clazz.getName() + ".java";
- }
-
- private static String getPackageDirectory(@Nullable GrPackageDefinition packageDefinition) {
- if (packageDefinition == null) return "";
-
- String prefix = packageDefinition.getPackageName();
- if (prefix == null) return "";
-
- return prefix.replace('.', '/') + '/';
- }
-
- public CharSequence generateClass(@NotNull PsiClass typeDefinition) {
- try {
- StringBuilder text = new StringBuilder();
- final ClassNameProvider classNameProvider = new StubClassNameProvider(myAllToCompile);
- ClassItemGenerator classItemGenerator = new StubGenerator(classNameProvider);
- new ClassGenerator(classNameProvider, classItemGenerator).writeTypeDefinition(text, typeDefinition, true, true);
- return text;
- }
- catch (ProcessCanceledException e) {
- throw e;
- }
- catch (Throwable e) {
- LOG.error(e);
- return "";
- }
- }
-
public static String getDefaultValueText(String typeCanonicalText) {
final String result = typesToInitialValues.get(typeCanonicalText);
if (result == null) return "null";
@@ -138,7 +53,7 @@ public class GroovyToJavaGenerator {
return method.getText();
}
- final ClassItemGenerator generator = new StubGenerator(new StubClassNameProvider(Collections.emptySet()));
+ final ClassItemGenerator generator = new StubGenerator(new StubClassNameProvider(Collections.emptySet()));
final StringBuilder buffer = new StringBuilder();
if (method.isConstructor()) {
generator.writeConstructor(buffer, method, false);
@@ -148,21 +63,4 @@ public class GroovyToJavaGenerator {
}
return buffer.toString();
}
-
- /**
- * method for tests and debugging
- */
- public static StringBuilder generateStubs(PsiFile psiFile) {
- final StringBuilder builder = new StringBuilder();
- final Set files = Collections.singleton(psiFile.getViewProvider().getVirtualFile());
- final Map map = new GroovyToJavaGenerator(psiFile.getProject(), files).generateStubs((GroovyFile)psiFile);
-
- for (CharSequence stubText : map.values()) {
- builder.append(stubText);
- builder.append("\n");
- builder.append("---");
- builder.append("\n");
- }
- return builder;
- }
}
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GeneratorTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GeneratorTest.groovy
deleted file mode 100644
index cc2fd81bb012..000000000000
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GeneratorTest.groovy
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2000-2014 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.plugins.groovy.compiler
-
-import com.intellij.openapi.util.text.StringUtil
-import com.intellij.psi.PsiFile
-import org.jetbrains.plugins.groovy.LightGroovyTestCase
-import org.jetbrains.plugins.groovy.refactoring.convertToJava.GroovyToJavaGenerator
-import org.jetbrains.plugins.groovy.util.TestUtils
-
-/**
- * @author Dmitry.Krasilschikov
- * @since 06.06.2007
- */
-class GeneratorTest extends LightGroovyTestCase {
- final String basePath = TestUtils.testDataPath + "groovy/stubGenerator"
-
- public void testArrayType1() throws Throwable { doTest(); }
- public void testAtInterface() throws Throwable { doTest(); }
- public void testDefInInterface() throws Throwable { doTest(); }
- public void testExtends1() throws Throwable { doTest(); }
- public void testExtendsImplements() throws Throwable { doTest(); }
- public void testGetterAlreadyDefined() throws Throwable { doTest(); }
- public void testScriptWithMain() {doTest();}
- public void testGrvy1098() throws Throwable { doTest(); }
- public void testGrvy118() throws Throwable { doTest(); }
- public void testGrvy1358() throws Throwable { doTest(); }
- public void testGrvy1376() throws Throwable { doTest(); }
- public void testGrvy170() throws Throwable { doTest(); }
- public void testGrvy903() throws Throwable { doTest(); }
- public void testGrvy908() throws Throwable { doTest(); }
- public void testGRVY915() throws Throwable { doTest(); }
- public void testImplements1() throws Throwable { doTest(); }
- public void testKireyev() throws Throwable { doTest(); }
- public void testMethodTypeParameters() throws Throwable { doTest(); }
- public void testOptionalParameter() throws Throwable { doTest(); }
- public void testOverrideFinalGetter() throws Throwable { doTest(); }
- public void testPackage1() throws Throwable { doTest(); }
- public void testScript() throws Throwable { doTest(); }
- public void testSetterAlreadyDefined1() throws Throwable { doTest(); }
- public void testSetUpper1() throws Throwable { doTest(); }
- public void testSingletonConstructor() throws Throwable { doTest(); }
- public void testStringMethodName() throws Throwable { doTest(); }
- public void testSuperInvocation() throws Throwable { doTest(); }
- public void testSuperInvocation1() throws Throwable { doTest(); }
- public void testToGenerate() throws Throwable { doTest(); }
- public void testToGenerate1() throws Throwable { doTest(); }
- public void testVararg1() throws Throwable { doTest(); }
- public void testInaccessibleConstructor() throws Throwable { doTest(); }
- public void testSynchronizedProperty() throws Throwable { doTest(); }
- public void testVarargs() throws Throwable { doTest(); }
- public void testThrowsCheckedException() throws Throwable { doTest(); }
- public void testSubclassProperty() throws Throwable { doTest(); }
- public void testFinalProperty() throws Throwable { doTest(); }
- public void testDefaultConstructorArguments() throws Throwable { doTest(); }
- public void testDelegateWithStaticMethod() throws Throwable { doTest(); }
-
- public void testParameterReturnType() throws Throwable {
- myFixture.addClass("public interface GwtActionService {\n" +
- " T execute(java.util.List action);\n" +
- "}");
- doTest();
- }
-
- public void testRawReturnTypeInImplementation() throws Throwable { doTest(); }
-
- public void testDelegationGenerics() throws Throwable {
- myFixture.addClass("package groovy.lang; public @interface Delegate { boolean interfaces() default true; }");
- doTest();
- }
-
- public void testCheckedExceptionInConstructorDelegate() throws Throwable {
- myFixture.addClass("package foo;" +
- "public class SuperClass {" +
- " public SuperClass(String s) throws java.io.IOException {}" +
- "}");
- doTest();
- }
-
- public void testInaccessiblePropertyType() throws Throwable {
- myFixture.addClass("package foo; class Hidden {}");
- doTest();
- }
-
- public void testImmutableAnno() throws Throwable {
- myFixture.addClass("package groovy.lang; public @interface Immutable {}");
- doTest();
- }
-
- public void testTupleConstructorAnno() throws Throwable {
- myFixture.addClass("package groovy.transform; public @interface TupleConstructor {}");
- doTest();
- }
-
- public void testDelegateAnno() throws Throwable {
- myFixture.addClass("package groovy.lang; public @interface Delegate {}");
- doTest();
- }
- public void testAutoCloneAnno() throws Throwable {
- myFixture.addClass("package groovy.transform; public @interface AutoClone {}");
- doTest();
- }
-
- public void testDelegateToMethodWithTypeParams() {
- doTest();
- }
-
- public void testMethodsWithTypeParamsAndOptionalParams() {
- doTest();
- }
-
- public void testMethodWithItsOwnTypeParams(){
- doTest();
- }
-
- public void testErasedOverloadedMethodInDelegate() {
- myFixture.addClass("package groovy.lang; public @interface Delegate {}");
- doTest();
- }
-
- public void testFinalMethods() {
- doTest();
- }
-
- public void testInheritConstructors() {
- myFixture.addClass('package groovy.transform; public @interface InheritConstructors{}')
- myFixture.addClass('public class Base {public Base(String s){}}')
- doTest()
- }
-
- public void doTest() {
- final String relTestPath = getTestName(true) + ".test";
- final List data = TestUtils.readInput("$testDataPath/$relTestPath");
-
- final String testName = StringUtil.trimEnd(relTestPath, ".test");
- PsiFile psiFile = TestUtils.createPseudoPhysicalFile(project, testName + ".groovy", data.get(0));
- final StringBuilder builder = GroovyToJavaGenerator.generateStubs(psiFile);
-
- assertEquals(data.get(1).trim(), builder.toString().trim());
- }
-}
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/GRVY915.test b/plugins/groovy/testdata/groovy/stubGenerator/GRVY915.test
deleted file mode 100644
index 923aa948ef30..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/GRVY915.test
+++ /dev/null
@@ -1,21 +0,0 @@
-enum E {
- A("") {def foo() {}};
-
- def E(int i) {}
-
- abstract def foo();
-}
------
-public enum E {
-A((int)0){
-public java.lang.Object foo() {
-return null;
-}
-};
-E(int i) {
-
-}
-public abstract java.lang.Object foo() ;
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/arrayType1.test b/plugins/groovy/testdata/groovy/stubGenerator/arrayType1.test
deleted file mode 100644
index ccc7b2d57dd8..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/arrayType1.test
+++ /dev/null
@@ -1,57 +0,0 @@
-class ArrayType1 {
- def int[] integers
- def String[] strings
-
- def int[] foo() {}
- def Object[] getObj () {}
-}
------
-public class ArrayType1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public int[] foo() {
-return null;
-}
-
-public java.lang.Object[] getObj() {
-return null;
-}
-
-public int[] getIntegers() {
-return null;
-}
-
-public void setIntegers(int[] integers) {
-return ;
-}
-
-public java.lang.String[] getStrings() {
-return null;
-}
-
-public void setStrings(java.lang.String[] strings) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private int[] integers = null;
-private java.lang.String[] strings = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/atInterface.test b/plugins/groovy/testdata/groovy/stubGenerator/atInterface.test
deleted file mode 100644
index 9ddfecac0cc9..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/atInterface.test
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.lang.annotation.*
-
-@Retention(RetentionPolicy.RUNTIME) @interface AtInterface {
-
-}
------
-public @interface AtInterface {
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/autoCloneAnno.test b/plugins/groovy/testdata/groovy/stubGenerator/autoCloneAnno.test
deleted file mode 100644
index fa785119a386..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/autoCloneAnno.test
+++ /dev/null
@@ -1,30 +0,0 @@
-@groovy.transform.AutoClone
-class Foo {}
------
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object clone() throws java.lang.CloneNotSupportedException {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/checkedExceptionInConstructorDelegate.test b/plugins/groovy/testdata/groovy/stubGenerator/checkedExceptionInConstructorDelegate.test
deleted file mode 100644
index 6bded3f8dce6..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/checkedExceptionInConstructorDelegate.test
+++ /dev/null
@@ -1,39 +0,0 @@
-class CheckedException extends foo.SuperClass {
- protected CheckedException(CheckedException p) {
- this("");
- }
- protected CheckedException(String s) {
- super(s);
- }
-}
-
------
-public class CheckedException extends foo.SuperClass implements groovy.lang.GroovyObject {
-public CheckedException(CheckedException p) throws java.io.IOException {
-this((java.lang.String)null);
-}
-public CheckedException(java.lang.String s) throws java.io.IOException {
-super((java.lang.String)null);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/defInInterface.test b/plugins/groovy/testdata/groovy/stubGenerator/defInInterface.test
deleted file mode 100644
index 96f9a6ed088c..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/defInInterface.test
+++ /dev/null
@@ -1,8 +0,0 @@
-interface DefInInterface {
- def bar
-}
------
-public interface DefInInterface {
-public static final java.lang.Object bar = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/defaultConstructorArguments.test b/plugins/groovy/testdata/groovy/stubGenerator/defaultConstructorArguments.test
deleted file mode 100644
index edf116bbaa50..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/defaultConstructorArguments.test
+++ /dev/null
@@ -1,65 +0,0 @@
-class Foo {
- Foo(int a) {}
-}
-
-class Bar extends Foo {
- Bar(int a, int b = 2) {
- super(a)
- }
-}
------
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Foo(int a) {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class Bar extends Foo implements groovy.lang.GroovyObject {
-public Bar(int a, int b) {
-super((int)0);
-}
-public Bar(int a) {
-super((int)0);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/delegateAnno.test b/plugins/groovy/testdata/groovy/stubGenerator/delegateAnno.test
deleted file mode 100644
index ee1acc0f1d56..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/delegateAnno.test
+++ /dev/null
@@ -1,122 +0,0 @@
-interface DelegateFoo {
- def foo()
-}
-
-class Doo implements Serializable {}
-
-class DelegateBarImpl {
- @Delegate DelegateFoo foo;
- private @Delegate(interfaces=false) Runnable zoo;
- private @Delegate Doo doo;
-}
-class Del2 implements DelegateFoo {
- @Delegate DelegateFoo foo;
- def foo() {}
-}
------
-public interface DelegateFoo {
-public abstract java.lang.Object foo() ;
-
-}
----
-public class Doo extends groovy.lang.GroovyObjectSupport implements java.io.Serializable, groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class DelegateBarImpl extends groovy.lang.GroovyObjectSupport implements DelegateFoo, java.io.Serializable, groovy.lang.GroovyObject {
-public DelegateFoo getFoo() {
-return null;
-}
-
-public void setFoo(DelegateFoo foo) {
-return ;
-}
-
-public java.lang.Object foo() {
-return null;
-}
-
-public void run() {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private DelegateFoo foo = null;
-private java.lang.Runnable zoo = null;
-private Doo doo = null;
-}
----
-public class Del2 extends groovy.lang.GroovyObjectSupport implements DelegateFoo, groovy.lang.GroovyObject {
-public java.lang.Object foo() {
-return null;
-}
-
-public DelegateFoo getFoo() {
-return null;
-}
-
-public void setFoo(DelegateFoo foo) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private DelegateFoo foo = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/delegateToMethodWithTypeParams.test b/plugins/groovy/testdata/groovy/stubGenerator/delegateToMethodWithTypeParams.test
deleted file mode 100644
index fa3b0bc9e65d..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/delegateToMethodWithTypeParams.test
+++ /dev/null
@@ -1,121 +0,0 @@
-abstract class TestDelegateIdea {
- @Delegate
- private List delegate = []
-}
------
-public abstract class TestDelegateIdea extends groovy.lang.GroovyObjectSupport implements java.util.List, groovy.lang.GroovyObject {
-public int size() {
-return 0;
-}
-
-public boolean isEmpty() {
-return false;
-}
-
-public boolean contains(java.lang.Object o) {
-return false;
-}
-
-public java.util.Iterator iterator() {
-return null;
-}
-
-public java.lang.Object[] toArray() {
-return null;
-}
-
-public T[] toArray(T[] a) {
-return null;
-}
-
-public boolean add(java.lang.String o) {
-return false;
-}
-
-public boolean remove(java.lang.Object o) {
-return false;
-}
-
-public boolean containsAll(java.util.Collection> c) {
-return false;
-}
-
-public boolean addAll(java.util.Collection extends java.lang.String> c) {
-return false;
-}
-
-public boolean addAll(int index, java.util.Collection extends java.lang.String> c) {
-return false;
-}
-
-public boolean removeAll(java.util.Collection> c) {
-return false;
-}
-
-public boolean retainAll(java.util.Collection> c) {
-return false;
-}
-
-public void clear() {
-return ;
-}
-
-public java.lang.String get(int index) {
-return null;
-}
-
-public java.lang.String set(int index, java.lang.String element) {
-return null;
-}
-
-public void add(int index, java.lang.String element) {
-return ;
-}
-
-public java.lang.String remove(int index) {
-return null;
-}
-
-public int indexOf(java.lang.Object o) {
-return 0;
-}
-
-public int lastIndexOf(java.lang.Object o) {
-return 0;
-}
-
-public java.util.ListIterator listIterator() {
-return null;
-}
-
-public java.util.ListIterator listIterator(int index) {
-return null;
-}
-
-public java.util.List subList(int fromIndex, int toIndex) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.util.List delegate = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/delegateWithStaticMethod.test b/plugins/groovy/testdata/groovy/stubGenerator/delegateWithStaticMethod.test
deleted file mode 100644
index 92d886624771..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/delegateWithStaticMethod.test
+++ /dev/null
@@ -1,67 +0,0 @@
-class Foo {
- @Delegate Bar bar
-}
-
-class Bar {
- static void bar() {}
-}
------
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Bar getBar() {
-return null;
-}
-
-public void setBar(Bar bar) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private Bar bar = null;
-}
----
-public class Bar extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public static void bar() {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/delegationGenerics.test b/plugins/groovy/testdata/groovy/stubGenerator/delegationGenerics.test
deleted file mode 100644
index 342580f40d9b..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/delegationGenerics.test
+++ /dev/null
@@ -1,45 +0,0 @@
-interface DelegationGenerics {
- V get(K k);
-}
-
-class ConfigNode {
- @Delegate final DelegationGenerics delegate
-}
------
-public interface DelegationGenerics {
-public abstract V get(K k) ;
-
-}
----
-public class ConfigNode extends groovy.lang.GroovyObjectSupport implements DelegationGenerics, groovy.lang.GroovyObject {
-public final DelegationGenerics getDelegate() {
-return null;
-}
-
-public java.lang.Object get(java.lang.String k) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private final DelegationGenerics delegate = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/erasedOverloadedMethodInDelegate.test b/plugins/groovy/testdata/groovy/stubGenerator/erasedOverloadedMethodInDelegate.test
deleted file mode 100644
index d7ae0d874611..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/erasedOverloadedMethodInDelegate.test
+++ /dev/null
@@ -1,102 +0,0 @@
-class A {
- def foo(List> s){print 'A'}
-}
-
-class B extends A {
- def foo(List s){print 'B'}
-}
-
-class C {
- @Delegate B b = new B()
-}
------
-public class A extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object foo(java.util.List> s) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class B extends A implements groovy.lang.GroovyObject {
-public java.lang.Object foo(java.util.List s) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class C extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public B getB() {
-return null;
-}
-
-public void setB(B b) {
-return ;
-}
-
-public java.lang.Object foo(java.util.List s) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private B b = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/extends1.test b/plugins/groovy/testdata/groovy/stubGenerator/extends1.test
deleted file mode 100644
index 2eb5f5292659..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/extends1.test
+++ /dev/null
@@ -1,51 +0,0 @@
-class BExtends {
-}
-class AExtends extends BExtends {
-}
------
-public class BExtends extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class AExtends extends BExtends implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/extendsImplements.test b/plugins/groovy/testdata/groovy/stubGenerator/extendsImplements.test
deleted file mode 100644
index ea0cc28c6e4a..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/extendsImplements.test
+++ /dev/null
@@ -1,26 +0,0 @@
-class ExtendsImplements extends GroovyObjectSupport implements GroovyObject {
-}
------
-public class ExtendsImplements extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/finalMethods.test b/plugins/groovy/testdata/groovy/stubGenerator/finalMethods.test
deleted file mode 100644
index e8678dfee028..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/finalMethods.test
+++ /dev/null
@@ -1,67 +0,0 @@
-class B {
- final void foo(){}
-}
-
-class C extends B {
- @Delegate Object o
-}
------
-public class B extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public final void foo() {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class C extends B implements groovy.lang.GroovyObject {
-public java.lang.Object getO() {
-return null;
-}
-
-public void setO(java.lang.Object o) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.lang.Object o = null;
-}
----
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/finalProperty.test b/plugins/groovy/testdata/groovy/stubGenerator/finalProperty.test
deleted file mode 100644
index 913051cd11dc..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/finalProperty.test
+++ /dev/null
@@ -1,60 +0,0 @@
-class Foo {
- final log
-}
-class Bar extends Foo {
- def log
-}
-
------
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public final java.lang.Object getLog() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private final java.lang.Object log = null;
-}
----
-public class Bar extends Foo implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.lang.Object log = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/getterAlreadyDefined.test b/plugins/groovy/testdata/groovy/stubGenerator/getterAlreadyDefined.test
deleted file mode 100644
index 633421403434..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/getterAlreadyDefined.test
+++ /dev/null
@@ -1,20 +0,0 @@
-def foo = ""
-
-def getFoo () {
-}
------
-public class getterAlreadyDefined extends groovy.lang.Script {
-public static void main(java.lang.String[] args) {
-return ;
-}
-
-public java.lang.Object run() {
-return null;
-}
-
-public java.lang.Object getFoo() {
-return null;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy1098.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy1098.test
deleted file mode 100644
index 9c330397d73c..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy1098.test
+++ /dev/null
@@ -1,60 +0,0 @@
-class Grvy1098 {
- static final def TEST
-}
-
-class B extends Grvy1098 {
- static final def TEST
-}
------
-public class Grvy1098 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public static java.lang.Object getTEST() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private static final java.lang.Object TEST = null;
-}
----
-public class B extends Grvy1098 implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private static final java.lang.Object TEST = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy118.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy118.test
deleted file mode 100644
index 39d3009b5536..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy118.test
+++ /dev/null
@@ -1,62 +0,0 @@
-abstract class A118 {
- public abstract myMethod()
-}
-
-class B118 extends A118 {
- public myMethod() {
- println "hello"
- }
-}
------
-public abstract class A118 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public abstract java.lang.Object myMethod() ;
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class B118 extends A118 implements groovy.lang.GroovyObject {
-public java.lang.Object myMethod() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy1358.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy1358.test
deleted file mode 100644
index 4d6fcb9943af..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy1358.test
+++ /dev/null
@@ -1,40 +0,0 @@
-class Grvy1358 {
- boolean enabled
-}
------
-public class Grvy1358 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public boolean getEnabled() {
-return false;
-}
-
-public boolean isEnabled() {
-return false;
-}
-
-public void setEnabled(boolean enabled) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private boolean enabled = false;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy1376.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy1376.test
deleted file mode 100644
index 39fcfc85275e..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy1376.test
+++ /dev/null
@@ -1,32 +0,0 @@
-class PerformanceLine extends HashMap {
- PerformanceLine(String ... data) {
- super((Map)null)
- }
-}
------
-public class PerformanceLine extends java.util.HashMap implements groovy.lang.GroovyObject {
-public PerformanceLine(java.lang.String... data) {
-super((java.util.Map)null);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy170.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy170.test
deleted file mode 100644
index 5bf67bc06d7d..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy170.test
+++ /dev/null
@@ -1,36 +0,0 @@
-interface IBar170 extends groovy.lang.GroovyObject {}
-interface Foo170 extends IBar170 {
-
-}
-class Test1 implements Foo170 {
-}
------
-public interface IBar170 extends groovy.lang.GroovyObject {
-}
----
-public interface Foo170 extends IBar170 {
-}
----
-public class Test1 extends groovy.lang.GroovyObjectSupport implements Foo170, groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy903.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy903.test
deleted file mode 100644
index b1596c596504..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy903.test
+++ /dev/null
@@ -1,38 +0,0 @@
-class Grvy903 {
-
- public Grvy903(String s) {}
-
- public Grvy903() {
- this('some value')
- }
-}
------
-public class Grvy903 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Grvy903(java.lang.String s) {
-
-}
-public Grvy903() {
-this((java.lang.String)null);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/grvy908.test b/plugins/groovy/testdata/groovy/stubGenerator/grvy908.test
deleted file mode 100644
index 82a07537b0bc..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/grvy908.test
+++ /dev/null
@@ -1,39 +0,0 @@
-class Grvy908 {
- Grvy908(int i) {
- this('something')
- }
-
- Grvy908(Object o) {
-
- }
-}
------
-public class Grvy908 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Grvy908(int i) {
-this((java.lang.Object)null);
-}
-public Grvy908(java.lang.Object o) {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/immutableAnno.test b/plugins/groovy/testdata/groovy/stubGenerator/immutableAnno.test
deleted file mode 100644
index 816a232a1900..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/immutableAnno.test
+++ /dev/null
@@ -1,72 +0,0 @@
-class FailingA {
- protected void act() {
- throw new UnsupportedOperationException()
- }
- }
-
-@Immutable final class FailingB extends FailingA {
- public void act() {
-
- }
-}
------
-public class FailingA extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-protected void act() {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public final class FailingB extends FailingA implements groovy.lang.GroovyObject {
-public void act() {
-return ;
-}
-
-public FailingB() {
-
-}
-public FailingB(java.util.HashMap args) {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/implements1.test b/plugins/groovy/testdata/groovy/stubGenerator/implements1.test
deleted file mode 100644
index 7892e97d93c6..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/implements1.test
+++ /dev/null
@@ -1,31 +0,0 @@
-class Implements1 implements Comparable {
- def int compare(Implements1 anotherA) {}
-}
------
-public class Implements1 extends groovy.lang.GroovyObjectSupport implements java.lang.Comparable, groovy.lang.GroovyObject {
-public int compare(Implements1 anotherA) {
-return 0;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/inaccessibleConstructor.test b/plugins/groovy/testdata/groovy/stubGenerator/inaccessibleConstructor.test
deleted file mode 100644
index 59780fd363dc..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/inaccessibleConstructor.test
+++ /dev/null
@@ -1,70 +0,0 @@
-class InaccessibleConstructor {
- private InaccessibleConstructor(Void v, InaccessibleConstructor p) {}
- protected InaccessibleConstructor(InaccessibleConstructor p) {}
- protected InaccessibleConstructor() {}
-}
-
-class ExtensionLoader extends InaccessibleConstructor {
- ExtensionLoader(parent) {
- super(parent);
- }
-}
------
-public class InaccessibleConstructor extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public InaccessibleConstructor(java.lang.Void v, InaccessibleConstructor p) {
-
-}
-public InaccessibleConstructor(InaccessibleConstructor p) {
-
-}
-public InaccessibleConstructor() {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class ExtensionLoader extends InaccessibleConstructor implements groovy.lang.GroovyObject {
-public ExtensionLoader(java.lang.Object parent) {
-super((InaccessibleConstructor)null);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/inaccessiblePropertyType.test b/plugins/groovy/testdata/groovy/stubGenerator/inaccessiblePropertyType.test
deleted file mode 100644
index 80c05088e007..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/inaccessiblePropertyType.test
+++ /dev/null
@@ -1,37 +0,0 @@
-class Foo {
- foo.Hidden prop
-}
-
------
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProp() {
-return null;
-}
-
-public void setProp(java.lang.Object prop) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.lang.Object prop = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/inheritConstructors.test b/plugins/groovy/testdata/groovy/stubGenerator/inheritConstructors.test
deleted file mode 100644
index 7680cb0b608a..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/inheritConstructors.test
+++ /dev/null
@@ -1,30 +0,0 @@
-@groovy.transform.InheritConstructors
-class BadBar extends Base {
-}
------
-public class BadBar extends Base implements groovy.lang.GroovyObject {
-public BadBar(java.lang.String s) {
-super((java.lang.String)null);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/kireyev.test b/plugins/groovy/testdata/groovy/stubGenerator/kireyev.test
deleted file mode 100644
index 92dc08fca058..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/kireyev.test
+++ /dev/null
@@ -1,44 +0,0 @@
-class BugSample implements Iterator {
-
-public boolean hasNext() { throw new UnsupportedOperationException("This method is not available"); }
-
-public void remove() { throw new UnsupportedOperationException("This method is not available"); }
-
-public T next() { throw new UnsupportedOperationException("This method is not available"); }
-}
------
-public class BugSample extends groovy.lang.GroovyObjectSupport implements java.util.Iterator, groovy.lang.GroovyObject {
-public boolean hasNext() {
-return false;
-}
-
-public void remove() {
-return ;
-}
-
-public T next() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/methodTypeParameters.test b/plugins/groovy/testdata/groovy/stubGenerator/methodTypeParameters.test
deleted file mode 100644
index 7fee3d4ff6d0..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/methodTypeParameters.test
+++ /dev/null
@@ -1,31 +0,0 @@
-class MethodtypeParameters {
- def f() {}
-}
------
-public class MethodtypeParameters extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object f() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/methodWithItsOwnTypeParams.test b/plugins/groovy/testdata/groovy/stubGenerator/methodWithItsOwnTypeParams.test
deleted file mode 100644
index 4621b10b54dc..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/methodWithItsOwnTypeParams.test
+++ /dev/null
@@ -1,41 +0,0 @@
-interface I {
- def void foo(List a);
-}
-
-class Foo implements I {
- @Delegate private I list
-}
------
-public interface I {
-public abstract void foo(java.util.List a) ;
-
-}
----
-public class Foo extends groovy.lang.GroovyObjectSupport implements I, groovy.lang.GroovyObject {
-public void foo(java.util.List a) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private I list = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/methodsWithTypeParamsAndOptionalParams.test b/plugins/groovy/testdata/groovy/stubGenerator/methodsWithTypeParamsAndOptionalParams.test
deleted file mode 100644
index 99f3d3a81f37..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/methodsWithTypeParamsAndOptionalParams.test
+++ /dev/null
@@ -1,21 +0,0 @@
-def T foo(String s = null){}
------
-public class methodsWithTypeParamsAndOptionalParams extends groovy.lang.Script {
-public static void main(java.lang.String[] args) {
-return ;
-}
-
-public java.lang.Object run() {
-return null;
-}
-
-public T foo(java.lang.String s) {
-return null;
-}
-
-public T foo() {
-return null;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/optionalParameter.test b/plugins/groovy/testdata/groovy/stubGenerator/optionalParameter.test
deleted file mode 100644
index 2c508868657a..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/optionalParameter.test
+++ /dev/null
@@ -1,43 +0,0 @@
-class OptionalParameter {
- def foo(h, i = 0, j = 0, k = 0) {}
-}
------
-public class OptionalParameter extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object foo(java.lang.Object h, java.lang.Object i, java.lang.Object j, java.lang.Object k) {
-return null;
-}
-
-public java.lang.Object foo(java.lang.Object h, java.lang.Object i, java.lang.Object j) {
-return null;
-}
-
-public java.lang.Object foo(java.lang.Object h, java.lang.Object i) {
-return null;
-}
-
-public java.lang.Object foo(java.lang.Object h) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/overrideFinalGetter.test b/plugins/groovy/testdata/groovy/stubGenerator/overrideFinalGetter.test
deleted file mode 100644
index 05c550222c1f..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/overrideFinalGetter.test
+++ /dev/null
@@ -1,63 +0,0 @@
-class OverrideFinalGetter {
- final int getP() {0}
-}
-
-class Derived extends OverrideFinalGetter {
- int p = 0 //should not create a getter here
-}
------
-public class OverrideFinalGetter extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public final int getP() {
-return 0;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class Derived extends OverrideFinalGetter implements groovy.lang.GroovyObject {
-public void setP(int p) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private int p = 0;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/package1.test b/plugins/groovy/testdata/groovy/stubGenerator/package1.test
deleted file mode 100644
index 6619c23e8d67..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/package1.test
+++ /dev/null
@@ -1,30 +0,0 @@
-package a.b
-
-class Package1 {
-}
------
-package a.b;
-
-public class Package1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/parameterReturnType.test b/plugins/groovy/testdata/groovy/stubGenerator/parameterReturnType.test
deleted file mode 100644
index 58f0936b8fc1..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/parameterReturnType.test
+++ /dev/null
@@ -1,47 +0,0 @@
-class Impl implements GwtActionService {
- CharSequence execute(List action) {
- // Get the class name of the action, because we need it to find
- // the corresponding action bean.
- def name = GrailsClassUtils.getShortName(action.getClass())
-
- // Prefix the name with "gwt" and add a "Handler" suffix to get
- // hold of the appropriate bean.
- def handlerBeanName = "gwt${name}Handler"
- if (applicationContext.containsBean(handlerBeanName)) {
- def actionBean = applicationContext.getBean(handlerBeanName)
- return actionBean.execute(action)
- }
- else {
- throw new RuntimeException("No action handler configured for ${name}")
- }
- }
-}
-
------
-public class Impl extends groovy.lang.GroovyObjectSupport implements GwtActionService, groovy.lang.GroovyObject {
-public java.lang.CharSequence execute(java.util.List action) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/rawReturnTypeInImplementation.test b/plugins/groovy/testdata/groovy/stubGenerator/rawReturnTypeInImplementation.test
deleted file mode 100644
index 53b639fc1ed9..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/rawReturnTypeInImplementation.test
+++ /dev/null
@@ -1,41 +0,0 @@
-public interface Callable {
- V call() throws Exception;
-}
-
-class Cl implements Callable {
- Object call() {}
-}
-
------
-public interface Callable {
-public abstract V call() throws java.lang.Exception ;
-
-}
----
-public class Cl extends groovy.lang.GroovyObjectSupport implements Callable, groovy.lang.GroovyObject {
-public java.lang.String call() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/script.test b/plugins/groovy/testdata/groovy/stubGenerator/script.test
deleted file mode 100644
index 15f82aa0f6c7..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/script.test
+++ /dev/null
@@ -1,13 +0,0 @@
-println "bugaga"
------
-public class script extends groovy.lang.Script {
-public static void main(java.lang.String[] args) {
-return ;
-}
-
-public java.lang.Object run() {
-return null;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/scriptWithMain.test b/plugins/groovy/testdata/groovy/stubGenerator/scriptWithMain.test
deleted file mode 100644
index 1f86c854567a..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/scriptWithMain.test
+++ /dev/null
@@ -1,21 +0,0 @@
-public static void main(String[] args) {
- def r = new Runnable() {
- void run() {
- println("asdasd")
- }
- }
-
- r.run()
-}
------
-public class scriptWithMain extends groovy.lang.Script {
-public java.lang.Object run() {
-return null;
-}
-
-public static void main(java.lang.String[] args) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/setUpper1.test b/plugins/groovy/testdata/groovy/stubGenerator/setUpper1.test
deleted file mode 100644
index 270cfeb51dce..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/setUpper1.test
+++ /dev/null
@@ -1,27 +0,0 @@
-class SetUpper {
- setUp () {}
-}
------
-public class SetUpper extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/setterAlreadyDefined1.test b/plugins/groovy/testdata/groovy/stubGenerator/setterAlreadyDefined1.test
deleted file mode 100644
index bacaf8b049ff..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/setterAlreadyDefined1.test
+++ /dev/null
@@ -1,37 +0,0 @@
-class SetterAlreadyDefined {
- def DDD
- void setDDD (def ddd) {}
-}
------
-public class SetterAlreadyDefined extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public void setDDD(java.lang.Object ddd) {
-return ;
-}
-
-public java.lang.Object getDDD() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.lang.Object DDD = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/singletonConstructor.test b/plugins/groovy/testdata/groovy/stubGenerator/singletonConstructor.test
deleted file mode 100644
index 636d98b2437e..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/singletonConstructor.test
+++ /dev/null
@@ -1,30 +0,0 @@
-class SingletonConstructor {
- private SingletonConstructor() {}
-}
------
-public class SingletonConstructor extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public SingletonConstructor() {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/stringMethodName.test b/plugins/groovy/testdata/groovy/stubGenerator/stringMethodName.test
deleted file mode 100644
index d41eadcda471..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/stringMethodName.test
+++ /dev/null
@@ -1,72 +0,0 @@
-class StringMethodName {
- def foo0() {'foo0'} // control
- def 'foo1'() {'foo1'}
-
- public Integer 'foo2'() {2}
- public int 'foo3'() {3}
- Integer 'foo4'(x) { x * 4}
- public def 'getFoo5'() {'foo5'}
- private boolean 'fooFalse'() {false}
- public def 'fooDef'() {}
-
- public def 'foo Def'() {} //does not have a java image
-
- def "a b" = 0 //does not have a java image
-}
------
-public class StringMethodName extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object foo0() {
-return null;
-}
-
-public java.lang.Object foo1() {
-return null;
-}
-
-public java.lang.Integer foo2() {
-return null;
-}
-
-public int foo3() {
-return 0;
-}
-
-public java.lang.Integer foo4(java.lang.Object x) {
-return null;
-}
-
-public java.lang.Object getFoo5() {
-return null;
-}
-
-private boolean fooFalse() {
-return false;
-}
-
-public java.lang.Object fooDef() {
-return null;
-}
-
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/subclassProperty.test b/plugins/groovy/testdata/groovy/stubGenerator/subclassProperty.test
deleted file mode 100644
index 9546041987a0..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/subclassProperty.test
+++ /dev/null
@@ -1,63 +0,0 @@
-class SuperSubclass {
- String getFoo() {}
-}
-class SubSuperSubClass extends SuperSubclass {
- def foo
-}
-
------
-public class SuperSubclass extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.String getFoo() {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class SubSuperSubClass extends SuperSubclass implements groovy.lang.GroovyObject {
-public void setFoo(java.lang.Object foo) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.lang.Object foo = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/superInvocation.test b/plugins/groovy/testdata/groovy/stubGenerator/superInvocation.test
deleted file mode 100644
index e2fc18b4cb7d..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/superInvocation.test
+++ /dev/null
@@ -1,62 +0,0 @@
-class Base {
- Base(String s, int i) {}
-}
-
-class Derived extends Base {
- Derived() {
- super("", 0)
- }
-}
------
-public class Base extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Base(java.lang.String s, int i) {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class Derived extends Base implements groovy.lang.GroovyObject {
-public Derived() {
-super((java.lang.String)null, (int)0);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/superInvocation1.test b/plugins/groovy/testdata/groovy/stubGenerator/superInvocation1.test
deleted file mode 100644
index 86a72faa9244..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/superInvocation1.test
+++ /dev/null
@@ -1,62 +0,0 @@
-class BaseSuperInvocation1 {
- BaseSuperInvocation1(String s, int i) throws Exception {}
-}
-
-class DerivedSuperInvocation1 extends BaseSuperInvocation1 {
- DerivedSuperInvocation1() {
- super("", 0)
- }
-}
------
-public class BaseSuperInvocation1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public BaseSuperInvocation1(java.lang.String s, int i) {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class DerivedSuperInvocation1 extends BaseSuperInvocation1 implements groovy.lang.GroovyObject {
-public DerivedSuperInvocation1() throws java.lang.Exception {
-super((java.lang.String)null, (int)0);
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/synchronizedProperty.test b/plugins/groovy/testdata/groovy/stubGenerator/synchronizedProperty.test
deleted file mode 100644
index 9e1a41512333..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/synchronizedProperty.test
+++ /dev/null
@@ -1,36 +0,0 @@
-class SynchronizedProperty {
- synchronized def bar
-}
------
-public class SynchronizedProperty extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getBar() {
-return null;
-}
-
-public void setBar(java.lang.Object bar) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private java.lang.Object bar = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/throwsCheckedException.test b/plugins/groovy/testdata/groovy/stubGenerator/throwsCheckedException.test
deleted file mode 100644
index 224920925832..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/throwsCheckedException.test
+++ /dev/null
@@ -1,31 +0,0 @@
-class ThrowsCheckedException {
- def foo() throws IOException {}
-}
------
-public class ThrowsCheckedException extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object foo() throws java.io.IOException {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/toGenerate.test b/plugins/groovy/testdata/groovy/stubGenerator/toGenerate.test
deleted file mode 100644
index 59b98a75e6c3..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/toGenerate.test
+++ /dev/null
@@ -1,26 +0,0 @@
-class ToGenerate {
-}
------
-public class ToGenerate extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/toGenerate1.test b/plugins/groovy/testdata/groovy/stubGenerator/toGenerate1.test
deleted file mode 100644
index 70e00f2c7727..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/toGenerate1.test
+++ /dev/null
@@ -1,39 +0,0 @@
-class sToGenerate1 {
-}
-
-println "foo"
------
-public class toGenerate1 extends groovy.lang.Script {
-public static void main(java.lang.String[] args) {
-return ;
-}
-
-public java.lang.Object run() {
-return null;
-}
-
-}
----
-public class sToGenerate1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/tupleConstructorAnno.test b/plugins/groovy/testdata/groovy/stubGenerator/tupleConstructorAnno.test
deleted file mode 100644
index d7babc66c8a6..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/tupleConstructorAnno.test
+++ /dev/null
@@ -1,55 +0,0 @@
-@groovy.transform.TupleConstructor class Foo { int a; String b}
------
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public int getA() {
-return 0;
-}
-
-public void setA(int a) {
-return ;
-}
-
-public java.lang.String getB() {
-return null;
-}
-
-public void setB(java.lang.String b) {
-return ;
-}
-
-public Foo(int a, java.lang.String b) {
-
-}
-public Foo(int a) {
-
-}
-public Foo() {
-
-}
-public Foo(java.util.HashMap args) {
-
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-private int a = 0;
-private java.lang.String b = null;
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/vararg1.test b/plugins/groovy/testdata/groovy/stubGenerator/vararg1.test
deleted file mode 100644
index 8e701182700e..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/vararg1.test
+++ /dev/null
@@ -1,40 +0,0 @@
-class Vararg1 {
- def void foo(String... foo) {}
- def void foo(String... foo, bar="bar") {}
-}
------
-public class Vararg1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public void foo(java.lang.String... foo) {
-return ;
-}
-
-public void foo(java.lang.String[] foo, java.lang.Object bar) {
-return ;
-}
-
-public void foo(java.lang.String... foo) {
-return ;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/stubGenerator/varargs.test b/plugins/groovy/testdata/groovy/stubGenerator/varargs.test
deleted file mode 100644
index 213fff005803..000000000000
--- a/plugins/groovy/testdata/groovy/stubGenerator/varargs.test
+++ /dev/null
@@ -1,67 +0,0 @@
-class Vararags {
- def Vararags(String... s) {}
- def foo(String... s) {}
-}
-
-class DerivedVarargs {
- def DerivedVarargs(String... s) {
- super(s)
- }
-}
------
-public class Vararags extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Vararags(java.lang.String... s) {
-
-}
-public java.lang.Object foo(java.lang.String... s) {
-return null;
-}
-
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
-public class DerivedVarargs extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public DerivedVarargs(java.lang.String... s) {
-super();
-}
-public java.lang.Object getProperty(java.lang.String property) {
-return null;
-}
-
-public void setProperty(java.lang.String property, java.lang.Object newValue) {
-return ;
-}
-
-public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object args) {
-return null;
-}
-
-public groovy.lang.MetaClass getMetaClass() {
-return null;
-}
-
-public void setMetaClass(groovy.lang.MetaClass metaClass) {
-return ;
-}
-
-}
----
\ No newline at end of file