azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assertEquals usage in kotlin code after adding statics to scope.

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-10-16 16:11:08 +03:00
parent d5dbc9638d
commit de7d2978db
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt
+2 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.serialization.jvm
import com.intellij.testFramework.UsefulTestCase
import com.intellij.testFramework.UsefulTestCase.assertEquals
import org.jetbrains.kotlin.load.kotlin.JvmNameResolver
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
@@ -25,7 +26,6 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Recor
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.INTERNAL_TO_CLASS_ID
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE
import java.util.*
import kotlin.test.assertEquals
class JvmNameResolverTest : UsefulTestCase() {
private class Context {
@@ -83,7 +83,7 @@ class JvmNameResolverTest : UsefulTestCase() {
fun testPredefined() {
for ((index, predefined) in JvmNameResolver.PREDEFINED_STRINGS.withIndex()) {
assertEquals(predefined, str("ignored", predefinedIndex = index), "Predefined string failed: $predefined (index $index)")
assertEquals("Predefined string failed: $predefined (index $index)", predefined, str("ignored", predefinedIndex = index))
}
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt
+4 -3
View File
@@ -35,6 +35,7 @@ import com.intellij.refactoring.introduceParameter.Util
import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase.assertEquals
import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.EXTRACT_FUNCTION
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler
@@ -55,7 +56,7 @@ import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.util.findElementByCommentPrefix
import org.jetbrains.kotlin.utils.emptyOrSingletonList
import java.io.File
import java.util.Collections
import java.util.*
import kotlin.test.assertEquals
public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTestCase() {
@@ -286,8 +287,8 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
if (actualReturnTypes.size() != 1 || expectedReturnTypes.isNotEmpty()) {
assertEquals(expectedReturnTypes, actualReturnTypes, "Expected return types mismatch.")
}
assertEquals(expectedDescriptors, actualDescriptors, "Expected descriptors mismatch.")
assertEquals(expectedTypes, actualTypes, "Expected types mismatch.")
assertEquals("Expected descriptors mismatch.", expectedDescriptors, actualDescriptors)
assertEquals("Expected types mismatch.", expectedTypes, actualTypes)
val newDescriptor = if (descriptor.name == "") {
descriptor.copy(suggestedNames = Collections.singletonList("__dummyTestFun__"))
idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt
+3 -3
View File
@@ -135,16 +135,16 @@ public abstract class AbstractReferenceResolveTest : KotlinLightPlatformCodeInsi
val resolvedTo = psiReference.resolve()
if (resolvedTo != null) {
val resolvedToElementStr = ReferenceUtils.renderAsGotoImplementation(resolvedTo)
assertEquals(expectedResolveData.referenceString, resolvedToElementStr, "Found reference to '$resolvedToElementStr', but '${expectedResolveData.referenceString}' was expected")
assertEquals("Found reference to '$resolvedToElementStr', but '${expectedResolveData.referenceString}' was expected", expectedResolveData.referenceString, resolvedToElementStr)
}
else {
if (!expectedResolveData.shouldBeUnresolved()) {
assertNull(expectedResolveData.referenceString, "Element $psiReference wasn't resolved to anything, but ${expectedResolveData.referenceString} was expected")
assertNull("Element $psiReference wasn't resolved to anything, but ${expectedResolveData.referenceString} was expected", expectedResolveData.referenceString)
}
}
}
else {
assertNull(expectedResolveData.referenceString, "No reference found at offset: $offset, but one resolved to ${expectedResolveData.referenceString} was expected")
assertNull("No reference found at offset: $offset, but one resolved to ${expectedResolveData.referenceString} was expected", expectedResolveData.referenceString)
}
}
}