diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt index d9385de90de..6efb76116b7 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt @@ -22,7 +22,7 @@ abstract class AbstractCommonizerTest { protected abstract fun createCommonizer(): Commonizer - protected open fun isEqual(a: R?, b: R?): Boolean = a == b + protected open fun areEqual(a: R?, b: R?): Boolean = a == b protected fun doTestSuccess(expected: R, vararg variants: T) { check(variants.isNotEmpty()) @@ -34,7 +34,7 @@ abstract class AbstractCommonizerTest { } val actual = commonized.result - if (!isEqual(expected, actual)) throw ObjectsNotEqual("Expected: $expected\nActual: $actual") + if (!areEqual(expected, actual)) throw ObjectsNotEqual("Expected: $expected\nActual: $actual") } protected fun doTestFailure( diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt index 269f7660d71..6606b78b61e 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt @@ -100,7 +100,7 @@ class RootCommonizerTest : AbstractCommonizerTest() { override fun createCommonizer() = RootCommonizer() - override fun isEqual(a: CirRoot?, b: CirRoot?) = (a === b) || (a != null && b != null && a.target == b.target) + override fun areEqual(a: CirRoot?, b: CirRoot?) = (a === b) || (a != null && b != null && a.target == b.target) private companion object { fun CommonizerTarget.toMock() = CirRoot.create(target = this) diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt index 659304295ac..eb1ffe2a74a 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt @@ -528,7 +528,7 @@ class TypeCommonizerTest : AbstractCommonizerTest() { override fun createCommonizer() = TypeCommonizer(classifiers) - override fun isEqual(a: CirType?, b: CirType?) = (a === b) || (a != null && b != null && areEqual(classifiers, a, b)) + override fun areEqual(a: CirType?, b: CirType?) = (a === b) || (a != null && b != null && areEqual(classifiers, a, b)) companion object { fun areEqual(classifiers: CirKnownClassifiers, a: CirType, b: CirType): Boolean = diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt index b24c76a1c80..8c1ac1f5c69 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt @@ -142,7 +142,7 @@ class ValueParameterCommonizerTest : AbstractCommonizerTest?, b: List?): Boolean { + override fun areEqual(a: List?, b: List?): Boolean { if (a === b) return true else if (a == null || b == null || a.size != b.size)