MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

inline parameter: show conflicts

Browse Source
This commit is contained in:
anna
2010-02-02 16:16:38 +03:00
parent ec80353939
commit 6c0d22308a
6 changed files with 232 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java
+16 -8
View File
@@ -5,6 +5,7 @@ import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.psi.PsiElement;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NonNls;
@@ -12,6 +13,7 @@ import org.jetbrains.annotations.NonNls;
/**
* @author yole
*/
public class InlineParameterTest extends LightCodeInsightTestCase {
@Override
protected String getTestDataPath() {
@@ -79,7 +81,12 @@ public class InlineParameterTest extends LightCodeInsightTestCase {
}
public void testRefOuterThis() throws Exception {
doTestParamInitializerDependsOnUnavalableValues();
try {
doTest(false);
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals("Parameter initializer depends on this which is not available inside the method and cannot be inlined", e.getMessage());
}
}
public void testRefThis() throws Exception {
@@ -107,15 +114,11 @@ public class InlineParameterTest extends LightCodeInsightTestCase {
}
public void testRefNewInner() throws Exception {
doTestParamInitializerDependsOnUnavalableValues();
}
private void doTestParamInitializerDependsOnUnavalableValues() throws Exception {
try {
doTest(false);
}
catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
assertEquals("Parameter initializer depends on values which are not available inside the method and cannot be inlined", e.getMessage());
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals("Parameter initializer depends on class <b><code>User.Local</code></b> which is not available inside method and cannot be inlined", e.getMessage());
}
}
@@ -128,7 +131,12 @@ public class InlineParameterTest extends LightCodeInsightTestCase {
}
public void testRefNewLocal() throws Exception {
doTestParamInitializerDependsOnUnavalableValues();
try {
doTest(false);
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals("Parameter initializer depends on class <b><code>Local</code></b> which is not available inside method and cannot be inlined", e.getMessage());
}
}
private void doTestCannotFindInitializer() throws Exception {