moving tests

java/java-tests/testData/refactoring/convertToInstanceMethod/Interface.java

@@ -0,0 +1,22 @@
+interface I {
+}
+
+interface J extends I {
+}
+
+class IImpl implements I {
+}
+
+class JImpl implements J {
+}
+
+class X {
+    static void <caret>method(int i, I intf) {
+        System.out.println("i = " + i + ", intf = " + intf);
+    }
+
+    {
+        J j = new JImpl();
+        method(0, j);
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Interface.java.after

@@ -0,0 +1,26 @@
+interface I {
+    void method(int i);
+}
+
+interface J extends I {
+}
+
+class IImpl implements I {
+    public void method(int i) {
+        System.out.println("i = " + i + ", intf = " + this);
+    }
+}
+
+class JImpl implements J {
+    public void method(int i) {
+        System.out.println("i = " + i + ", intf = " + this);
+    }
+}
+
+class X {
+
+    {
+        J j = new JImpl();
+        j.method(0);
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Interface2.java

@@ -0,0 +1,16 @@
+interface I {
+}
+
+class C implements I {
+}
+
+interface J extends I {
+}
+
+class D extends C implements J {
+}
+
+class X {
+    static void <caret>m(I i) {
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Interface2.java.after

@@ -0,0 +1,17 @@
+interface I {
+    void m();
+}
+
+class C implements I {
+    public void m() {
+    }
+}
+
+interface J extends I {
+}
+
+class D extends C implements J {
+}
+
+class X {
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Interface3.java

@@ -0,0 +1,37 @@
+interface PsiAntElement {
+}
+
+interface AntElement extends PsiAntElement {
+}
+
+class AntElementImpl implements AntElement {
+}
+
+interface AntNameIdentifier extends AntElement {
+}
+
+class AntNameIdentifierImpl extends AntElementImpl implements AntNameIdentifier {
+}
+
+interface AntStructuredElement extends AntElement {
+}
+
+class AntStructuredElementImpl extends AntElementImpl implements AntStructuredElement {
+}
+
+interface AntTask extends AntStructuredElement {
+}
+
+class AntTaskImpl extends AntStructuredElementImpl implements AntTask {
+}
+
+interface AntMacroDef extends AntTask {
+}
+
+class AntMacroDefImpl extends AntTaskImpl implements AntMacroDef {
+}
+
+class X {
+    static void <caret>m(PsiAntElement i) {
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Interface3.java.after

@@ -0,0 +1,38 @@
+interface PsiAntElement {
+    void m();
+}
+
+interface AntElement extends PsiAntElement {
+}
+
+class AntElementImpl implements AntElement {
+    public void m() {
+    }
+}
+
+interface AntNameIdentifier extends AntElement {
+}
+
+class AntNameIdentifierImpl extends AntElementImpl implements AntNameIdentifier {
+}
+
+interface AntStructuredElement extends AntElement {
+}
+
+class AntStructuredElementImpl extends AntElementImpl implements AntStructuredElement {
+}
+
+interface AntTask extends AntStructuredElement {
+}
+
+class AntTaskImpl extends AntStructuredElementImpl implements AntTask {
+}
+
+interface AntMacroDef extends AntTask {
+}
+
+class AntMacroDefImpl extends AntTaskImpl implements AntMacroDef {
+}
+
+class X {
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/InterfacePrivate.java

@@ -0,0 +1,22 @@
+interface I {
+}
+
+interface J extends I {
+}
+
+class IImpl implements I {
+}
+
+class JImpl implements J {
+}
+
+class X {
+    private static void <caret>method(int i, I intf) {
+        System.out.println("i = " + i + ", intf = " + intf);
+    }
+
+    {
+        J j = new JImpl();
+        method(0, j);
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/InterfacePrivate.java.after

@@ -0,0 +1,26 @@
+interface I {
+    void method(int i);
+}
+
+interface J extends I {
+}
+
+class IImpl implements I {
+    public void method(int i) {
+        System.out.println("i = " + i + ", intf = " + this);
+    }
+}
+
+class JImpl implements J {
+    public void method(int i) {
+        System.out.println("i = " + i + ", intf = " + this);
+    }
+}
+
+class X {
+
+    {
+        J j = new JImpl();
+        j.method(0);
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/InterfaceTypeParameter.java

@@ -0,0 +1,13 @@
+interface Intf<T> {
+    T get();
+}
+
+class Impl<V> implements Intf<V> {
+}
+
+class X {
+    static <U> X<U> <caret>method(Intf<U> p, U value) {
+        U v = p.get();
+        return new X<U>(v,value);
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/InterfaceTypeParameter.java.after

@@ -0,0 +1,15 @@
+interface Intf<T> {
+    T get();
+
+    X<T> method(T value);
+}
+
+class Impl<V> implements Intf<V> {
+    public X<V> method(V value) {
+        V v = get();
+        return new X<V>(v,value);
+    }
+}
+
+class X {
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Simple.java

@@ -0,0 +1,16 @@
+public class Y {
+    public void foo() {
+    }
+}
+public class X {
+    static void <caret>method(Y y) {
+        System.out.println(y);
+        y.foo();
+    }
+
+    {
+      Y y = new Y();
+      method(y);
+      method(new Y());
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/Simple.java.after

@@ -0,0 +1,17 @@
+public class Y {
+    public void foo() {
+    }
+
+    void method() {
+        System.out.println(this);
+        foo();
+    }
+}
+public class X {
+
+    {
+      Y y = new Y();
+      y.method();
+      new Y().method();
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/TypeParameter.java

@@ -0,0 +1,7 @@
+class C<T> {
+    T get() { return null; }
+    static <V> void <caret>method(C<V> c, V value, X<V> x) {
+        V v = c.get();
+        System.out.println(v + " " + value);
+    }
+}

java/java-tests/testData/refactoring/convertToInstanceMethod/TypeParameter.java.after

@@ -0,0 +1,8 @@
+class C<T> {
+    T get() { return null; }
+
+    void method(T value, X<T> x) {
+        T v = get();
+        System.out.println(v + " " + value);
+    }
+}