test++

java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack1/User.java

@@ -0,0 +1,9 @@
+package pack1;
+
+import pack2.Class1;
+import pack2.Class2;
+
+public class User {
+  Class1 class1;
+  Class2 class2;
+}

java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack2/Class1.java

@@ -0,0 +1,11 @@
+package pack2;
+
+public class Class1 {
+}
+
+/**
+ * Javadoc.
+ */
+class Class2 {
+
+}

java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack1/Class1.java

@@ -0,0 +1,11 @@
+package pack1;
+
+public class Class1 {
+}
+
+/**
+ * Javadoc.
+ */
+class Class2 {
+
+}

java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack1/User.java

@@ -0,0 +1,6 @@
+package pack1;
+
+public class User {
+  Class1 class1;
+  Class2 class2;
+}

java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack1/Class2.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class2 {
+}

java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack2/Class1.java

@@ -0,0 +1,7 @@
+package pack2;
+
+import pack1.Class2;
+
+public class Class1 {
+  Class2 a;
+}

java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/Class1.java

@@ -0,0 +1,5 @@
+package pack1;
+
+public class Class1 {
+  Class2 a;
+}

java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/Class2.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class2 {
+}

java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack1/Class2.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class2 {
+}

java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack2/Class1.java

@@ -0,0 +1,9 @@
+package pack2;
+
+import pack1.Class2;
+
+public class Class1 {
+  void foo(){
+    Class2.xxx();
+  }
+}

java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/Class1.java

@@ -0,0 +1,7 @@
+package pack1;
+
+public class Class1 {
+  void foo(){
+    Class2.xxx();
+  }
+}

java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/Class2.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class2 {
+}

java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack1/X.java

@@ -0,0 +1,3 @@
+package pack1;
+
+class Y {}

java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack2/X.java

@@ -0,0 +1,5 @@
+package pack2;
+
+public class X {
+    public void foo(X x) {}
+}

java/java-tests/testData/refactoring/moveClass/ideadev27996/before/pack1/X.java

@@ -0,0 +1,6 @@
+package pack1;
+
+public class X {
+    public void foo(X x) {}
+}
+class Y {}

java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/TestTEI.java

@@ -0,0 +1,13 @@
+
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.VariableInfo;
+import javax.servlet.jsp.tagext.TagData;
+
+/**
+ * @author mike
+ */
+public class TestTEI extends TagExtraInfo {
+  public VariableInfo[] getVariableInfo(TagData tagData) {
+    return new VariableInfo[] { new VariableInfo("testVar", tagData.getAttributeString("class"), true, VariableInfo.AT_BEGIN) };
+  }
+}

java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/test.tld

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<!-- a tab library descriptor -->
+
+<taglib>
+	<tag>	
+		<name>test</name>
+		<tagclass>TestTag</tagclass>
+		<teiclass>TestTEI</teiclass>
+		<bodycontent>jsp</bodycontent>
+	</tag>
+</taglib>

java/java-tests/testData/refactoring/moveClass/jsp/after/pack2/TestClass.java

@@ -0,0 +1,4 @@
+package pack2;
+
+public class TestClass {
+}

java/java-tests/testData/refactoring/moveClass/jsp/after/test.jsp

@@ -0,0 +1,7 @@
+<%@ taglib uri="/WEB-INF/test.tld" prefix="test" %>
+
+<test:test class="pack2.TestClass"/>
+
+<%
+    System.out.println(testVar);
+%>

java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/TestTEI.java

@@ -0,0 +1,13 @@
+
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.VariableInfo;
+import javax.servlet.jsp.tagext.TagData;
+
+/**
+ * @author mike
+ */
+public class TestTEI extends TagExtraInfo {
+  public VariableInfo[] getVariableInfo(TagData tagData) {
+    return new VariableInfo[] { new VariableInfo("testVar", tagData.getAttributeString("class"), true, VariableInfo.AT_BEGIN) };
+  }
+}

