From f1783530ac3b2e6fde25193ec0f769e6c0c7f8be Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Tue, 24 Nov 2015 17:57:54 +0300
Subject: [PATCH] Replace test assertions in the prod code with require

---
 .../src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt      | 7 ++++---
 .../extractFunction/ExtractKotlinFunctionHandler.kt        | 3 +--
 .../introduceParameter/KotlinIntroduceParameterHandler.kt  | 3 +--
 .../introduceProperty/KotlinIntroducePropertyHandler.kt    | 3 +--
 .../src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt | 3 +--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
index de7efea1f23..e5e420ec5fd 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 import java.util.*
-import kotlin.test.assertTrue
+import kotlin.text.Regex
 
 // NOTE: in this file we collect only Kotlin-specific methods working with PSI and not modifying it
 
@@ -226,7 +226,7 @@ public fun StubBasedPsiElementBase<out KotlinClassOrObjectStub<out KtClassOrObje
         }
     }
 
-    assertTrue(this is KtClassOrObject)
+    require(this is KtClassOrObject) { "it should be ${KtClassOrObject::class} but it is a ${this.javaClass.name}" }
 
     val stub = getStub()
     if (stub != null) {
@@ -438,4 +438,5 @@ fun checkReservedPrefixWord(sink: DiagnosticSink, element: PsiElement, word: Str
     KtPsiUtil.getPreviousWord(element, word)?.let {
         sink.report(Errors.UNSUPPORTED.on(it, message))
     }
-}
\ No newline at end of file
+}
+
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
index bce93401409..147ace69c72 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.selectElementsWithTargetS
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtFile
-import kotlin.test.fail
 
 public class ExtractKotlinFunctionHandler(
         public val allContainersEnabled: Boolean = false,
@@ -78,7 +77,7 @@ public class ExtractKotlinFunctionHandler(
     }
 
     override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
-        fail("Extract Function can only be invoked from editor")
+        throw AssertionError("Extract Function can only be invoked from editor")
     }
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index 6e065d5ac7d..25afc38f50f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -65,7 +65,6 @@ import org.jetbrains.kotlin.types.typeUtil.isUnit
 import org.jetbrains.kotlin.types.typeUtil.supertypes
 import org.jetbrains.kotlin.utils.addIfNotNull
 import java.util.*
-import kotlin.test.fail
 
 public data class IntroduceParameterDescriptor(
         val originalRange: KotlinPsiRange,
@@ -389,7 +388,7 @@ public open class KotlinIntroduceParameterHandler(
     }
 
     override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
-        fail("$INTRODUCE_PARAMETER can only be invoked from editor")
+        throw AssertionError("$INTRODUCE_PARAMETER can only be invoked from editor")
     }
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
index a8080ff7315..9712b2f3d98 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.*
 import org.jetbrains.kotlin.idea.refactoring.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.*
-import kotlin.test.*
 import com.intellij.openapi.application.*
 import com.intellij.refactoring.RefactoringActionHandler
 import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
@@ -110,7 +109,7 @@ public class KotlinIntroducePropertyHandler(
     }
 
     override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
-        fail("$INTRODUCE_PROPERTY can only be invoked from editor")
+        throw AssertionError("$INTRODUCE_PROPERTY can only be invoked from editor")
     }
 }
 
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt
index fa4520fc0ce..f621437d580 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.js.inline.util
 
 import com.google.dart.compiler.backend.js.ast.*
 
-import kotlin.test.assertTrue
 import org.jetbrains.kotlin.js.inline.context.NamingContext
 import org.jetbrains.kotlin.js.inline.util.rewriters.LabelNameRefreshingVisitor
 
@@ -27,7 +26,7 @@ public fun aliasArgumentsIfNeeded(
         arguments: List<JsExpression>,
         parameters: List<JsParameter>
 ) {
-    assertTrue { arguments.size() <= parameters.size() }
+    require(arguments.size <= parameters.size) { "arguments.size (${arguments.size}) should be less or equal to parameters.size (${parameters.size})" }
 
     for ((arg, param) in arguments.zip(parameters)) {
         val paramName = param.getName()