From 8349aa1889168569acbda64a365b78262f09a846 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 10 Sep 2009 20:06:27 +0400 Subject: [PATCH] test++ --- .../changeSignaturePropagation/ExceptionSimple.java | 0 .../ExceptionSimple.java.after | 0 .../ExceptionWithOverriding.java | 0 .../ExceptionWithOverriding.java.after | 0 .../changeSignaturePropagation/ParamSimple.java | 0 .../changeSignaturePropagation/ParamSimple.java.after | 0 .../ParamWithOverriding.java | 0 .../ParamWithOverriding.java.after | 0 .../refactoring/ChangeSignaturePropagationTest.java | 11 +++++++++-- 9 files changed, 9 insertions(+), 2 deletions(-) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ExceptionSimple.java (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ExceptionSimple.java.after (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ParamSimple.java (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ParamSimple.java.after (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ParamWithOverriding.java (100%) rename {testData => java/java-tests/testData}/refactoring/changeSignaturePropagation/ParamWithOverriding.java.after (100%) rename {refactoring/tests => java/java-tests/testSrc}/com/intellij/refactoring/ChangeSignaturePropagationTest.java (92%) diff --git a/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ExceptionSimple.java rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java diff --git a/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after diff --git a/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java diff --git a/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after diff --git a/testData/refactoring/changeSignaturePropagation/ParamSimple.java b/java/java-tests/testData/refactoring/changeSignaturePropagation/ParamSimple.java similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ParamSimple.java rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ParamSimple.java diff --git a/testData/refactoring/changeSignaturePropagation/ParamSimple.java.after b/java/java-tests/testData/refactoring/changeSignaturePropagation/ParamSimple.java.after similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ParamSimple.java.after rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ParamSimple.java.after diff --git a/testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java b/java/java-tests/testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java diff --git a/testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java.after b/java/java-tests/testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java.after similarity index 100% rename from testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java.after rename to java/java-tests/testData/refactoring/changeSignaturePropagation/ParamWithOverriding.java.after diff --git a/refactoring/tests/com/intellij/refactoring/ChangeSignaturePropagationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java similarity index 92% rename from refactoring/tests/com/intellij/refactoring/ChangeSignaturePropagationTest.java rename to java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java index 92460b5b98d7..31fed2dca19c 100644 --- a/refactoring/tests/com/intellij/refactoring/ChangeSignaturePropagationTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java @@ -9,6 +9,7 @@ import com.intellij.refactoring.changeSignature.ParameterInfoImpl; import com.intellij.refactoring.changeSignature.ThrownExceptionInfo; import com.intellij.refactoring.util.CanonicalTypes; import com.intellij.util.containers.HashSet; +import com.intellij.JavaTestUtil; import java.util.Arrays; import java.util.Set; @@ -81,7 +82,7 @@ public class ChangeSignaturePropagationTest extends CodeInsightTestCase { return "/refactoring/changeSignaturePropagation/"; } - private ParameterInfoImpl[] generateParameterInfos (PsiMethod method, ParameterInfoImpl[] newParameters) { + private static ParameterInfoImpl[] generateParameterInfos (PsiMethod method, ParameterInfoImpl[] newParameters) { final PsiParameter[] parameters = method.getParameterList().getParameters(); ParameterInfoImpl[] result = new ParameterInfoImpl[parameters.length + newParameters.length]; for (int i = 0; i < parameters.length; i++) { @@ -91,7 +92,7 @@ public class ChangeSignaturePropagationTest extends CodeInsightTestCase { return result; } - private ThrownExceptionInfo[] generateExceptionInfos (PsiMethod method, ThrownExceptionInfo[] newExceptions) { + private static ThrownExceptionInfo[] generateExceptionInfos (PsiMethod method, ThrownExceptionInfo[] newExceptions) { final PsiClassType[] exceptions = method.getThrowsList().getReferencedTypes(); ThrownExceptionInfo[] result = new ThrownExceptionInfo[exceptions.length + newExceptions.length]; for (int i = 0; i < exceptions.length; i++) { @@ -100,4 +101,10 @@ public class ChangeSignaturePropagationTest extends CodeInsightTestCase { System.arraycopy(newExceptions, 0, result, exceptions.length, newExceptions.length); return result; } + + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath(); + } + }