test++

java/java-tests/testData/refactoring/inlineSuperClass/abstractOverrides/after/Test.java

@@ -0,0 +1,7 @@
+class Test {
+  public void context() {
+    method();
+  }
+
+  public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/abstractOverrides/before/Super.java

@@ -0,0 +1,3 @@
+abstract class Super {
+   public abstract void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/abstractOverrides/before/Test.java

@@ -0,0 +1,8 @@
+class Test extends Super{
+  public void context() {
+    super.method();
+  }
+
+  @Override
+  public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictConstructors/after/Test.java

@@ -0,0 +1,8 @@
+class Test {
+    void foo() {
+      Test s = new Test();
+      s.bar();
+    }
+
+    void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictConstructors/before/Super.java

@@ -0,0 +1,8 @@
+class Super {
+  void foo() {
+    Super s = new Super();
+    s.bar();
+  }
+
+  void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictConstructors/before/Test.java

@@ -0,0 +1,3 @@
+class Test extends Super{
+  Test(String s){}
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictGenerics/after/Usage.java

@@ -0,0 +1,7 @@
+import p.Test;
+
+class Usage {
+  void bar(Test s) {
+    s.foo(null);
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictGenerics/after/p/Test.java

@@ -0,0 +1,7 @@
+package p;
+
+public class Test {
+    public void foo(String t) {
+      System.out.println("Hello");
+    }
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictGenerics/before/Usage.java

@@ -0,0 +1,6 @@
+import p1.*;
+class Usage {
+  void bar(Super<Integer> s) {
+    s.foo(null);
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictGenerics/before/p/Test.java

@@ -0,0 +1,3 @@
+package p;
+import p1.*;
+public class Test extends Super<String> {} 

java/java-tests/testData/refactoring/inlineSuperClass/conflictGenerics/before/p1/Super.java

@@ -0,0 +1,6 @@
+package p1;
+public class Super<T>{
+   public void foo(T t) {
+     System.out.println("Hello");
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictMultipleConstructors/after/Test.java

@@ -0,0 +1,10 @@
+class Test {
+  Test(String s, String s1){super(s);}
+
+    void foo() {
+      Test s = new Test("");
+      s.bar();
+    }
+
+    void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictMultipleConstructors/before/Super.java

@@ -0,0 +1,10 @@
+class Super {
+  Super(String s){}
+
+  void foo() {
+    Super s = new Super("");
+    s.bar();
+  }
+
+  void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/conflictMultipleConstructors/before/Test.java

@@ -0,0 +1,3 @@
+class Test extends Super{
+  Test(String s, String s1){super(s);}
+}

java/java-tests/testData/refactoring/inlineSuperClass/generics/after/Usage.java

@@ -0,0 +1,19 @@
+import p.Test;
+
+class Usage {
+  Test<String> myField;
+
+  Test<String> xxx(){
+    return myField;
+  }
+
+  Test<Integer> xxxxx() {
+    return null;
+  }
+
+  void bar(Test<String> s) {
+    s.foo(null);
+  }
+
+
+}

java/java-tests/testData/refactoring/inlineSuperClass/generics/after/p/Test.java

@@ -0,0 +1,7 @@
+package p;
+
+public class Test<R> {
+    public void foo(R t) {
+      System.out.println("Hello");
+    }
+}

java/java-tests/testData/refactoring/inlineSuperClass/generics/before/Usage.java

@@ -0,0 +1,18 @@
+import p1.*;
+class Usage {
+  Super<String> myField;
+
+  Super<String> xxx(){
+    return myField;
+  }
+
+  Super<Integer> xxxxx() {
+    return null;
+  }
+
+  void bar(Super<String> s) {
+    s.foo(null);
+  }
+
+
+}

java/java-tests/testData/refactoring/inlineSuperClass/generics/before/p/Test.java

@@ -0,0 +1,3 @@
+package p;
+import p1.*;
+public class Test<R> extends Super<R> {} 

java/java-tests/testData/refactoring/inlineSuperClass/generics/before/p1/Super.java

@@ -0,0 +1,6 @@
+package p1;
+public class Super<T>{
+   public void foo(T t) {
+     System.out.println("Hello");
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/implicitChildConstructor/after/Test.java

@@ -0,0 +1,5 @@
+class Test {
+  void foo() {
+    Test s = new Test();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/implicitChildConstructor/before/Super.java

@@ -0,0 +1,3 @@
+class Super {
+  Super(){}
+}

java/java-tests/testData/refactoring/inlineSuperClass/implicitChildConstructor/before/Test.java

@@ -0,0 +1,5 @@
+class Test extends Super{
+  void foo() {
+    Super s = new Super();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/imports/after/p/Test.java

@@ -0,0 +1,7 @@
+package p;
+
+public class Test {
+    public void foo() {
+      System.out.println("Hello");
+    }
+}

java/java-tests/testData/refactoring/inlineSuperClass/imports/after/p1/Usage.java

@@ -0,0 +1,9 @@
+package p1;
+
+import p.Test;
+
+class Usage {
+  void bar(Test s) {
+    s.foo();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/imports/before/p/Test.java

@@ -0,0 +1,3 @@
+package p;
+import p1.*;
+public class Test extends Super {} 

java/java-tests/testData/refactoring/inlineSuperClass/imports/before/p1/Super.java

@@ -0,0 +1,6 @@
+package p1;
+public class Super {
+   public void foo() {
+     System.out.println("Hello");
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/imports/before/p1/Usage.java

@@ -0,0 +1,6 @@
+package p1;
+class Usage {
+  void bar(Super s) {
+    s.foo();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/innerclassReference/after/Test.java

@@ -0,0 +1,15 @@
+class Test {
+   public void contextChild() {
+      Test.StInner inner1 = new Test.StInner();
+      Test.InstInner inner2 = this.new InstInner();
+   }
+
+    void foo() {
+       Test.StInner inner1 = new Test.StInner();
+       Test.InstInner inner2 = this.new InstInner();
+    }
+
+    public static class StInner {}
+
+    public class InstInner {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/innerclassReference/before/Super.java

@@ -0,0 +1,9 @@
+class Super {
+      public static class StInner {}
+      public class InstInner {}
+
+      void foo() {
+         Super.StInner inner1 = new Super.StInner();
+         Super.InstInner inner2 = this.new InstInner();
+      }
+}

java/java-tests/testData/refactoring/inlineSuperClass/innerclassReference/before/Test.java

@@ -0,0 +1,6 @@
+class Test extends Super{
+   public void contextChild() {
+      Super.StInner inner1 = new Super.StInner();
+      Super.InstInner inner2 = this.new InstInner();
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleConstructors/after/Test.java

@@ -0,0 +1,10 @@
+class Test {
+  Test(String s){super(s);}
+
+    void foo() {
+      Test s = new Test("");
+      s.bar();
+    }
+
+    void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleConstructors/before/Super.java

@@ -0,0 +1,10 @@
+class Super {
+  Super(String s){}
+
+  void foo() {
+    Super s = new Super("");
+    s.bar();
+  }
+
+  void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleConstructors/before/Test.java

@@ -0,0 +1,3 @@
+class Test extends Super{
+  Test(String s){super(s);}
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclasses/after/Test.java

@@ -0,0 +1,7 @@
+class Test {
+  public void context() {
+    method();
+  }
+
+    public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclasses/after/Test1.java

@@ -0,0 +1,7 @@
+class Test1 {
+  public void context() {
+    method();
+  }
+
+    public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclasses/before/Super.java

@@ -0,0 +1,3 @@
+class Super {
+   public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclasses/before/Test.java

@@ -0,0 +1,5 @@
+class Test extends Super{
+  public void context() {
+    super.method();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclasses/before/Test1.java

@@ -0,0 +1,5 @@
+class Test1 extends Super{
+  public void context() {
+    super.method();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayComplexDimensionsExpr/after/Test.java

@@ -0,0 +1,8 @@
+class Test {
+    void foo() {
+      Test s = new Test();
+      s.bar();
+    }
+
+    static int bar(){return 1;}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayComplexDimensionsExpr/after/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Test[][] s = new Test[Test.bar()][];
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayComplexDimensionsExpr/before/Super.java

@@ -0,0 +1,8 @@
+class Super {
+  void foo() {
+    Super s = new Super();
+    s.bar();
+  }
+
+  static int bar(){return 1;}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayComplexDimensionsExpr/before/Test.java

@@ -0,0 +1,2 @@
+class Test extends Super{
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayComplexDimensionsExpr/before/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Super[][] s = new Super[Super.bar()][];
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayDimensionsExpr/after/Test.java

@@ -0,0 +1,8 @@
+class Test {
+    void foo() {
+      Test s = new Test();
+      s.bar();
+    }
+
+    void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayDimensionsExpr/after/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Test[][] s = new Test[2][3];
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayDimensionsExpr/before/Super.java

@@ -0,0 +1,8 @@
+class Super {
+  void foo() {
+    Super s = new Super();
+    s.bar();
+  }
+
+  void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayDimensionsExpr/before/Test.java

@@ -0,0 +1,2 @@
+class Test extends Super{
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayDimensionsExpr/before/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Super[][] s = new Super[2][3];
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayInitializerExpr/after/Test.java

@@ -0,0 +1,8 @@
+class Test {
+    void foo() {
+      Test s = new Test();
+      s.bar();
+    }
+
+    void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayInitializerExpr/after/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Test[][] s = new Test[][]{new Test[]{new Test()}};
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayInitializerExpr/before/Super.java

@@ -0,0 +1,8 @@
+class Super {
+  void foo() {
+    Super s = new Super();
+    s.bar();
+  }
+
+  void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayInitializerExpr/before/Test.java

@@ -0,0 +1,2 @@
+class Test extends Super{
+}

java/java-tests/testData/refactoring/inlineSuperClass/newArrayInitializerExpr/before/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Super[][] s = new Super[][]{new Super[]{new Test()}};
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newexpr/after/Test.java

@@ -0,0 +1,8 @@
+class Test {
+    void foo() {
+      Test s = new Test();
+      s.bar();
+    }
+
+    void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newexpr/after/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Test s = new Test();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/newexpr/before/Super.java

@@ -0,0 +1,8 @@
+class Super {
+  void foo() {
+    Super s = new Super();
+    s.bar();
+  }
+
+  void bar() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/newexpr/before/Test.java

@@ -0,0 +1,2 @@
+class Test extends Super{
+}

java/java-tests/testData/refactoring/inlineSuperClass/newexpr/before/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+  void ba() {
+    Super s = new Super();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simple/after/Usage.java

@@ -0,0 +1,7 @@
+import p.Test;
+
+class Usage {
+  void bar(Test s) {
+    s.foo();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simple/after/p/Test.java

@@ -0,0 +1,7 @@
+package p;
+
+public class Test {
+    public void foo() {
+      System.out.println("Hello");
+    }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simple/before/Usage.java

@@ -0,0 +1,6 @@
+import p1.*;
+class Usage {
+  void bar(Super s) {
+    s.foo();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simple/before/p/Test.java

@@ -0,0 +1,3 @@
+package p;
+import p1.*;
+public class Test extends Super {} 

java/java-tests/testData/refactoring/inlineSuperClass/simple/before/p1/Super.java

@@ -0,0 +1,6 @@
+package p1;
+public class Super {
+   public void foo() {
+     System.out.println("Hello");
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simpleGenerics/after/Usage.java

@@ -0,0 +1,7 @@
+import p.Test;
+
+class Usage {
+  void bar(Test s) {
+    s.foo(null);
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simpleGenerics/after/p/Test.java

@@ -0,0 +1,7 @@
+package p;
+
+public class Test {
+    public void foo(String t) {
+      System.out.println("Hello");
+    }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simpleGenerics/before/Usage.java

@@ -0,0 +1,6 @@
+import p1.*;
+class Usage {
+  void bar(Super<String> s) {
+    s.foo(null);
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/simpleGenerics/before/p/Test.java

@@ -0,0 +1,3 @@
+package p;
+import p1.*;
+public class Test extends Super<String> {} 

java/java-tests/testData/refactoring/inlineSuperClass/simpleGenerics/before/p1/Super.java

@@ -0,0 +1,6 @@
+package p1;
+public class Super<T>{
+   public void foo(T t) {
+     System.out.println("Hello");
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticImport/after/Usage.java

@@ -0,0 +1,8 @@
+import static p.Test.CONSTANT;
+import static p.Test.statMeth;
+class Usage {
+  public void context() {
+      String v = CONSTANT;
+      statMeth();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticImport/after/p/Test.java

@@ -0,0 +1,7 @@
+package p;
+
+public class Test {
+    public static final String CONSTANT = "";
+
+    public static void statMeth() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticImport/before/Usage.java

@@ -0,0 +1,8 @@
+import static p1.Super.CONSTANT;
+import static p1.Super.statMeth;
+class Usage {
+  public void context() {
+      String v = CONSTANT;
+      statMeth();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticImport/before/p/Test.java

@@ -0,0 +1,3 @@
+package p;
+import p1.*;
+public class Test extends Super {} 

java/java-tests/testData/refactoring/inlineSuperClass/staticImport/before/p1/Super.java

@@ -0,0 +1,5 @@
+package p1;
+public class Super {
+   public static final String CONSTANT = "";
+   public static void statMeth() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticMembers/after/Test.java

@@ -0,0 +1,12 @@
+class Test {
+    public static final String S = "";
+
+    void bar() {
+    System.out.println(Test.S);
+    Test.foo();
+  }
+
+    static void foo(){
+       System.out.println(S);
+    }
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticMembers/before/Super.java

@@ -0,0 +1,7 @@
+class Super {
+   public static final String S = "";
+
+   static void foo(){
+      System.out.println(S);
+   }
+}

java/java-tests/testData/refactoring/inlineSuperClass/staticMembers/before/Test.java

@@ -0,0 +1,6 @@
+class Test extends Super{
+  void bar() {
+    System.out.println(Super.S);
+    Super.foo();
+  }
+}

java/java-tests/testData/refactoring/inlineSuperClass/superReference/after/Test.java

@@ -0,0 +1,7 @@
+class Test {
+  public void context() {
+    method();
+  }
+
+    public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/superReference/before/Super.java

@@ -0,0 +1,3 @@
+class Super {
+   public void method() {}
+}

java/java-tests/testData/refactoring/inlineSuperClass/superReference/before/Test.java

@@ -0,0 +1,5 @@
+class Test extends Super{
+  public void context() {
+    super.method();
+  }
+}