Replace test assertions in the prod code with require

This commit is contained in:
Sergey Mashkov
2015-11-24 17:57:54 +03:00
parent e25d31618c
commit f1783530ac
5 changed files with 8 additions and 11 deletions
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.types.expressions.OperatorConventions
import java.util.* 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 // 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() val stub = getStub()
if (stub != null) { if (stub != null) {
@@ -438,4 +438,5 @@ fun checkReservedPrefixWord(sink: DiagnosticSink, element: PsiElement, word: Str
KtPsiUtil.getPreviousWord(element, word)?.let { KtPsiUtil.getPreviousWord(element, word)?.let {
sink.report(Errors.UNSUPPORTED.on(it, message)) sink.report(Errors.UNSUPPORTED.on(it, message))
} }
} }
@@ -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.idea.util.psi.patternMatching.toRange
import org.jetbrains.kotlin.psi.KtBlockExpression import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import kotlin.test.fail
public class ExtractKotlinFunctionHandler( public class ExtractKotlinFunctionHandler(
public val allContainersEnabled: Boolean = false, public val allContainersEnabled: Boolean = false,
@@ -78,7 +77,7 @@ public class ExtractKotlinFunctionHandler(
} }
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) { 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")
} }
} }
@@ -65,7 +65,6 @@ import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.types.typeUtil.supertypes import org.jetbrains.kotlin.types.typeUtil.supertypes
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.* import java.util.*
import kotlin.test.fail
public data class IntroduceParameterDescriptor( public data class IntroduceParameterDescriptor(
val originalRange: KotlinPsiRange, val originalRange: KotlinPsiRange,
@@ -389,7 +388,7 @@ public open class KotlinIntroduceParameterHandler(
} }
override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) { 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")
} }
} }
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.*
import org.jetbrains.kotlin.idea.refactoring.* import org.jetbrains.kotlin.idea.refactoring.*
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
import org.jetbrains.kotlin.idea.util.psi.patternMatching.* import org.jetbrains.kotlin.idea.util.psi.patternMatching.*
import kotlin.test.*
import com.intellij.openapi.application.* import com.intellij.openapi.application.*
import com.intellij.refactoring.RefactoringActionHandler import com.intellij.refactoring.RefactoringActionHandler
import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers 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?) { 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")
} }
} }
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.js.inline.util
import com.google.dart.compiler.backend.js.ast.* 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.context.NamingContext
import org.jetbrains.kotlin.js.inline.util.rewriters.LabelNameRefreshingVisitor import org.jetbrains.kotlin.js.inline.util.rewriters.LabelNameRefreshingVisitor
@@ -27,7 +26,7 @@ public fun aliasArgumentsIfNeeded(
arguments: List<JsExpression>, arguments: List<JsExpression>,
parameters: List<JsParameter> 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)) { for ((arg, param) in arguments.zip(parameters)) {
val paramName = param.getName() val paramName = param.getName()