From 8d86951a3b0d8ae368c58fcfcb3ad6b9ede2fc8a Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 24 Oct 2014 17:31:26 +0400
Subject: [PATCH] Refactoring: junit.framework.Assert -> org.junit.Assert

---
 .../jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt   | 2 +-
 .../jet/plugin/libraries/AbstractDecompiledTextTest.kt          | 2 +-
 .../plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt    | 2 +-
 .../jet/plugin/libraries/InternalCompiledClassesTest.kt         | 2 +-
 .../jet/plugin/refactoring/rename/AbstractRenameTest.kt         | 2 +-
 libraries/stdlib/test/concurrent/SerializableTest.kt            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt b/generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt
index afe209eb9f6..6cb4b29e307 100644
--- a/generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt
+++ b/generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt
@@ -21,7 +21,7 @@ import org.jetbrains.jet.generators.builtins.generateBuiltIns.generateBuiltIns
 import java.io.StringWriter
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.openapi.util.io.FileUtil
-import junit.framework.Assert
+import org.junit.Assert
 import com.intellij.testFramework.UsefulTestCase
 
 class GenerateBuiltInsTest : UsefulTestCase() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt
index bf3198307bc..5954fd6e81c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt
@@ -22,7 +22,7 @@ import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import com.intellij.testFramework.UsefulTestCase.*
-import junit.framework.Assert.*
+import org.junit.Assert.*
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor
 import com.intellij.openapi.util.text.StringUtil
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt
index 4eeabb0cd71..2d49509a905 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt
@@ -20,7 +20,7 @@ import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.jet.JetTestCaseBuilder
 import com.intellij.psi.PsiManager
-import junit.framework.Assert
+import org.junit.Assert
 import com.intellij.psi.PsiCompiledFile
 import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor
 import java.io.File
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
index 213469b8600..c9721f961a2 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
@@ -23,7 +23,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.jet.lang.resolve.java.JvmAbi
 import com.intellij.psi.PsiManager
-import junit.framework.Assert
+import org.junit.Assert
 import com.intellij.psi.ClassFileViewProvider
 import com.intellij.psi.impl.compiled.ClsFileImpl
 import com.intellij.psi.PsiCompiledFile
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
index c38b8badb14..7513744cbe7 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.refactoring.rename
 import com.intellij.refactoring.MultiFileTestCase
 import com.intellij.openapi.util.io.FileUtil
 import java.io.File
-import junit.framework.Assert
+import org.junit.Assert
 import com.google.gson.JsonParser
 import com.google.gson.JsonObject
 import com.intellij.refactoring.util.CommonRefactoringUtil
diff --git a/libraries/stdlib/test/concurrent/SerializableTest.kt b/libraries/stdlib/test/concurrent/SerializableTest.kt
index aaae2b1b9e9..16c2a8464db 100644
--- a/libraries/stdlib/test/concurrent/SerializableTest.kt
+++ b/libraries/stdlib/test/concurrent/SerializableTest.kt
@@ -6,7 +6,7 @@ import java.io.ByteArrayInputStream
 import java.io.ObjectInputStream
 import java.io.Serializable
 import junit.framework.TestCase
-import junit.framework.Assert
+import org.junit.Assert
 
 private class Serial(val name: String) : Serializable {
     override fun toString() = name