diff --git a/idea/testData/intentions/convertIfToAssert/.intention b/idea/testData/intentions/convertIfWithThrowToAssert/.intention similarity index 100% rename from idea/testData/intentions/convertIfToAssert/.intention rename to idea/testData/intentions/convertIfWithThrowToAssert/.intention diff --git a/idea/testData/intentions/convertIfToAssert/assertOverloaded.kt b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/assertOverloaded.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt diff --git a/idea/testData/intentions/convertIfToAssert/assertOverloaded.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/assertOverloaded.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt diff --git a/idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/booleanCondition.kt b/idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/booleanCondition.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt diff --git a/idea/testData/intentions/convertIfToAssert/booleanCondition.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/booleanCondition.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt b/idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt diff --git a/idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/inapplicableAssertionErrorOverloaded.kt b/idea/testData/intentions/convertIfWithThrowToAssert/inapplicableAssertionErrorOverloaded.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/inapplicableAssertionErrorOverloaded.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/inapplicableAssertionErrorOverloaded.kt diff --git a/idea/testData/intentions/convertIfToAssert/inapplicableCauseSent.kt b/idea/testData/intentions/convertIfWithThrowToAssert/inapplicableCauseSent.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/inapplicableCauseSent.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/inapplicableCauseSent.kt diff --git a/idea/testData/intentions/convertIfToAssert/inapplicableHasElse.kt b/idea/testData/intentions/convertIfWithThrowToAssert/inapplicableHasElse.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/inapplicableHasElse.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/inapplicableHasElse.kt diff --git a/idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression.kt b/idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression.kt diff --git a/idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression2.kt b/idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression2.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression2.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression2.kt diff --git a/idea/testData/intentions/convertIfToAssert/noMessageSent.kt b/idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/noMessageSent.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt diff --git a/idea/testData/intentions/convertIfToAssert/noMessageSent.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/noMessageSent.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/nullSent.kt b/idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/nullSent.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt diff --git a/idea/testData/intentions/convertIfToAssert/nullSent.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/nullSent.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/simpleConvert.kt b/idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/simpleConvert.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt diff --git a/idea/testData/intentions/convertIfToAssert/simpleConvert.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/simpleConvert.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt.after diff --git a/idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt b/idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt similarity index 100% rename from idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt rename to idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt diff --git a/idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt.after similarity index 100% rename from idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt.after rename to idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt.after diff --git a/idea/testData/intentions/specifyType/.intention b/idea/testData/intentions/specifyTypeExplicitly/.intention similarity index 100% rename from idea/testData/intentions/specifyType/.intention rename to idea/testData/intentions/specifyTypeExplicitly/.intention diff --git a/idea/testData/intentions/specifyType/badCaretPosition.kt b/idea/testData/intentions/specifyTypeExplicitly/badCaretPosition.kt similarity index 100% rename from idea/testData/intentions/specifyType/badCaretPosition.kt rename to idea/testData/intentions/specifyTypeExplicitly/badCaretPosition.kt diff --git a/idea/testData/intentions/specifyType/classNameClashing.kt b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt similarity index 100% rename from idea/testData/intentions/specifyType/classNameClashing.kt rename to idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt diff --git a/idea/testData/intentions/specifyType/classNameClashing.kt.after b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after similarity index 100% rename from idea/testData/intentions/specifyType/classNameClashing.kt.after rename to idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after diff --git a/idea/testData/intentions/specifyType/enumType.kt b/idea/testData/intentions/specifyTypeExplicitly/enumType.kt similarity index 100% rename from idea/testData/intentions/specifyType/enumType.kt rename to idea/testData/intentions/specifyTypeExplicitly/enumType.kt diff --git a/idea/testData/intentions/specifyType/enumType.kt.after b/idea/testData/intentions/specifyTypeExplicitly/enumType.kt.after similarity index 100% rename from idea/testData/intentions/specifyType/enumType.kt.after rename to idea/testData/intentions/specifyTypeExplicitly/enumType.kt.after diff --git a/idea/testData/intentions/specifyType/functionType.kt b/idea/testData/intentions/specifyTypeExplicitly/functionType.kt similarity index 100% rename from idea/testData/intentions/specifyType/functionType.kt rename to idea/testData/intentions/specifyTypeExplicitly/functionType.kt diff --git a/idea/testData/intentions/specifyType/functionType.kt.after b/idea/testData/intentions/specifyTypeExplicitly/functionType.kt.after similarity index 100% rename from idea/testData/intentions/specifyType/functionType.kt.after rename to idea/testData/intentions/specifyTypeExplicitly/functionType.kt.after diff --git a/idea/testData/intentions/specifyType/loopParameter.kt b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt similarity index 100% rename from idea/testData/intentions/specifyType/loopParameter.kt rename to idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt diff --git a/idea/testData/intentions/specifyType/loopParameter.kt.after b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after similarity index 100% rename from idea/testData/intentions/specifyType/loopParameter.kt.after rename to idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after diff --git a/idea/testData/intentions/specifyType/publicMember.kt b/idea/testData/intentions/specifyTypeExplicitly/publicMember.kt similarity index 100% rename from idea/testData/intentions/specifyType/publicMember.kt rename to idea/testData/intentions/specifyTypeExplicitly/publicMember.kt diff --git a/idea/testData/intentions/specifyType/stringRedefined.kt b/idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt similarity index 100% rename from idea/testData/intentions/specifyType/stringRedefined.kt rename to idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt diff --git a/idea/testData/intentions/specifyType/stringRedefined.kt.after b/idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt.after similarity index 100% rename from idea/testData/intentions/specifyType/stringRedefined.kt.after rename to idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt.after diff --git a/idea/testData/intentions/specifyType/typeAlreadyProvided.kt b/idea/testData/intentions/specifyTypeExplicitly/typeAlreadyProvided.kt similarity index 100% rename from idea/testData/intentions/specifyType/typeAlreadyProvided.kt rename to idea/testData/intentions/specifyTypeExplicitly/typeAlreadyProvided.kt diff --git a/idea/testData/intentions/specifyType/unitType.kt b/idea/testData/intentions/specifyTypeExplicitly/unitType.kt similarity index 100% rename from idea/testData/intentions/specifyType/unitType.kt rename to idea/testData/intentions/specifyTypeExplicitly/unitType.kt diff --git a/idea/testData/intentions/specifyType/unitType.kt.after b/idea/testData/intentions/specifyTypeExplicitly/unitType.kt.after similarity index 100% rename from idea/testData/intentions/specifyType/unitType.kt.after rename to idea/testData/intentions/specifyTypeExplicitly/unitType.kt.after diff --git a/idea/testData/intentions/specifyType/unknownType.kt b/idea/testData/intentions/specifyTypeExplicitly/unknownType.kt similarity index 100% rename from idea/testData/intentions/specifyType/unknownType.kt rename to idea/testData/intentions/specifyTypeExplicitly/unknownType.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 825dd7eff20..500d33dcaa6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -2744,89 +2744,89 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/convertIfToAssert") + @TestMetadata("idea/testData/intentions/convertIfWithThrowToAssert") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertIfToAssert extends AbstractIntentionTest { - public void testAllFilesPresentInConvertIfToAssert() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfToAssert"), Pattern.compile("^(.+)\\.kt$"), true); + public static class ConvertIfWithThrowToAssert extends AbstractIntentionTest { + public void testAllFilesPresentInConvertIfWithThrowToAssert() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfWithThrowToAssert"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assertOverloaded.kt") public void testAssertOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/assertOverloaded.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt"); doTest(fileName); } @TestMetadata("assertOverloaded2.kt") public void testAssertOverloaded2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt"); doTest(fileName); } @TestMetadata("booleanCondition.kt") public void testBooleanCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/booleanCondition.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt"); doTest(fileName); } @TestMetadata("dotQualifiedThrow.kt") public void testDotQualifiedThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt"); doTest(fileName); } @TestMetadata("inapplicableAssertionErrorOverloaded.kt") public void testInapplicableAssertionErrorOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableAssertionErrorOverloaded.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableAssertionErrorOverloaded.kt"); doTest(fileName); } @TestMetadata("inapplicableCauseSent.kt") public void testInapplicableCauseSent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableCauseSent.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableCauseSent.kt"); doTest(fileName); } @TestMetadata("inapplicableHasElse.kt") public void testInapplicableHasElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableHasElse.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableHasElse.kt"); doTest(fileName); } @TestMetadata("inapplicableMoreThanSingleExpression.kt") public void testInapplicableMoreThanSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression.kt"); doTest(fileName); } @TestMetadata("inapplicableMoreThanSingleExpression2.kt") public void testInapplicableMoreThanSingleExpression2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression2.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression2.kt"); doTest(fileName); } @TestMetadata("noMessageSent.kt") public void testNoMessageSent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/noMessageSent.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt"); doTest(fileName); } @TestMetadata("nullSent.kt") public void testNullSent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/nullSent.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt"); doTest(fileName); } @TestMetadata("simpleConvert.kt") public void testSimpleConvert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/simpleConvert.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt"); doTest(fileName); } @TestMetadata("simplifiedCondition.kt") public void testSimplifiedCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt"); doTest(fileName); } } @@ -5788,71 +5788,71 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/specifyType") + @TestMetadata("idea/testData/intentions/specifyTypeExplicitly") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SpecifyType extends AbstractIntentionTest { - public void testAllFilesPresentInSpecifyType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyType"), Pattern.compile("^(.+)\\.kt$"), true); + public static class SpecifyTypeExplicitly extends AbstractIntentionTest { + public void testAllFilesPresentInSpecifyTypeExplicitly() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyTypeExplicitly"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("badCaretPosition.kt") public void testBadCaretPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/badCaretPosition.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/badCaretPosition.kt"); doTest(fileName); } @TestMetadata("classNameClashing.kt") public void testClassNameClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/classNameClashing.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt"); doTest(fileName); } @TestMetadata("enumType.kt") public void testEnumType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/enumType.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/enumType.kt"); doTest(fileName); } @TestMetadata("functionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/functionType.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/functionType.kt"); doTest(fileName); } @TestMetadata("loopParameter.kt") public void testLoopParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/loopParameter.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt"); doTest(fileName); } @TestMetadata("publicMember.kt") public void testPublicMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/publicMember.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/publicMember.kt"); doTest(fileName); } @TestMetadata("stringRedefined.kt") public void testStringRedefined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/stringRedefined.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt"); doTest(fileName); } @TestMetadata("typeAlreadyProvided.kt") public void testTypeAlreadyProvided() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/typeAlreadyProvided.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/typeAlreadyProvided.kt"); doTest(fileName); } @TestMetadata("unitType.kt") public void testUnitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/unitType.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/unitType.kt"); doTest(fileName); } @TestMetadata("unknownType.kt") public void testUnknownType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/unknownType.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/unknownType.kt"); doTest(fileName); } }