Skip to content

Commit a0c3f2e

Browse files
committed
changing testUtil to new ComparisonMode setting
1 parent cad6b07 commit a0c3f2e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/schema/ColumnSchema.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
66
import org.jetbrains.kotlinx.dataframe.DataRow
77
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
88
import org.jetbrains.kotlinx.dataframe.schema.ComparisonMode.LENIENT
9-
import org.jetbrains.kotlinx.dataframe.schema.ComparisonMode.STRICT
109
import org.jetbrains.kotlinx.dataframe.schema.ComparisonMode.STRICT_FOR_NESTED_SCHEMAS
1110
import kotlin.reflect.KType
1211
import kotlin.reflect.full.isSubtypeOf
@@ -58,7 +57,7 @@ public sealed class ColumnSchema {
5857
override val nullable: Boolean = false
5958
override val type: KType get() = typeOf<AnyRow>()
6059

61-
public fun compare(other: Group, comparisonMode: ComparisonMode = LENIENT): CompareResult =
60+
public fun compare(other: Group, comparisonMode: ComparisonMode = STRICT_FOR_NESTED_SCHEMAS): CompareResult =
6261
schema.compare(
6362
other = other.schema,
6463
comparisonMode = comparisonMode,
@@ -92,7 +91,7 @@ public sealed class ColumnSchema {
9291
}
9392
}
9493

95-
public fun compare(other: ColumnSchema, comparisonMode: ComparisonMode = LENIENT): CompareResult {
94+
public fun compare(other: ColumnSchema, comparisonMode: ComparisonMode = STRICT_FOR_NESTED_SCHEMAS): CompareResult {
9695
if (kind != other.kind) return CompareResult.None
9796
if (this === other) return CompareResult.Equals
9897
return when (this) {

plugins/kotlin-dataframe/testData/testUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import kotlin.reflect.full.isSubtypeOf
1010
inline fun <reified T> DataFrame<T>.compareSchemas(strict: Boolean = false) {
1111
val schema = schema()
1212
val compileTimeSchema = compileTimeSchema()
13-
val compare = compileTimeSchema.compare(schema)
14-
require(if (strict) compare.isEqual() else compare.isSuperOrEqual()) {
13+
val compare = compileTimeSchema.compare(schema, if (strict) ComparisonMode.STRICT else ComparisonMode.LENIENT)
14+
require(compare.isSuperOrEqual()) {
1515
buildString {
1616
appendLine("Comparison result: $compare")
1717
appendLine("Runtime:")

0 commit comments

Comments
 (0)