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

Rename: Initial support of naming conventions

Browse Source
This commit is contained in:
Alexey Sedunov
2014-08-07 14:32:19 +04:00
parent d226a11c8e
commit 67606c55e7
53 changed files with 804 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
+6 -2
View File
@@ -48,6 +48,8 @@ import org.jetbrains.jet.getNullableString
import org.jetbrains.jet.plugin.search.allScope
import org.jetbrains.jet.plugin.caches.resolve.getBindingContext
import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException
private enum class RenameType {
JAVA_CLASS
@@ -90,8 +92,10 @@ public abstract class AbstractRenameTest : MultiFileTestCase() {
Assert.fail("""Hint "$hintDirective" was expected""")
}
}
catch (hintException : CommonRefactoringUtil.RefactoringErrorHintException) {
val hintExceptionUnquoted = StringUtil.unquoteString(hintException.getMessage()!!)
catch (e : Exception) {
if (e !is RefactoringErrorHintException && e !is ConflictsInTestsException) throw e
val hintExceptionUnquoted = StringUtil.unquoteString(e.getMessage()!!)
if (hintDirective != null) {
Assert.assertEquals(hintDirective, hintExceptionUnquoted)
}
idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java
+70
View File
@@ -36,6 +36,51 @@ public class RenameTestGenerated extends AbstractRenameTest {
JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$"));
}
@TestMetadata("renameCompareTo/compareTo.test")
public void testRenameCompareTo_CompareTo() throws Exception {
doTest("idea/testData/refactoring/rename/renameCompareTo/compareTo.test");
}
@TestMetadata("renameContains/contains.test")
public void testRenameContains_Contains() throws Exception {
doTest("idea/testData/refactoring/rename/renameContains/contains.test");
}
@TestMetadata("renameContainsWithConflicts/containsWithConflicts.test")
public void testRenameContainsWithConflicts_ContainsWithConflicts() throws Exception {
doTest("idea/testData/refactoring/rename/renameContainsWithConflicts/containsWithConflicts.test");
}
@TestMetadata("renameEquals/equals.test")
public void testRenameEquals_Equals() throws Exception {
doTest("idea/testData/refactoring/rename/renameEquals/equals.test");
}
@TestMetadata("renameExplicitComponentFunction/explicitComponentFunction.test")
public void testRenameExplicitComponentFunction_ExplicitComponentFunction() throws Exception {
doTest("idea/testData/refactoring/rename/renameExplicitComponentFunction/explicitComponentFunction.test");
}
@TestMetadata("renameGet/get.test")
public void testRenameGet_Get() throws Exception {
doTest("idea/testData/refactoring/rename/renameGet/get.test");
}
@TestMetadata("renameInc/inc.test")
public void testRenameInc_Inc() throws Exception {
doTest("idea/testData/refactoring/rename/renameInc/inc.test");
}
@TestMetadata("renameInvoke/invoke.test")
public void testRenameInvoke_Invoke() throws Exception {
doTest("idea/testData/refactoring/rename/renameInvoke/invoke.test");
}
@TestMetadata("renameIterator/iterator.test")
public void testRenameIterator_Iterator() throws Exception {
doTest("idea/testData/refactoring/rename/renameIterator/iterator.test");
}
@TestMetadata("renameJavaClass/renameJavaClass.test")
public void testRenameJavaClass_RenameJavaClass() throws Exception {
doTest("idea/testData/refactoring/rename/renameJavaClass/renameJavaClass.test");
@@ -161,4 +206,29 @@ public class RenameTestGenerated extends AbstractRenameTest {
doTest("idea/testData/refactoring/rename/renameKotlinVarProperty/renameOverriden.test");
}
@TestMetadata("renamePlus/plus.test")
public void testRenamePlus_Plus() throws Exception {
doTest("idea/testData/refactoring/rename/renamePlus/plus.test");
}
@TestMetadata("renamePlusAssign/plusAssign.test")
public void testRenamePlusAssign_PlusAssign() throws Exception {
doTest("idea/testData/refactoring/rename/renamePlusAssign/plusAssign.test");
}
@TestMetadata("renameSet/set.test")
public void testRenameSet_Set() throws Exception {
doTest("idea/testData/refactoring/rename/renameSet/set.test");
}
@TestMetadata("renameSynthesizedComponentFunction/synthesizedComponentFunction.test")
public void testRenameSynthesizedComponentFunction_SynthesizedComponentFunction() throws Exception {
doTest("idea/testData/refactoring/rename/renameSynthesizedComponentFunction/synthesizedComponentFunction.test");
}
@TestMetadata("renameUnaryMinus/unaryMinus.test")
public void testRenameUnaryMinus_UnaryMinus() throws Exception {
doTest("idea/testData/refactoring/rename/renameUnaryMinus/unaryMinus.test");
}
}