From 18f76c31ca667304b758c66916eeb06236021719 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Mon, 15 Apr 2019 09:04:35 +0200 Subject: [PATCH] Get rid of redundant UsefulTestCase --- .../arguments/GenerateKotlinGradleOptionsTest.kt | 7 +++++-- .../generators/builtins/GenerateBuiltInsTest.kt | 12 ++++++------ .../generators/evaluate/GenerateOperationsMapTest.kt | 4 ++-- .../protobuf/ProtoBufCompareConsistencyTest.kt | 4 ++-- .../kotlin/idea/editor/TemplateTokenSequenceTest.kt | 6 +++--- .../kotlin/jps/build/JoinToReadableStringTest.kt | 4 ++-- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt index f8af91af7d2..edfd5c2ff83 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt @@ -17,11 +17,14 @@ package org.jetbrains.kotlin.generators.arguments.test import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase import org.jetbrains.kotlin.generators.arguments.generateKotlinGradleOptions import org.jetbrains.kotlin.utils.Printer -import java.io.* +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.PrintStream -class GenerateKotlinGradleOptionsTest : UsefulTestCase() { +class GenerateKotlinGradleOptionsTest : TestCase() { fun testKotlinGradleOptionsAreUpToDate() { fun getPrinter(file: File, fn: Printer.()->Unit) { val bytesOut = ByteArrayOutputStream() diff --git a/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt index f5495ad6e47..ca33e6d45b7 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt @@ -16,15 +16,15 @@ package org.jetbrains.kotlin.generators.builtins.test -import java.io.PrintWriter -import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.generateBuiltIns -import java.io.StringWriter -import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.text.StringUtil +import junit.framework.TestCase +import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.generateBuiltIns import org.junit.Assert -import com.intellij.testFramework.UsefulTestCase +import java.io.PrintWriter +import java.io.StringWriter -class GenerateBuiltInsTest : UsefulTestCase() { +class GenerateBuiltInsTest : TestCase() { fun testBuiltInsAreUpToDate() { generateBuiltIns { file, generator -> val sw = StringWriter() diff --git a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt index ca40c9d115d..212111c841b 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.generators.test.evaluate -import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase import org.jetbrains.kotlin.generators.evaluate.DEST_FILE import org.jetbrains.kotlin.generators.evaluate.generate import org.jetbrains.kotlin.test.KotlinTestUtils -class GenerateOperationsMapTest : UsefulTestCase() { +class GenerateOperationsMapTest : TestCase() { fun testGeneratedDataIsUpToDate(): Unit { val text = generate() KotlinTestUtils.assertEqualsToFile(DEST_FILE, text) diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt index 9a52be111c2..6839c69e768 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.generators.protobuf import com.intellij.openapi.util.io.FileUtil -import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -class ProtoBufCompareConsistencyTest : UsefulTestCase() { +class ProtoBufCompareConsistencyTest : TestCase() { fun testAlreadyGenerated() { val testDir = KotlinTestUtils.tmpDir("testDirectory") val newFile = File(testDir, "ProtoCompareGenerated.kt") diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/TemplateTokenSequenceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/TemplateTokenSequenceTest.kt index ee6658a5743..1d1f814ac74 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/TemplateTokenSequenceTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/TemplateTokenSequenceTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.idea.editor -import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase import org.junit.Assert -class TemplateTokenSequenceTest:UsefulTestCase() { - fun doTest(input: String, expected:String) { +class TemplateTokenSequenceTest : TestCase() { + fun doTest(input: String, expected: String) { val output = createTemplateSequenceTokenString(input) Assert.assertEquals("Unexpected template sequence output for $input: " , expected, output) } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt index aca4447b45a..c8f65399185 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.jps.build -import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase -class JoinToReadableStringTest : UsefulTestCase() { +class JoinToReadableStringTest : TestCase() { fun test0() { assertEquals( "",