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

[Commonizer] Minor. Clean-up in AbstractCommonizerTest

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-03-12 21:29:21 +03:00
parent aa196ae813
commit 6791ae81db
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt
+2 -2
View File
@@ -22,7 +22,7 @@ abstract class AbstractCommonizerTest<T, R> {
protected abstract fun createCommonizer(): Commonizer<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) { protected fun doTestSuccess(expected: R, vararg variants: T) {
check(variants.isNotEmpty()) check(variants.isNotEmpty())
@@ -34,7 +34,7 @@ abstract class AbstractCommonizerTest<T, R> {
} }
val actual = commonized.result 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( protected fun doTestFailure(
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt
+1 -1
View File
@@ -100,7 +100,7 @@ class RootCommonizerTest : AbstractCommonizerTest<CirRoot, CirRoot>() {
override fun createCommonizer() = RootCommonizer() 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 { private companion object {
fun CommonizerTarget.toMock() = CirRoot.create(target = this) fun CommonizerTarget.toMock() = CirRoot.create(target = this)
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt
+1 -1
View File
@@ -528,7 +528,7 @@ class TypeCommonizerTest : AbstractCommonizerTest<CirType, CirType>() {
override fun createCommonizer() = TypeCommonizer(classifiers) 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 { companion object {
fun areEqual(classifiers: CirKnownClassifiers, a: CirType, b: CirType): Boolean = fun areEqual(classifiers: CirKnownClassifiers, a: CirType, b: CirType): Boolean =
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt
+1 -1
View File
@@ -142,7 +142,7 @@ class ValueParameterCommonizerTest : AbstractCommonizerTest<CirValueParameter, C
override fun createCommonizer() = ValueParameterCommonizer(MOCK_CLASSIFIERS) 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)) (a === b) || (a != null && b != null && areEqual(MOCK_CLASSIFIERS, a, b))
internal companion object { internal companion object {
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt
+1 -1
View File
@@ -152,7 +152,7 @@ class ValueParameterListCommonizerTest : AbstractCommonizerTest<List<CirValuePar
override fun createCommonizer() = ValueParameterListCommonizer(MOCK_CLASSIFIERS) 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) if (a === b)
return true return true
else if (a == null || b == null || a.size != b.size) else if (a == null || b == null || a.size != b.size)