azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Supported vals initialized after.

Browse Source 
#KT-2637 in progress
This commit is contained in:
Evgeny Gerashchenko
2013-07-09 19:13:37 +04:00
parent 72ed74ab9a
commit c22f54055e
11 changed files with 131 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java
+23 -10
View File
@@ -4,11 +4,14 @@ import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.PsiElement;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.InTextDirectivesUtils;
import java.io.File;
import java.io.IOException;
import java.util.List;
import static com.intellij.codeInsight.TargetElementUtilBase.ELEMENT_NAME_ACCEPTED;
import static com.intellij.codeInsight.TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED;
@@ -25,17 +28,27 @@ public abstract class AbstractInlineTest extends LightCodeInsightFixtureTestCase
TargetElementUtilBase.findTargetElement(myFixture.getEditor(), ELEMENT_NAME_ACCEPTED | REFERENCED_ELEMENT_ACCEPTED);
final KotlinInlineLocalHandler handler = new KotlinInlineLocalHandler();
assertEquals(afterFileExists, handler.canInlineElement(targetElement));
if (!afterFileExists) {
return;
}
List<String> expectedErrors = InTextDirectivesUtils.findLinesWithPrefixesRemoved(myFixture.getFile().getText(), "// ERROR: ");
if (handler.canInlineElement(targetElement)) {
try {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
handler.inlineElement(myFixture.getProject(), myFixture.getEditor(), targetElement);
}
});
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
handler.inlineElement(myFixture.getProject(), myFixture.getEditor(), targetElement);
assertTrue(afterFileExists);
assertEmpty(expectedErrors);
myFixture.checkResult(FileUtil.loadFile(afterFile));
} catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
assertFalse(afterFileExists);
assertEquals(1, expectedErrors.size());
assertEquals(expectedErrors.get(0).replace("\\n", "\n"), e.getMessage());
}
});
myFixture.checkResult(FileUtil.loadFile(afterFile));
}
else {
assertFalse(afterFileExists);
}
}
}
idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java
+20
View File
@@ -57,6 +57,11 @@ public class InlineTestGenerated extends AbstractInlineTest {
doTest("idea/testData/refactoring/inline/MethodReference.kt");
}
@TestMetadata("MultipleInitializers.kt")
public void testMultipleInitializers() throws Exception {
doTest("idea/testData/refactoring/inline/MultipleInitializers.kt");
}
@TestMetadata("MultipleUsages.kt")
public void testMultipleUsages() throws Exception {
doTest("idea/testData/refactoring/inline/MultipleUsages.kt");
@@ -67,6 +72,21 @@ public class InlineTestGenerated extends AbstractInlineTest {
doTest("idea/testData/refactoring/inline/Parameter.kt");
}
@TestMetadata("SeparateInitializer.kt")
public void testSeparateInitializer() throws Exception {
doTest("idea/testData/refactoring/inline/SeparateInitializer.kt");
}
@TestMetadata("SeparateInitializerInTry.kt")
public void testSeparateInitializerInTry() throws Exception {
doTest("idea/testData/refactoring/inline/SeparateInitializerInTry.kt");
}
@TestMetadata("UsedInAssignment.kt")
public void testUsedInAssignment() throws Exception {
doTest("idea/testData/refactoring/inline/UsedInAssignment.kt");
}
@TestMetadata("ValWithoutInitializer.kt")
public void testValWithoutInitializer() throws Exception {
doTest("idea/testData/refactoring/inline/ValWithoutInitializer.kt");