From a6468bdff1847bec8c59e4e9dcb3072063babbbe Mon Sep 17 00:00:00 2001 From: Leonid Shalupov Date: Wed, 6 Feb 2013 13:16:38 +0400 Subject: [PATCH] fix tests --- compiler/testData/cli/help.out | 1 + compiler/testData/cli/wrongArgument.out | 1 + .../jet/plugin/compilerMessages/JetCompilerMessagingTest.java | 1 + .../org/jetbrains/jet/plugin/compilerMessages/Message.java | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/testData/cli/help.out b/compiler/testData/cli/help.out index d917c1fb853..68e88a4e834 100644 --- a/compiler/testData/cli/help.out +++ b/compiler/testData/cli/help.out @@ -17,4 +17,5 @@ Usage: org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments -verbose [flag] Enable verbose logging output -version [flag] Display compiler version -help (-h) [flag] show help + -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery OK diff --git a/compiler/testData/cli/wrongArgument.out b/compiler/testData/cli/wrongArgument.out index 4f4c71db1bc..370e7161fcf 100644 --- a/compiler/testData/cli/wrongArgument.out +++ b/compiler/testData/cli/wrongArgument.out @@ -18,4 +18,5 @@ Usage: org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments -verbose [flag] Enable verbose logging output -version [flag] Display compiler version -help (-h) [flag] show help + -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery INTERNAL_ERROR diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java index 12c438999e9..60fcaa9cdd7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java @@ -70,6 +70,7 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest { checker.expect(Message.info().textStartsWith("Using kotlinHome=")); checker.expect(Message.info().textStartsWith("Invoking in-process compiler")); checker.expect(Message.info().textStartsWith("Kotlin Compiler version")); + checker.expect(Message.stats().textStartsWith("Using Kotlin home directory")); checker.expect(Message.stats().text("Configuring the compilation environment")); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/Message.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/Message.java index a522645b1f9..d1896c260d7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/Message.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/Message.java @@ -110,7 +110,7 @@ public final class Message { other.message.matches(textMatchesRegexp)); return; } - Assert.assertEquals(other.message, this.message); + Assert.assertEquals(this.message, other.message); } @Override