From c6dfa866cd10224847aa83900f7e7da6a3de73e5 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sun, 27 Jul 2014 21:17:40 +0200
Subject: [PATCH] Refactor REPL tests: use empty line instead of "null"

---
 compiler/testData/repl/analyzeErrors.repl                       | 1 -
 compiler/testData/repl/empty.repl                               | 2 --
 compiler/testData/repl/evaluationErrors.repl                    | 1 -
 compiler/testData/repl/function.repl                            | 1 -
 compiler/testData/repl/functionOverloadResolution.repl          | 2 --
 .../testData/repl/functionOverloadResolutionAnyBeatsString.repl | 2 --
 compiler/testData/repl/functionReferencesPrev.repl              | 2 --
 compiler/testData/repl/imports.repl                             | 2 --
 compiler/testData/repl/multiline.repl                           | 1 -
 compiler/testData/repl/multiline3.repl                          | 1 -
 compiler/testData/repl/syntaxErrors.repl                        | 1 -
 .../org/jetbrains/jet/repl/AbstractReplInterpreterTest.java     | 2 +-
 12 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/compiler/testData/repl/analyzeErrors.repl b/compiler/testData/repl/analyzeErrors.repl
index e3cbe6eb8b9..feecc184774 100644
--- a/compiler/testData/repl/analyzeErrors.repl
+++ b/compiler/testData/repl/analyzeErrors.repl
@@ -1,5 +1,4 @@
 >>> fun foo() = 765
-null
 >>> foo(1)
 ERROR: /line2.kts: (1, 5) Too many arguments for internal final fun foo(): kotlin.Int defined in <script>
 >>> foo()
diff --git a/compiler/testData/repl/empty.repl b/compiler/testData/repl/empty.repl
index cb1f405f180..0c9ac96006d 100644
--- a/compiler/testData/repl/empty.repl
+++ b/compiler/testData/repl/empty.repl
@@ -1,8 +1,6 @@
 >>>
-null
 >>> 101
 101
 >>>
-null
 >>> 102
 102
diff --git a/compiler/testData/repl/evaluationErrors.repl b/compiler/testData/repl/evaluationErrors.repl
index 790febac499..eead2a71370 100644
--- a/compiler/testData/repl/evaluationErrors.repl
+++ b/compiler/testData/repl/evaluationErrors.repl
@@ -1,6 +1,5 @@
 >>> throw Exception("hi there")
 substring: Exception: hi there
 >>> fun foo() = 2
-null
 >>> foo()
 2
diff --git a/compiler/testData/repl/function.repl b/compiler/testData/repl/function.repl
index 5bbc5cd8e73..ae7ab6c0f7f 100644
--- a/compiler/testData/repl/function.repl
+++ b/compiler/testData/repl/function.repl
@@ -1,4 +1,3 @@
 >>> fun foo() = 2
-null
 >>> foo()
 2
diff --git a/compiler/testData/repl/functionOverloadResolution.repl b/compiler/testData/repl/functionOverloadResolution.repl
index 58f7b76e9d9..6bed857d285 100644
--- a/compiler/testData/repl/functionOverloadResolution.repl
+++ b/compiler/testData/repl/functionOverloadResolution.repl
@@ -1,6 +1,4 @@
 >>> fun foo() = 10
-null
 >>> fun foo() = 11
-null
 >>> foo()
 11
diff --git a/compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl b/compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl
index 3b65c1000ae..8281e3d0ef3 100644
--- a/compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl
+++ b/compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl
@@ -1,6 +1,4 @@
 >>> fun foo(s: String) = "string"
-null
 >>> fun foo(a: Any) = "any"
-null
 >>> foo("a")
 any
diff --git a/compiler/testData/repl/functionReferencesPrev.repl b/compiler/testData/repl/functionReferencesPrev.repl
index 3d17ab3448e..0a1c5c96ac9 100644
--- a/compiler/testData/repl/functionReferencesPrev.repl
+++ b/compiler/testData/repl/functionReferencesPrev.repl
@@ -1,6 +1,4 @@
 >>> val x = 1
-null
 >>> fun add1(y: Int) = x + y
-null
 >>> add1(999999)
 1000000
diff --git a/compiler/testData/repl/imports.repl b/compiler/testData/repl/imports.repl
index 3bffedfb487..bc92a8fd22c 100644
--- a/compiler/testData/repl/imports.repl
+++ b/compiler/testData/repl/imports.repl
@@ -1,6 +1,4 @@
 >>> import java.io.ByteArrayOutputStream
-null
 >>> val s = ByteArrayOutputStream()
-null
 >>> s.javaClass!!.getName()
 java.io.ByteArrayOutputStream
diff --git a/compiler/testData/repl/multiline.repl b/compiler/testData/repl/multiline.repl
index d554926f074..978e8665188 100644
--- a/compiler/testData/repl/multiline.repl
+++ b/compiler/testData/repl/multiline.repl
@@ -1,6 +1,5 @@
 >>> fun clock() =
 incomplete
 >>>     12
-null
 >>> clock()
 12
diff --git a/compiler/testData/repl/multiline3.repl b/compiler/testData/repl/multiline3.repl
index b7ef806d571..b39c5414a37 100644
--- a/compiler/testData/repl/multiline3.repl
+++ b/compiler/testData/repl/multiline3.repl
@@ -5,6 +5,5 @@ incomplete
 >>>     2 +
 incomplete
 >>>     1
-null
 >>> get7()
 7
diff --git a/compiler/testData/repl/syntaxErrors.repl b/compiler/testData/repl/syntaxErrors.repl
index 9eef3ab65c7..4339189d6d2 100644
--- a/compiler/testData/repl/syntaxErrors.repl
+++ b/compiler/testData/repl/syntaxErrors.repl
@@ -2,6 +2,5 @@
 ERROR: /line1.kts: (1, 1) Expecting an element
 ERROR: /line1.kts: (1, 3) Expecting an expression
 >>> fun foo() = 98
-null
 >>> foo()
 98
diff --git a/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.java b/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.java
index 32b08e0e8b2..d746fd18d0f 100644
--- a/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.java
+++ b/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.java
@@ -116,7 +116,7 @@ public abstract class AbstractReplInterpreterTest extends UsefulTestCase {
             else {
                 actual = lineResult.getErrorText();
             }
-            String actualString = StringUtil.convertLineSeparators(actual != null ? actual.toString() : "null").replaceFirst("\n$", "");
+            String actualString = StringUtil.convertLineSeparators(actual != null ? actual.toString() : "").replaceFirst("\n$", "");
 
             if (line.matchType == MatchType.EQUALS) {
                 Assert.assertEquals("after evaluation of: " + line.code, expected, actualString);