java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/test.tld

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<!-- a tab library descriptor -->
+
+<taglib>
+	<tag>	
+		<name>test</name>
+		<tagclass>TestTag</tagclass>
+		<teiclass>TestTEI</teiclass>
+		<bodycontent>jsp</bodycontent>
+	</tag>
+</taglib>

java/java-tests/testData/refactoring/moveClass/jsp/before/pack1/TestClass.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class TestClass {
+}

java/java-tests/testData/refactoring/moveClass/jsp/before/test.jsp

@@ -0,0 +1,7 @@
+<%@ taglib uri="/WEB-INF/test.tld" prefix="test" %>
+
+<test:test class="pack1.TestClass"/>
+
+<%
+    System.out.println(testVar);
+%>

java/java-tests/testData/refactoring/moveClass/localClass/after/pack2/A.java

@@ -0,0 +1,9 @@
+package pack2;
+
+public class A {
+    public void method () {
+        class X {
+        }
+        X x = new X();
+    }
+}

java/java-tests/testData/refactoring/moveClass/localClass/before/pack1/A.java

@@ -0,0 +1,9 @@
+package pack1;
+
+public class A {
+    public void method () {
+        class X {
+        }
+        X x = new X();
+    }
+}

java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class1.java

@@ -0,0 +1,6 @@
+package pack2;
+
+public class Class1 {
+  Class2 a;
+  Class2 b;
+}

java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class2.java

@@ -0,0 +1,4 @@
+package pack2;
+
+public class Class2 {
+}

java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class1.java

@@ -0,0 +1,6 @@
+package pack1;
+
+public class Class1 {
+  Class2 a;
+  Class2 b;
+}

java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class2.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class2 {
+}

java/java-tests/testData/refactoring/moveClass/nonJava/after/pack2/Class1.java

@@ -0,0 +1,4 @@
+package pack2;
+
+public class Class1 {
+}

java/java-tests/testData/refactoring/moveClass/nonJava/after/qqq.txt

@@ -0,0 +1,3 @@
+pack2.Class1
+Class1
+pack1.Class1a

java/java-tests/testData/refactoring/moveClass/nonJava/before/pack1/Class1.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class1 {
+}

java/java-tests/testData/refactoring/moveClass/nonJava/before/qqq.txt

@@ -0,0 +1,3 @@
+pack1.Class1
+Class1
+pack1.Class1a

java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/Class1.java

@@ -0,0 +1,5 @@
+package pack1;
+
+public class Class1 {
+}
+

java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/Class2.java

@@ -0,0 +1,5 @@
+package pack1;
+
+class Class2 {
+
+}

java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/User.java

@@ -0,0 +1,6 @@
+package pack1;
+
+public class User {
+  Class1 class1;
+  Class2 class2;
+}

java/java-tests/testData/refactoring/moveClass/secondaryClass/before/pack1/Class1.java

@@ -0,0 +1,8 @@
+package pack1;
+
+public class Class1 {
+}
+
+class Class2 {
+
+}

java/java-tests/testData/refactoring/moveClass/secondaryClass/before/pack1/User.java

@@ -0,0 +1,6 @@
+package pack1;
+
+public class User {
+  Class1 class1;
+  Class2 class2;
+}

java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/Client.java

@@ -0,0 +1,6 @@
+public class Client {
+  String s = "pack2.Class1";
+  // pack2.Class1
+  // apack1.Class1
+  // Class1
+}

java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack2/Class1.java

@@ -0,0 +1,4 @@
+package pack2;
+
+public class Class1 {
+}

java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/Client.java

@@ -0,0 +1,6 @@
+public class Client {
+  String s = "pack1.Class1";
+  // pack1.Class1
+  // apack1.Class1
+  // Class1
+}

java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack1/Class1.java

@@ -0,0 +1,4 @@
+package pack1;
+
+public class Class1 {
+}

java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack2/AClass.java

@@ -0,0 +1,5 @@
+package pack2;
+
+public class AClass {
+  String s = "pack2.AClass";
+}

java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack1/AClass.java

@@ -0,0 +1,5 @@
+package pack1;
+
+public class AClass {
+  String s = "pack1.AClass";
+}