From 23afaeec2fa3b937bc824a9a0b4b09206282d5fe Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 28 Jul 2017 15:47:49 +0300
Subject: [PATCH] Extract TestMessageCollector

---
 ...linStandaloneIncrementalCompilationTest.kt | 21 +---------
 .../incremental/utils/TestMessageCollector.kt | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestMessageCollector.kt

diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt
index 689c25a3e5c..3df496e5bfb 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.incremental.testingUtils.*
-import org.junit.Assert.assertEquals
+import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -134,7 +134,7 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() {
             }
         }
 
-        val messageCollector = ErrorMessageCollector()
+        val messageCollector = TestMessageCollector()
         makeIncrementally(cacheDir, sourceRoots, args, reporter = reporter, messageCollector = messageCollector)
         return CompilationResult(resultExitCode, compiledSources, messageCollector.errors)
     }
@@ -166,23 +166,6 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() {
         append('\n')
     }
 
-    private class ErrorMessageCollector : MessageCollector {
-        val errors = ArrayList<String>()
-
-        override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
-            if (severity.isError) {
-                errors.add(message)
-            }
-        }
-
-        override fun clear() {
-            errors.clear()
-        }
-
-        override fun hasErrors(): Boolean =
-                errors.isNotEmpty()
-    }
-
     companion object {
         private val jpsResourcesPath = File("jps-plugin/testData/incremental")
         private val ignoredDirs = setOf(File(jpsResourcesPath, "cacheVersionChanged"),
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestMessageCollector.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestMessageCollector.kt
new file mode 100644
index 00000000000..eec9578644e
--- /dev/null
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestMessageCollector.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.incremental.utils
+
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
+import org.jetbrains.kotlin.cli.common.messages.MessageCollector
+import java.util.ArrayList
+
+class TestMessageCollector : MessageCollector {
+    val errors = ArrayList<String>()
+
+    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
+        if (severity.isError) {
+            errors.add(message)
+        }
+    }
+
+    override fun clear() {
+        errors.clear()
+    }
+
+    override fun hasErrors(): Boolean =
+            errors.isNotEmpty()
+}