From 6791ae81db094340eb08c551f5d67e9ce21ce2f5 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 12 Mar 2021 21:29:21 +0300
Subject: [PATCH] [Commonizer] Minor. Clean-up in AbstractCommonizerTest

---
 .../descriptors/commonizer/core/AbstractCommonizerTest.kt     | 4 ++--
 .../kotlin/descriptors/commonizer/core/RootCommonizerTest.kt  | 2 +-
 .../kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt  | 2 +-
 .../commonizer/core/ValueParameterCommonizerTest.kt           | 2 +-
 .../commonizer/core/ValueParameterListCommonizerTest.kt       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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<T, R> {
 
     protected abstract fun createCommonizer(): Commonizer<T, R>
 
-    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<T, R> {
         }
 
         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<CirRoot, CirRoot>() {
 
     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<CirType, CirType>() {
 
     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<CirValueParameter, C
 
     override fun createCommonizer() = ValueParameterCommonizer(MOCK_CLASSIFIERS)
 
-    override fun isEqual(a: CirValueParameter?, b: CirValueParameter?) =
+    override fun areEqual(a: CirValueParameter?, b: CirValueParameter?) =
         (a === b) || (a != null && b != null && areEqual(MOCK_CLASSIFIERS, a, b))
 
     internal companion object {
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt
index 0d7237d57c3..757d4717b42 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt
@@ -152,7 +152,7 @@ class ValueParameterListCommonizerTest : AbstractCommonizerTest<List<CirValuePar
 
     override fun createCommonizer() = ValueParameterListCommonizer(MOCK_CLASSIFIERS)
 
-    override fun isEqual(a: List<CirValueParameter>?, b: List<CirValueParameter>?): Boolean {
+    override fun areEqual(a: List<CirValueParameter>?, b: List<CirValueParameter>?): Boolean {
         if (a === b)
             return true
         else if (a == null || b == null || a.size != b.size)