From dc25c7bb3ba313f804b29a09214b13121cd79ac9 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 1 Jun 2011 15:25:11 +0400 Subject: [PATCH] Test for JET-68 + regression tests turned on --- idea/testData/checker/regression/DoubleDefine.jet | 2 +- idea/testData/checker/regression/Jet68.jet | 11 +++++++++++ idea/testData/checker/regression/Jet69.jet | 2 ++ .../org/jetbrains/jet/checkers/JetPsiCheckerTest.java | 7 +++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 idea/testData/checker/regression/Jet68.jet diff --git a/idea/testData/checker/regression/DoubleDefine.jet b/idea/testData/checker/regression/DoubleDefine.jet index c622e1cdd10..4f09bb37616 100644 --- a/idea/testData/checker/regression/DoubleDefine.jet +++ b/idea/testData/checker/regression/DoubleDefine.jet @@ -16,7 +16,7 @@ fun evaluateArg(expr: AbstractStringBuilder, numbers: ArrayList): Int { val n = c - '0' if (!numbers.contains(n)) throw new Exception("You used incorrect number: " + n) numbers.remove(n) - return n \ + return n } throw new Exception("Syntax error: Unrecognized character " + c) } diff --git a/idea/testData/checker/regression/Jet68.jet b/idea/testData/checker/regression/Jet68.jet new file mode 100644 index 00000000000..2d9cc4c7b21 --- /dev/null +++ b/idea/testData/checker/regression/Jet68.jet @@ -0,0 +1,11 @@ +class Foo() + +fun test() { + val f : Foo? = null + if (f == null) { + + } + if (f != null) { + + } +} \ No newline at end of file diff --git a/idea/testData/checker/regression/Jet69.jet b/idea/testData/checker/regression/Jet69.jet index 0bf3fce5ca2..dd198aa0f61 100644 --- a/idea/testData/checker/regression/Jet69.jet +++ b/idea/testData/checker/regression/Jet69.jet @@ -1,3 +1,5 @@ +class Command() {} + fun parse(cmd: String): Command? { return null } fun Any.equals(other : Any?) : Boolean = this === other diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java index ce9c3e649fd..bdc6af855cd 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java @@ -23,6 +23,13 @@ public class JetPsiCheckerTest extends JetTestCaseBase { return new JetPsiCheckerTest(dataPath, name); } })); + suite.addTest(JetTestCaseBase.suiteForDirectory(getTestDataPathBase(), "/checker/regression/", false, new JetTestCaseBase.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String dataPath, @NotNull String name) { + return new JetPsiCheckerTest(dataPath, name); + } + })); suite.addTest(JetTestCaseBase.suiteForDirectory(getTestDataPathBase(), "/checker/infos/", false, new JetTestCaseBase.NamedTestFactory() { @NotNull @Override