From 8e221f2b93508656daa0cef5d09c7efc08d52761 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 10 Sep 2009 22:00:01 +0400 Subject: [PATCH] test++ --- .../classAndSecondary/after/pack1/User.java | 0 .../classAndSecondary/after/pack2/Class1.java | 0 .../classAndSecondary/after/pack2/empty.txt | 0 .../classAndSecondary/before/pack1/Class1.java | 0 .../classAndSecondary/before/pack1/User.java | 0 .../classAndSecondary/before/pack2/empty.txt | 0 .../contextChange1/after/pack1/Class2.java | 0 .../moveClass/contextChange1/after/pack1/empty.txt | 0 .../contextChange1/after/pack2/Class1.java | 0 .../moveClass/contextChange1/after/pack2/empty.txt | 0 .../contextChange1/before/pack1/Class1.java | 0 .../contextChange1/before/pack1/Class2.java | 0 .../moveClass/contextChange1/before/pack1/empty.txt | 0 .../moveClass/contextChange1/before/pack2/empty.txt | 0 .../contextChange2/after/pack1/Class2.java | 0 .../moveClass/contextChange2/after/pack1/empty.txt | 0 .../contextChange2/after/pack2/Class1.java | 0 .../moveClass/contextChange2/after/pack2/empty.txt | 0 .../contextChange2/before/pack1/Class1.java | 0 .../contextChange2/before/pack1/Class2.java | 0 .../moveClass/contextChange2/before/pack1/empty.txt | 0 .../moveClass/contextChange2/before/pack2/empty.txt | 0 .../moveClass/ideadev27996/after/pack1/X.java | 0 .../moveClass/ideadev27996/after/pack2/X.java | 0 .../moveClass/ideadev27996/after/pack2/empty.txt | 0 .../moveClass/ideadev27996/before/pack1/X.java | 0 .../moveClass/ideadev27996/before/pack2/empty.txt | 0 .../moveClass/jsp/after/WEB-INF/TestTEI.java | 0 .../jsp/after/WEB-INF/classes/TestTEI.class | Bin .../moveClass/jsp/after/WEB-INF/test.tld | 0 .../refactoring/moveClass/jsp/after/pack1/empty.txt | 0 .../moveClass/jsp/after/pack2/TestClass.java | 0 .../refactoring/moveClass/jsp/after/pack2/empty.txt | 0 .../refactoring/moveClass/jsp/after/test.jsp | 0 .../moveClass/jsp/before/WEB-INF/TestTEI.java | 0 .../jsp/before/WEB-INF/classes/TestTEI.class | Bin .../moveClass/jsp/before/WEB-INF/test.tld | 0 .../moveClass/jsp/before/pack1/TestClass.java | 0 .../moveClass/jsp/before/pack1/empty.txt | 0 .../moveClass/jsp/before/pack2/empty.txt | 0 .../refactoring/moveClass/jsp/before/test.jsp | 0 .../moveClass/localClass/after/pack1/empty.txt | 0 .../moveClass/localClass/after/pack2/A.java | 0 .../moveClass/localClass/after/pack2/empty.txt | 0 .../moveClass/localClass/before/pack1/A.java | 0 .../moveClass/localClass/before/pack1/empty.txt | 0 .../moveClass/localClass/before/pack2/empty.txt | 0 .../moveClass/moveMultiple1/after/pack1/empty.txt | 0 .../moveClass/moveMultiple1/after/pack2/Class1.java | 0 .../moveClass/moveMultiple1/after/pack2/Class2.java | 0 .../moveClass/moveMultiple1/after/pack2/empty.txt | 0 .../moveMultiple1/before/pack1/Class1.java | 0 .../moveMultiple1/before/pack1/Class2.java | 0 .../moveClass/moveMultiple1/before/pack1/empty.txt | 0 .../moveClass/moveMultiple1/before/pack2/empty.txt | 0 .../moveClass/nonJava/after/pack1/empty.txt | 0 .../moveClass/nonJava/after/pack2/Class1.java | 0 .../moveClass/nonJava/after/pack2/empty.txt | 0 .../refactoring/moveClass/nonJava/after/qqq.txt | 0 .../moveClass/nonJava/before/pack1/Class1.java | 0 .../moveClass/nonJava/before/pack1/empty.txt | 0 .../moveClass/nonJava/before/pack2/empty.txt | 0 .../refactoring/moveClass/nonJava/before/qqq.txt | 0 .../secondaryClass/after/pack1/Class1.java | 0 .../secondaryClass/after/pack1/Class2.java | 0 .../moveClass/secondaryClass/after/pack1/User.java | 0 .../secondaryClass/before/pack1/Class1.java | 0 .../moveClass/secondaryClass/before/pack1/User.java | 0 .../moveClass/stringsAndComments/after/Client.java | 0 .../stringsAndComments/after/pack1/empty.txt | 0 .../stringsAndComments/after/pack2/Class1.java | 0 .../stringsAndComments/after/pack2/empty.txt | 0 .../moveClass/stringsAndComments/before/Client.java | 0 .../stringsAndComments/before/pack1/Class1.java | 0 .../stringsAndComments/before/pack1/empty.txt | 0 .../stringsAndComments/before/pack2/empty.txt | 0 .../stringsAndComments2/after/pack1/empty.txt | 0 .../stringsAndComments2/after/pack2/AClass.java | 0 .../stringsAndComments2/after/pack2/empty.txt | 0 .../stringsAndComments2/before/pack1/AClass.java | 0 .../stringsAndComments2/before/pack1/empty.txt | 0 .../stringsAndComments2/before/pack2/empty.txt | 0 .../com/intellij/refactoring/MoveClassTest.java | 10 +++++----- 83 files changed, 5 insertions(+), 5 deletions(-) rename {testData => java/java-tests/testData}/refactoring/moveClass/classAndSecondary/after/pack1/User.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/classAndSecondary/after/pack2/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/classAndSecondary/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/classAndSecondary/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/classAndSecondary/before/pack1/User.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/classAndSecondary/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/after/pack1/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/after/pack2/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/before/pack1/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange1/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/after/pack1/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/after/pack2/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/before/pack1/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/contextChange2/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/ideadev27996/after/pack1/X.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/ideadev27996/after/pack2/X.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/ideadev27996/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/ideadev27996/before/pack1/X.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/ideadev27996/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/WEB-INF/TestTEI.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/WEB-INF/classes/TestTEI.class (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/WEB-INF/test.tld (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/pack2/TestClass.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/after/test.jsp (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/WEB-INF/TestTEI.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/WEB-INF/classes/TestTEI.class (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/WEB-INF/test.tld (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/pack1/TestClass.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/jsp/before/test.jsp (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/localClass/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/localClass/after/pack2/A.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/localClass/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/localClass/before/pack1/A.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/localClass/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/localClass/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/after/pack2/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/after/pack2/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/before/pack1/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/moveMultiple1/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/after/pack2/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/after/qqq.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/nonJava/before/qqq.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/secondaryClass/after/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/secondaryClass/after/pack1/Class2.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/secondaryClass/after/pack1/User.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/secondaryClass/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/secondaryClass/before/pack1/User.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/after/Client.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/after/pack2/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/before/Client.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/before/pack1/Class1.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments/before/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments2/after/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments2/after/pack2/AClass.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments2/after/pack2/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments2/before/pack1/AClass.java (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments2/before/pack1/empty.txt (100%) rename {testData => java/java-tests/testData}/refactoring/moveClass/stringsAndComments2/before/pack2/empty.txt (100%) rename {refactoring/tests => java/java-tests/testSrc}/com/intellij/refactoring/MoveClassTest.java (93%) diff --git a/testData/refactoring/moveClass/classAndSecondary/after/pack1/User.java b/java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack1/User.java similarity index 100% rename from testData/refactoring/moveClass/classAndSecondary/after/pack1/User.java rename to java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack1/User.java diff --git a/testData/refactoring/moveClass/classAndSecondary/after/pack2/Class1.java b/java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack2/Class1.java similarity index 100% rename from testData/refactoring/moveClass/classAndSecondary/after/pack2/Class1.java rename to java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack2/Class1.java diff --git a/testData/refactoring/moveClass/classAndSecondary/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/classAndSecondary/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/classAndSecondary/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/classAndSecondary/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/classAndSecondary/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/classAndSecondary/before/pack1/User.java b/java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack1/User.java similarity index 100% rename from testData/refactoring/moveClass/classAndSecondary/before/pack1/User.java rename to java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack1/User.java diff --git a/testData/refactoring/moveClass/classAndSecondary/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/classAndSecondary/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/classAndSecondary/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/contextChange1/after/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClass/contextChange1/after/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack1/Class2.java diff --git a/testData/refactoring/moveClass/contextChange1/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange1/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/contextChange1/after/pack2/Class1.java b/java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack2/Class1.java similarity index 100% rename from testData/refactoring/moveClass/contextChange1/after/pack2/Class1.java rename to java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack2/Class1.java diff --git a/testData/refactoring/moveClass/contextChange1/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange1/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange1/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/contextChange1/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/contextChange1/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/contextChange1/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClass/contextChange1/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/Class2.java diff --git a/testData/refactoring/moveClass/contextChange1/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange1/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/contextChange1/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange1/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange1/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/contextChange2/after/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClass/contextChange2/after/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack1/Class2.java diff --git a/testData/refactoring/moveClass/contextChange2/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange2/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/contextChange2/after/pack2/Class1.java b/java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack2/Class1.java similarity index 100% rename from testData/refactoring/moveClass/contextChange2/after/pack2/Class1.java rename to java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack2/Class1.java diff --git a/testData/refactoring/moveClass/contextChange2/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange2/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange2/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/contextChange2/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/contextChange2/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/contextChange2/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClass/contextChange2/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/Class2.java diff --git a/testData/refactoring/moveClass/contextChange2/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange2/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/contextChange2/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/contextChange2/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/contextChange2/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/ideadev27996/after/pack1/X.java b/java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack1/X.java similarity index 100% rename from testData/refactoring/moveClass/ideadev27996/after/pack1/X.java rename to java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack1/X.java diff --git a/testData/refactoring/moveClass/ideadev27996/after/pack2/X.java b/java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack2/X.java similarity index 100% rename from testData/refactoring/moveClass/ideadev27996/after/pack2/X.java rename to java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack2/X.java diff --git a/testData/refactoring/moveClass/ideadev27996/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/ideadev27996/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/ideadev27996/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/ideadev27996/before/pack1/X.java b/java/java-tests/testData/refactoring/moveClass/ideadev27996/before/pack1/X.java similarity index 100% rename from testData/refactoring/moveClass/ideadev27996/before/pack1/X.java rename to java/java-tests/testData/refactoring/moveClass/ideadev27996/before/pack1/X.java diff --git a/testData/refactoring/moveClass/ideadev27996/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/ideadev27996/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/ideadev27996/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/ideadev27996/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/jsp/after/WEB-INF/TestTEI.java b/java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/TestTEI.java similarity index 100% rename from testData/refactoring/moveClass/jsp/after/WEB-INF/TestTEI.java rename to java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/TestTEI.java diff --git a/testData/refactoring/moveClass/jsp/after/WEB-INF/classes/TestTEI.class b/java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/classes/TestTEI.class similarity index 100% rename from testData/refactoring/moveClass/jsp/after/WEB-INF/classes/TestTEI.class rename to java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/classes/TestTEI.class diff --git a/testData/refactoring/moveClass/jsp/after/WEB-INF/test.tld b/java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/test.tld similarity index 100% rename from testData/refactoring/moveClass/jsp/after/WEB-INF/test.tld rename to java/java-tests/testData/refactoring/moveClass/jsp/after/WEB-INF/test.tld diff --git a/testData/refactoring/moveClass/jsp/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/jsp/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/jsp/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/jsp/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/jsp/after/pack2/TestClass.java b/java/java-tests/testData/refactoring/moveClass/jsp/after/pack2/TestClass.java similarity index 100% rename from testData/refactoring/moveClass/jsp/after/pack2/TestClass.java rename to java/java-tests/testData/refactoring/moveClass/jsp/after/pack2/TestClass.java diff --git a/testData/refactoring/moveClass/jsp/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/jsp/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/jsp/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/jsp/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/jsp/after/test.jsp b/java/java-tests/testData/refactoring/moveClass/jsp/after/test.jsp similarity index 100% rename from testData/refactoring/moveClass/jsp/after/test.jsp rename to java/java-tests/testData/refactoring/moveClass/jsp/after/test.jsp diff --git a/testData/refactoring/moveClass/jsp/before/WEB-INF/TestTEI.java b/java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/TestTEI.java similarity index 100% rename from testData/refactoring/moveClass/jsp/before/WEB-INF/TestTEI.java rename to java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/TestTEI.java diff --git a/testData/refactoring/moveClass/jsp/before/WEB-INF/classes/TestTEI.class b/java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/classes/TestTEI.class similarity index 100% rename from testData/refactoring/moveClass/jsp/before/WEB-INF/classes/TestTEI.class rename to java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/classes/TestTEI.class diff --git a/testData/refactoring/moveClass/jsp/before/WEB-INF/test.tld b/java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/test.tld similarity index 100% rename from testData/refactoring/moveClass/jsp/before/WEB-INF/test.tld rename to java/java-tests/testData/refactoring/moveClass/jsp/before/WEB-INF/test.tld diff --git a/testData/refactoring/moveClass/jsp/before/pack1/TestClass.java b/java/java-tests/testData/refactoring/moveClass/jsp/before/pack1/TestClass.java similarity index 100% rename from testData/refactoring/moveClass/jsp/before/pack1/TestClass.java rename to java/java-tests/testData/refactoring/moveClass/jsp/before/pack1/TestClass.java diff --git a/testData/refactoring/moveClass/jsp/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/jsp/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/jsp/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/jsp/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/jsp/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/jsp/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/jsp/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/jsp/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/jsp/before/test.jsp b/java/java-tests/testData/refactoring/moveClass/jsp/before/test.jsp similarity index 100% rename from testData/refactoring/moveClass/jsp/before/test.jsp rename to java/java-tests/testData/refactoring/moveClass/jsp/before/test.jsp diff --git a/testData/refactoring/moveClass/localClass/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/localClass/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/localClass/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/localClass/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/localClass/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClass/localClass/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClass/localClass/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClass/localClass/after/pack2/A.java diff --git a/testData/refactoring/moveClass/localClass/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/localClass/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/localClass/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/localClass/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/localClass/before/pack1/A.java b/java/java-tests/testData/refactoring/moveClass/localClass/before/pack1/A.java similarity index 100% rename from testData/refactoring/moveClass/localClass/before/pack1/A.java rename to java/java-tests/testData/refactoring/moveClass/localClass/before/pack1/A.java diff --git a/testData/refactoring/moveClass/localClass/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/localClass/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/localClass/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/localClass/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/localClass/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/localClass/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/localClass/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/localClass/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/moveMultiple1/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class1.java b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class1.java similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/after/pack2/Class1.java rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class1.java diff --git a/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class2.java b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class2.java similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/after/pack2/Class2.java rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/Class2.java diff --git a/testData/refactoring/moveClass/moveMultiple1/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/Class2.java diff --git a/testData/refactoring/moveClass/moveMultiple1/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/moveMultiple1/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/moveMultiple1/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/moveMultiple1/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/nonJava/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/nonJava/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/nonJava/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/nonJava/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/nonJava/after/pack2/Class1.java b/java/java-tests/testData/refactoring/moveClass/nonJava/after/pack2/Class1.java similarity index 100% rename from testData/refactoring/moveClass/nonJava/after/pack2/Class1.java rename to java/java-tests/testData/refactoring/moveClass/nonJava/after/pack2/Class1.java diff --git a/testData/refactoring/moveClass/nonJava/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/nonJava/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/nonJava/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/nonJava/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/nonJava/after/qqq.txt b/java/java-tests/testData/refactoring/moveClass/nonJava/after/qqq.txt similarity index 100% rename from testData/refactoring/moveClass/nonJava/after/qqq.txt rename to java/java-tests/testData/refactoring/moveClass/nonJava/after/qqq.txt diff --git a/testData/refactoring/moveClass/nonJava/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/nonJava/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/nonJava/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/nonJava/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/nonJava/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/nonJava/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/nonJava/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/nonJava/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/nonJava/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/nonJava/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/nonJava/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/nonJava/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/nonJava/before/qqq.txt b/java/java-tests/testData/refactoring/moveClass/nonJava/before/qqq.txt similarity index 100% rename from testData/refactoring/moveClass/nonJava/before/qqq.txt rename to java/java-tests/testData/refactoring/moveClass/nonJava/before/qqq.txt diff --git a/testData/refactoring/moveClass/secondaryClass/after/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/secondaryClass/after/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/Class1.java diff --git a/testData/refactoring/moveClass/secondaryClass/after/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClass/secondaryClass/after/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/Class2.java diff --git a/testData/refactoring/moveClass/secondaryClass/after/pack1/User.java b/java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/User.java similarity index 100% rename from testData/refactoring/moveClass/secondaryClass/after/pack1/User.java rename to java/java-tests/testData/refactoring/moveClass/secondaryClass/after/pack1/User.java diff --git a/testData/refactoring/moveClass/secondaryClass/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/secondaryClass/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/secondaryClass/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/secondaryClass/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/secondaryClass/before/pack1/User.java b/java/java-tests/testData/refactoring/moveClass/secondaryClass/before/pack1/User.java similarity index 100% rename from testData/refactoring/moveClass/secondaryClass/before/pack1/User.java rename to java/java-tests/testData/refactoring/moveClass/secondaryClass/before/pack1/User.java diff --git a/testData/refactoring/moveClass/stringsAndComments/after/Client.java b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/Client.java similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/after/Client.java rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/Client.java diff --git a/testData/refactoring/moveClass/stringsAndComments/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments/after/pack2/Class1.java b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack2/Class1.java similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/after/pack2/Class1.java rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack2/Class1.java diff --git a/testData/refactoring/moveClass/stringsAndComments/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments/before/Client.java b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/Client.java similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/before/Client.java rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/Client.java diff --git a/testData/refactoring/moveClass/stringsAndComments/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack1/Class1.java diff --git a/testData/refactoring/moveClass/stringsAndComments/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments/before/pack2/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments2/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments2/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack1/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments2/after/pack2/AClass.java b/java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack2/AClass.java similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments2/after/pack2/AClass.java rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack2/AClass.java diff --git a/testData/refactoring/moveClass/stringsAndComments2/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments2/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments2/after/pack2/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments2/before/pack1/AClass.java b/java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack1/AClass.java similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments2/before/pack1/AClass.java rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack1/AClass.java diff --git a/testData/refactoring/moveClass/stringsAndComments2/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments2/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack1/empty.txt diff --git a/testData/refactoring/moveClass/stringsAndComments2/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClass/stringsAndComments2/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClass/stringsAndComments2/before/pack2/empty.txt diff --git a/refactoring/tests/com/intellij/refactoring/MoveClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java similarity index 93% rename from refactoring/tests/com/intellij/refactoring/MoveClassTest.java rename to java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java index cd47d3e131c4..7a7df1a18b33 100644 --- a/refactoring/tests/com/intellij/refactoring/MoveClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java @@ -1,22 +1,22 @@ package com.intellij.refactoring; +import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightTestCase; -import com.intellij.testFramework.IdeaTestUtil; -import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor; import com.intellij.refactoring.move.moveClassesOrPackages.SingleSourceRootMoveDestination; +import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.PsiTestUtil; import java.io.File; public class MoveClassTest extends CodeInsightTestCase { - public void testContextChange() throws Exception{ doTest("contextChange1", new String[]{"pack1.Class1"}, "pack2"); doTest("contextChange2", new String[]{"pack1.Class1"}, "pack2"); @@ -62,7 +62,7 @@ public class MoveClassTest extends CodeInsightTestCase { } private void doTest(String testName, String[] classNames, String newPackageName) throws Exception{ - String root = PathManagerEx.getTestDataPath()+ "/refactoring/moveClass/" + testName; + String root = JavaTestUtil.getJavaTestDataPath() + "/refactoring/moveClass/" + testName; String rootBefore = root + "/before"; PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); @@ -80,7 +80,7 @@ public class MoveClassTest extends CodeInsightTestCase { final PsiClass[] classes = new PsiClass[classNames.length]; for(int i = 0; i < classes.length; i++){ String className = classNames[i]; - classes[i] = myJavaFacade.findClass(className); + classes[i] = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(getProject())); assertNotNull("Class " + className + " not found", classes[i]); }