From ea522fe606529ff30b9db6f6b19bfac32e151d2a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sat, 27 Feb 2016 15:45:29 +0300
Subject: [PATCH] Minor, rename AbstractSMAPBaseTest -> SMAPTestUtil

Remove unnecessary inheritance
---
 .../generated/AbstractBlackBoxInlineCodegenTest.kt        | 8 ++++----
 .../AbstractCompileKotlinAgainstInlineKotlinTest.kt       | 4 ++--
 .../compiler/{AbstractSMAPBaseTest.kt => SMAPTestUtil.kt} | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename compiler/tests/org/jetbrains/kotlin/jvm/compiler/{AbstractSMAPBaseTest.kt => SMAPTestUtil.kt} (99%)

diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt
index 7a451519e02..1dc3989bb7d 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt
@@ -20,11 +20,11 @@ import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithJava
 import org.jetbrains.kotlin.codegen.InlineTestUtil
 import org.jetbrains.kotlin.codegen.filterClassFiles
 import org.jetbrains.kotlin.codegen.getClassFiles
-import org.jetbrains.kotlin.jvm.compiler.AbstractSMAPBaseTest
+import org.jetbrains.kotlin.jvm.compiler.SMAPTestUtil
 import org.jetbrains.kotlin.test.ConfigurationKind
 import java.io.File
 
-abstract class AbstractBlackBoxInlineCodegenTest : AbstractBlackBoxCodegenTest(), AbstractSMAPBaseTest {
+abstract class AbstractBlackBoxInlineCodegenTest : AbstractBlackBoxCodegenTest() {
     override fun doMultiFileTest(
             file: File, modules: Map<String, KotlinMultiFileTestWithJava<Void, TestFile>.ModuleAndDependencies>, files: List<TestFile>
     ) {
@@ -34,10 +34,10 @@ abstract class AbstractBlackBoxInlineCodegenTest : AbstractBlackBoxCodegenTest()
 
         try {
             InlineTestUtil.checkNoCallsToInline(initializedClassLoader.allGeneratedFiles.filterClassFiles(), myFiles.psiFiles)
-            checkSMAP(files, generateClassesInFile().getClassFiles())
+            SMAPTestUtil.checkSMAP(files, generateClassesInFile().getClassFiles())
         }
         catch (e: Throwable) {
-            System.out.println(generateToText())
+            println(generateToText())
             throw e
         }
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt
index 64661294f43..7f821364c3a 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.filterClassFiles
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import java.io.File
 
-abstract class AbstractCompileKotlinAgainstInlineKotlinTest : AbstractCompileKotlinAgainstKotlinTest(), AbstractSMAPBaseTest {
+abstract class AbstractCompileKotlinAgainstInlineKotlinTest : AbstractCompileKotlinAgainstKotlinTest() {
     override fun doMultiFileTest(
             file: File, modules: Map<String, KotlinMultiFileTestWithJava<Void, TestFile>.ModuleAndDependencies>, files: List<TestFile>
     ) {
@@ -42,7 +42,7 @@ abstract class AbstractCompileKotlinAgainstInlineKotlinTest : AbstractCompileKot
 
             val sourceFiles = factory1.inputFiles + factory2.inputFiles
             InlineTestUtil.checkNoCallsToInline(allGeneratedFiles.filterClassFiles(), sourceFiles)
-            checkSMAP(files, allGeneratedFiles.filterClassFiles())
+            SMAPTestUtil.checkSMAP(files, allGeneratedFiles.filterClassFiles())
         }
         catch (e: Throwable) {
             var result = ""
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/SMAPTestUtil.kt
similarity index 99%
rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt
rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/SMAPTestUtil.kt
index 5bc353a97da..7171626fb83 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/SMAPTestUtil.kt
@@ -28,7 +28,7 @@ import org.junit.Assert
 import java.io.File
 import java.io.StringReader
 
-interface AbstractSMAPBaseTest {
+object SMAPTestUtil {
     private fun extractSMAPFromClasses(outputFiles: Iterable<OutputFile>): List<SMAPAndFile> {
         return outputFiles.mapNotNull { outputFile ->
             var debugInfo: String? = null