From 669104538d8ddedb11432728085ca426732606d4 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 23 Oct 2013 17:26:40 +0400 Subject: [PATCH] Tests for shadowing and redeclaration --- idea/testData/checker/Redeclaration.kt | 28 +++++++++++++++++++ idea/testData/checker/Shadowing.kt | 17 +++++++++++ .../checkers/JetPsiCheckerTestGenerated.java | 10 +++++++ 3 files changed, 55 insertions(+) create mode 100644 idea/testData/checker/Redeclaration.kt create mode 100644 idea/testData/checker/Shadowing.kt diff --git a/idea/testData/checker/Redeclaration.kt b/idea/testData/checker/Redeclaration.kt new file mode 100644 index 00000000000..08cffc678bb --- /dev/null +++ b/idea/testData/checker/Redeclaration.kt @@ -0,0 +1,28 @@ +val a : Int = 1 +val a : Int = 1 + +fun foo() {} +fun foo() {} + +enum class EnumClass { + FOO + FOO +} + +class A { + val a : Int = 1 + val a : Int = 1 + + fun foo() {} + fun foo() {} +} + +object B { + class C + class C +} + +fun PairParam<T, T>() {} +class PParam<T, T> {} + +val <T, T> T.fooParam : Int = 1 \ No newline at end of file diff --git a/idea/testData/checker/Shadowing.kt b/idea/testData/checker/Shadowing.kt new file mode 100644 index 00000000000..a07020700c4 --- /dev/null +++ b/idea/testData/checker/Shadowing.kt @@ -0,0 +1,17 @@ +class A { + fun component1() = 42 + fun component2() = 42 +} + +fun foo(a: A, c: Int) { + val (a, b) = a + val arr = Array(2) { A() } + for ((c, d) in arr) { + } +} + +fun f(p: Int): Int { + val p = 2 + val p = 3 + return p +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java index 38c3a9699eb..baa8ea9cb62 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java @@ -218,6 +218,11 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { doTest("idea/testData/checker/RecursiveTypeInference.kt"); } + @TestMetadata("Redeclaration.kt") + public void testRedeclaration() throws Exception { + doTest("idea/testData/checker/Redeclaration.kt"); + } + @TestMetadata("Redeclarations.kt") public void testRedeclarations() throws Exception { doTest("idea/testData/checker/Redeclarations.kt"); @@ -228,6 +233,11 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { doTest("idea/testData/checker/ResolveToJava.kt"); } + @TestMetadata("Shadowing.kt") + public void testShadowing() throws Exception { + doTest("idea/testData/checker/Shadowing.kt"); + } + @TestMetadata("StringTemplates.kt") public void testStringTemplates() throws Exception { doTest("idea/testData/checker/StringTemplates.kt");