From 6c0a68cf667b550744138f195d3b2aecfb794aa3 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Tue, 17 Nov 2015 14:40:16 +0300 Subject: [PATCH] Rewrite some old exception filter tests --- .../breakpointReachedAt.kt | 7 ++++ .../kotlinClass/kotlinClass.kt | 12 +++++++ .../exceptionFilter/kt2489/kt2489.kt} | 5 ++- .../exceptionFilter/kt2489_2/kt2489_2.kt | 13 +++++++ .../exceptionFilter/multiSamePackage}/foo2.kt | 2 +- .../multiSamePackage/multiSamePackage.kt} | 5 ++- .../debugger/exceptionFilter/simple/simple.kt | 8 +++++ .../breakpointReachedAt.kt | 3 -- .../filters/exceptionFilter/kotlinClass/a.kt | 5 --- .../filters/exceptionFilter/kt2489/main.kt | 6 ---- .../filters/exceptionFilter/simple/simple.kt | 3 -- .../idea/filters/KotlinExceptionFilterTest.kt | 26 -------------- .../KotlinExceptionFilterTestGenerated.java | 36 +++++++++++++++++++ 13 files changed, 85 insertions(+), 46 deletions(-) create mode 100644 idea/testData/debugger/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt create mode 100644 idea/testData/debugger/exceptionFilter/kotlinClass/kotlinClass.kt rename idea/testData/{filters/exceptionFilter/kt2489/a.kt => debugger/exceptionFilter/kt2489/kt2489.kt} (51%) create mode 100644 idea/testData/debugger/exceptionFilter/kt2489_2/kt2489_2.kt rename idea/testData/{filters/exceptionFilter/multiSameName/2 => debugger/exceptionFilter/multiSamePackage}/foo2.kt (75%) rename idea/testData/{filters/exceptionFilter/multiSameName/1/foo1.kt => debugger/exceptionFilter/multiSamePackage/multiSamePackage.kt} (51%) create mode 100644 idea/testData/debugger/exceptionFilter/simple/simple.kt delete mode 100644 idea/testData/filters/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt delete mode 100644 idea/testData/filters/exceptionFilter/kotlinClass/a.kt delete mode 100644 idea/testData/filters/exceptionFilter/kt2489/main.kt delete mode 100644 idea/testData/filters/exceptionFilter/simple/simple.kt diff --git a/idea/testData/debugger/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt b/idea/testData/debugger/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt new file mode 100644 index 00000000000..7808f178fb2 --- /dev/null +++ b/idea/testData/debugger/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt @@ -0,0 +1,7 @@ +fun box() { + null!! +} + +// PREFIX: Breakpoint reached at +// FILE: breakpointReachedAt.kt +// LINE: 2 diff --git a/idea/testData/debugger/exceptionFilter/kotlinClass/kotlinClass.kt b/idea/testData/debugger/exceptionFilter/kotlinClass/kotlinClass.kt new file mode 100644 index 00000000000..cbfcef92c5d --- /dev/null +++ b/idea/testData/debugger/exceptionFilter/kotlinClass/kotlinClass.kt @@ -0,0 +1,12 @@ +class A { + fun foo() { + null!! + } +} + +fun box() { + A().foo() +} + +// FILE: kotlinClass.kt +// LINE: 3 \ No newline at end of file diff --git a/idea/testData/filters/exceptionFilter/kt2489/a.kt b/idea/testData/debugger/exceptionFilter/kt2489/kt2489.kt similarity index 51% rename from idea/testData/filters/exceptionFilter/kt2489/a.kt rename to idea/testData/debugger/exceptionFilter/kt2489/kt2489.kt index f6374bc9f7f..2b950cb99c8 100644 --- a/idea/testData/filters/exceptionFilter/kt2489/a.kt +++ b/idea/testData/debugger/exceptionFilter/kt2489/kt2489.kt @@ -1,6 +1,9 @@ -fun a() { +fun box() { val f = { null!! } f() } + +// FILE: kt2489.kt +// LINE: 3 diff --git a/idea/testData/debugger/exceptionFilter/kt2489_2/kt2489_2.kt b/idea/testData/debugger/exceptionFilter/kt2489_2/kt2489_2.kt new file mode 100644 index 00000000000..f3c4adbe093 --- /dev/null +++ b/idea/testData/debugger/exceptionFilter/kt2489_2/kt2489_2.kt @@ -0,0 +1,13 @@ +fun a() { + val f = { + null!! + } + f() +} + +fun box() { + a() +} + +// FILE: kt2489_2.kt +// LINE: 3 diff --git a/idea/testData/filters/exceptionFilter/multiSameName/2/foo2.kt b/idea/testData/debugger/exceptionFilter/multiSamePackage/foo2.kt similarity index 75% rename from idea/testData/filters/exceptionFilter/multiSameName/2/foo2.kt rename to idea/testData/debugger/exceptionFilter/multiSamePackage/foo2.kt index 0c5c00fb455..8a8a99cc72a 100644 --- a/idea/testData/filters/exceptionFilter/multiSameName/2/foo2.kt +++ b/idea/testData/debugger/exceptionFilter/multiSamePackage/foo2.kt @@ -1,6 +1,6 @@ package multiSameName -fun foo(x: Int) { +fun box(x: Int) { val f = { null!! } f() } diff --git a/idea/testData/filters/exceptionFilter/multiSameName/1/foo1.kt b/idea/testData/debugger/exceptionFilter/multiSamePackage/multiSamePackage.kt similarity index 51% rename from idea/testData/filters/exceptionFilter/multiSameName/1/foo1.kt rename to idea/testData/debugger/exceptionFilter/multiSamePackage/multiSamePackage.kt index 987e0e22851..3993f8e4501 100644 --- a/idea/testData/filters/exceptionFilter/multiSameName/1/foo1.kt +++ b/idea/testData/debugger/exceptionFilter/multiSamePackage/multiSamePackage.kt @@ -1,6 +1,9 @@ package multiSameName -fun foo() { +fun box() { val f = { null!! } f() } + +// FILE: multiSamePackage.kt +// LINE: 4 diff --git a/idea/testData/debugger/exceptionFilter/simple/simple.kt b/idea/testData/debugger/exceptionFilter/simple/simple.kt new file mode 100644 index 00000000000..97cf581debd --- /dev/null +++ b/idea/testData/debugger/exceptionFilter/simple/simple.kt @@ -0,0 +1,8 @@ +fun box(): String { + //Breakpoint! + null!! +} + +// EXCEPTION_TEXT: at SimpleKt.main(sss.kt:3) +// FILE: simple.kt +// LINE: 3 diff --git a/idea/testData/filters/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt b/idea/testData/filters/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt deleted file mode 100644 index 03a7ab446dc..00000000000 --- a/idea/testData/filters/exceptionFilter/breakpointReachedAt/breakpointReachedAt.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun main(args: Array) { - println("hello") -} diff --git a/idea/testData/filters/exceptionFilter/kotlinClass/a.kt b/idea/testData/filters/exceptionFilter/kotlinClass/a.kt deleted file mode 100644 index a4d7958fa92..00000000000 --- a/idea/testData/filters/exceptionFilter/kotlinClass/a.kt +++ /dev/null @@ -1,5 +0,0 @@ -class A { - fun foo() { - println("Hello!") - } -} \ No newline at end of file diff --git a/idea/testData/filters/exceptionFilter/kt2489/main.kt b/idea/testData/filters/exceptionFilter/kt2489/main.kt deleted file mode 100644 index 51d9bdc4134..00000000000 --- a/idea/testData/filters/exceptionFilter/kt2489/main.kt +++ /dev/null @@ -1,6 +0,0 @@ -fun main(args: Array) { - val f = { - null!! - } - f() -} diff --git a/idea/testData/filters/exceptionFilter/simple/simple.kt b/idea/testData/filters/exceptionFilter/simple/simple.kt deleted file mode 100644 index 03a7ab446dc..00000000000 --- a/idea/testData/filters/exceptionFilter/simple/simple.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun main(args: Array) { - println("hello") -} diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt index 454997f09b9..b06f39c954e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt @@ -106,32 +106,6 @@ public class KotlinExceptionFilterTest : MultiFileTestCase() { TestCase.assertEquals(expectedOffset, descriptor.getOffset()) } - public fun testBreakpointReachedAt() { - doTest("breakpointReachedAt.kt", 2, { "BreakpointReachedAtKt" }, linePrefix = "Breakpoint reached at ") - } - - public fun testSimple() { - doTest("simple.kt", 2, { "SimpleKt" }) - } - - public fun testKt2489() { - val packageFQN = FqName.ROOT - doTest("a.kt", 3, { file -> "" + PackagePartClassUtils.getDefaultFileClassFqName(packageFQN, file) + "\$a\$f\$1" }) - doTest("main.kt", 3, { file -> "" + PackagePartClassUtils.getDefaultFileClassFqName(packageFQN, file) + "\$main\$f\$1" }) - } - - public fun testMultiSameName() { - val packageFQN = FqName("multiSameName") - // The order and the exact names do matter here - doTest("1/foo1.kt", 4, { file -> "" + PackagePartClassUtils.getDefaultFileClassFqName(packageFQN, file) + "\$foo\$f\$1" }) - doTest("2/foo2.kt", 4, { file -> "" + PackagePartClassUtils.getDefaultFileClassFqName(packageFQN, file) + "\$foo\$f\$1" }) - } - - public fun testKotlinClass() { - val kotlinClassFqName = "A" - doTest("a.kt", 3, { kotlinClassFqName }) - } - public fun testLibrarySources() { val mockLibrary = MockLibraryUtil.compileLibraryToJar(getTestDataPath() + getTestRoot() + "mockLibrary", "mockLibrary", true) diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTestGenerated.java index bf2871ba493..1dd26dd2cb7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTestGenerated.java @@ -35,6 +35,12 @@ public class KotlinExceptionFilterTestGenerated extends AbstractKotlinExceptionF KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/exceptionFilter"), Pattern.compile("^([^\\.]+)$"), false); } + @TestMetadata("breakpointReachedAt") + public void testBreakpointReachedAt() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/breakpointReachedAt/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionAnotherFile") public void testInlineFunctionAnotherFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionAnotherFile/"); @@ -46,4 +52,34 @@ public class KotlinExceptionFilterTestGenerated extends AbstractKotlinExceptionF String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionSameFile/"); doTest(fileName); } + + @TestMetadata("kotlinClass") + public void testKotlinClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/kotlinClass/"); + doTest(fileName); + } + + @TestMetadata("kt2489") + public void testKt2489() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/kt2489/"); + doTest(fileName); + } + + @TestMetadata("kt2489_2") + public void testKt2489_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/kt2489_2/"); + doTest(fileName); + } + + @TestMetadata("multiSamePackage") + public void testMultiSamePackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/multiSamePackage/"); + doTest(fileName); + } + + @TestMetadata("simple") + public void testSimple() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/simple/"); + doTest(fileName); + } }