From e203e9c06e763906538447a4a8c1e538a92aa911 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 11 Sep 2009 18:08:20 +0400 Subject: [PATCH] test++ --- .../after01.java | 0 .../after02.java | 0 .../after03.java | 0 .../after04.java | 0 .../after05.java | 0 .../after06.java | 0 .../after07.java | 0 .../after08.java | 0 .../before01.java | 0 .../before02.java | 0 .../before03.java | 0 .../before04.java | 0 .../before05.java | 0 .../before06.java | 0 .../before07.java | 0 .../before08.java | 0 .../ReplaceConstructorWithFactoryTest.java | 36 ++++++------------- 17 files changed, 11 insertions(+), 25 deletions(-) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after01.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after02.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after03.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after04.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after05.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after06.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after07.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/after08.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before01.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before02.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before03.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before04.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before05.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before06.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before07.java (100%) rename {testData => java/java-tests/testData}/refactoring/replaceConstructorWithFactory/before08.java (100%) rename {refactoring/tests => java/java-tests/testSrc}/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java (68%) diff --git a/testData/refactoring/replaceConstructorWithFactory/after01.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after01.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after01.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after01.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after02.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after02.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after02.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after02.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after03.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after03.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after03.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after03.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after04.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after04.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after04.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after04.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after05.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after05.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after05.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after05.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after06.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after06.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after06.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after06.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after07.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after07.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after07.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after07.java diff --git a/testData/refactoring/replaceConstructorWithFactory/after08.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/after08.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/after08.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/after08.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before01.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before01.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before01.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before01.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before02.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before02.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before02.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before02.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before03.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before03.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before03.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before03.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before04.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before04.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before04.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before04.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before05.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before05.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before05.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before05.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before06.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before06.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before06.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before06.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before07.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before07.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before07.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before07.java diff --git a/testData/refactoring/replaceConstructorWithFactory/before08.java b/java/java-tests/testData/refactoring/replaceConstructorWithFactory/before08.java similarity index 100% rename from testData/refactoring/replaceConstructorWithFactory/before08.java rename to java/java-tests/testData/refactoring/replaceConstructorWithFactory/before08.java diff --git a/refactoring/tests/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java similarity index 68% rename from refactoring/tests/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java rename to java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java index 175959497818..aea34ac22f8e 100644 --- a/refactoring/tests/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithFactoryTest.java @@ -1,21 +1,20 @@ package com.intellij.refactoring; -import com.intellij.codeInsight.CodeInsightTestCase; -import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.pom.java.LanguageLevel; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiMethod; +import com.intellij.JavaTestUtil; +import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.replaceConstructorWithFactory.ReplaceConstructorWithFactoryProcessor; +import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NonNls; /** * @author dsl */ -public class ReplaceConstructorWithFactoryTest extends CodeInsightTestCase { - private LanguageLevel myPrevLanguageLevel; +public class ReplaceConstructorWithFactoryTest extends LightCodeInsightTestCase { + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath(); + } public void testEmptyConstructor() throws Exception { runTest("01", null); } @@ -64,7 +63,7 @@ public class ReplaceConstructorWithFactoryTest extends CodeInsightTestCase { } PsiClass targetClass = null; if (targetClassName != null) { - targetClass = myJavaFacade.findClass(targetClassName, GlobalSearchScope.allScope(getProject())); + targetClass = JavaPsiFacade.getInstance(getProject()).findClass(targetClassName, GlobalSearchScope.allScope(getProject())); assertTrue(targetClass != null); } @@ -74,28 +73,15 @@ public class ReplaceConstructorWithFactoryTest extends CodeInsightTestCase { targetClass = constructor.getContainingClass(); } replaceConstructorWithFactoryProcessor = new ReplaceConstructorWithFactoryProcessor( - myProject, constructor, constructor.getContainingClass(), targetClass, "new" + constructor.getName()); + getProject(), constructor, constructor.getContainingClass(), targetClass, "new" + constructor.getName()); } else { if (targetClass == null) { targetClass = aClass; } replaceConstructorWithFactoryProcessor = new ReplaceConstructorWithFactoryProcessor( - myProject, null, aClass, targetClass, "new" + aClass.getName()); + getProject(), null, aClass, targetClass, "new" + aClass.getName()); } replaceConstructorWithFactoryProcessor.run(); } - - - protected void setUp() throws Exception { - super.setUp(); - myPrevLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel(); - LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); - } - - - protected void tearDown() throws Exception { - LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPrevLanguageLevel); - super.tearDown(); - } }