From c6fefbc22350729e53e045df7d482b7725f889be Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 11 Oct 2016 15:08:38 +0300 Subject: [PATCH] Rename: intention tests "ifNullToElvis" --> "foldInitializerAndIfToElvis" --- .../.intention | 0 .../Break.kt | 0 .../Break.kt.after | 0 .../CommentInBlock.kt | 0 .../CommentInBlock.kt.after | 0 .../Comments.kt | 0 .../Comments.kt.after | 0 .../Comments2.kt | 0 .../Comments2.kt.after | 0 .../Continue.kt | 0 .../Continue.kt.after | 0 .../ExplicitValType.kt | 0 .../ExplicitValType.kt.after | 0 .../ExplicitVarType.kt | 0 .../ExplicitVarType.kt.after | 0 .../IfNotNull.kt | 0 .../MultiStatementBlock.kt | 0 .../NotExit.kt | 0 .../NotIs.kt | 0 .../NotIs.kt.after | 0 .../OtherVar1.kt | 0 .../OtherVar2.kt | 0 .../Return.kt | 0 .../Return.kt.after | 0 .../ThrowInBlock.kt | 0 .../ThrowInBlock.kt.after | 0 .../Var.kt | 0 .../Var.kt.after | 0 .../ifStatementPriority.kt | 0 .../ifStatementPriority.kt.after | 0 .../intentions/IntentionTestGenerated.java | 42 +++++++++---------- 31 files changed, 21 insertions(+), 21 deletions(-) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/.intention (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Break.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Break.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/CommentInBlock.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/CommentInBlock.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Comments.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Comments.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Comments2.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Comments2.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Continue.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Continue.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ExplicitValType.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ExplicitValType.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ExplicitVarType.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ExplicitVarType.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/IfNotNull.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/MultiStatementBlock.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/NotExit.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/NotIs.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/NotIs.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/OtherVar1.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/OtherVar2.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Return.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Return.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ThrowInBlock.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ThrowInBlock.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Var.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/Var.kt.after (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ifStatementPriority.kt (100%) rename idea/testData/intentions/{ifNullToElvis => foldInitializerAndIfToElvis}/ifStatementPriority.kt.after (100%) diff --git a/idea/testData/intentions/ifNullToElvis/.intention b/idea/testData/intentions/foldInitializerAndIfToElvis/.intention similarity index 100% rename from idea/testData/intentions/ifNullToElvis/.intention rename to idea/testData/intentions/foldInitializerAndIfToElvis/.intention diff --git a/idea/testData/intentions/ifNullToElvis/Break.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Break.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt diff --git a/idea/testData/intentions/ifNullToElvis/Break.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Break.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/CommentInBlock.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/CommentInBlock.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt diff --git a/idea/testData/intentions/ifNullToElvis/CommentInBlock.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/CommentInBlock.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/Comments.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Comments.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt diff --git a/idea/testData/intentions/ifNullToElvis/Comments.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Comments.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/Comments2.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Comments2.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt diff --git a/idea/testData/intentions/ifNullToElvis/Comments2.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Comments2.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/Continue.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Continue.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt diff --git a/idea/testData/intentions/ifNullToElvis/Continue.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Continue.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/ExplicitValType.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ExplicitValType.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt diff --git a/idea/testData/intentions/ifNullToElvis/ExplicitValType.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ExplicitValType.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/ExplicitVarType.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ExplicitVarType.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt diff --git a/idea/testData/intentions/ifNullToElvis/ExplicitVarType.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ExplicitVarType.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/IfNotNull.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/IfNotNull.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/IfNotNull.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/IfNotNull.kt diff --git a/idea/testData/intentions/ifNullToElvis/MultiStatementBlock.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/MultiStatementBlock.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/MultiStatementBlock.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/MultiStatementBlock.kt diff --git a/idea/testData/intentions/ifNullToElvis/NotExit.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/NotExit.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/NotExit.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/NotExit.kt diff --git a/idea/testData/intentions/ifNullToElvis/NotIs.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/NotIs.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt diff --git a/idea/testData/intentions/ifNullToElvis/NotIs.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/NotIs.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/OtherVar1.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar1.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/OtherVar1.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar1.kt diff --git a/idea/testData/intentions/ifNullToElvis/OtherVar2.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar2.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/OtherVar2.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar2.kt diff --git a/idea/testData/intentions/ifNullToElvis/Return.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Return.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt diff --git a/idea/testData/intentions/ifNullToElvis/Return.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Return.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt diff --git a/idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/Var.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Var.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt diff --git a/idea/testData/intentions/ifNullToElvis/Var.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/Var.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt.after diff --git a/idea/testData/intentions/ifNullToElvis/ifStatementPriority.kt b/idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ifStatementPriority.kt rename to idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt diff --git a/idea/testData/intentions/ifNullToElvis/ifStatementPriority.kt.after b/idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt.after similarity index 100% rename from idea/testData/intentions/ifNullToElvis/ifStatementPriority.kt.after rename to idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt.after diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 0b0775d7eec..0f1ed5e3007 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -6389,113 +6389,113 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/ifNullToElvis") + @TestMetadata("idea/testData/intentions/foldInitializerAndIfToElvis") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IfNullToElvis extends AbstractIntentionTest { - public void testAllFilesPresentInIfNullToElvis() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/ifNullToElvis"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + public static class FoldInitializerAndIfToElvis extends AbstractIntentionTest { + public void testAllFilesPresentInFoldInitializerAndIfToElvis() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/foldInitializerAndIfToElvis"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("Break.kt") public void testBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Break.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt"); doTest(fileName); } @TestMetadata("CommentInBlock.kt") public void testCommentInBlock() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/CommentInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt"); doTest(fileName); } @TestMetadata("Comments.kt") public void testComments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Comments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt"); doTest(fileName); } @TestMetadata("Comments2.kt") public void testComments2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Comments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt"); doTest(fileName); } @TestMetadata("Continue.kt") public void testContinue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Continue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt"); doTest(fileName); } @TestMetadata("ExplicitValType.kt") public void testExplicitValType() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/ExplicitValType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt"); doTest(fileName); } @TestMetadata("ExplicitVarType.kt") public void testExplicitVarType() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/ExplicitVarType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt"); doTest(fileName); } @TestMetadata("IfNotNull.kt") public void testIfNotNull() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/IfNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/IfNotNull.kt"); doTest(fileName); } @TestMetadata("ifStatementPriority.kt") public void testIfStatementPriority() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/ifStatementPriority.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt"); doTest(fileName); } @TestMetadata("MultiStatementBlock.kt") public void testMultiStatementBlock() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/MultiStatementBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/MultiStatementBlock.kt"); doTest(fileName); } @TestMetadata("NotExit.kt") public void testNotExit() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/NotExit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/NotExit.kt"); doTest(fileName); } @TestMetadata("NotIs.kt") public void testNotIs() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/NotIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt"); doTest(fileName); } @TestMetadata("OtherVar1.kt") public void testOtherVar1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/OtherVar1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar1.kt"); doTest(fileName); } @TestMetadata("OtherVar2.kt") public void testOtherVar2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/OtherVar2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar2.kt"); doTest(fileName); } @TestMetadata("Return.kt") public void testReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt"); doTest(fileName); } @TestMetadata("ThrowInBlock.kt") public void testThrowInBlock() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt"); doTest(fileName); } @TestMetadata("Var.kt") public void testVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt"); doTest(fileName); } }