Move tests that use dataframe preprocessor

Author: koperagen

src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt

@@ -1,6 +1,9 @@
 package org.jetbrains.kotlinx.dataframe.testSets.person
 
+import org.jetbrains.kotlinx.dataframe.ColumnsContainer
+import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.jetbrains.kotlinx.dataframe.DataFrame
+import org.jetbrains.kotlinx.dataframe.DataRow
 import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
 import org.jetbrains.kotlinx.dataframe.api.cast
 import org.jetbrains.kotlinx.dataframe.api.column
@@ -15,6 +18,15 @@ interface Person {
     val weight: Int?
 }
 
+val DataRow<Person>.name: String get() = this["name"] as String
+val DataRow<Person>.age: Int get() = this["age"] as Int
+val DataRow<Person>.city: String? get() = this["city"] as String?
+val DataRow<Person>.weight: Int? get() = this["weight"] as Int?
+val ColumnsContainer<Person>.name: DataColumn<String> get() = this["name"] as DataColumn<String>
+val ColumnsContainer<Person>.age: DataColumn<Int> get() = this["age"] as DataColumn<Int>
+val ColumnsContainer<Person>.city: DataColumn<String?> get() = this["city"] as DataColumn<String?>
+val ColumnsContainer<Person>.weight: DataColumn<Int?> get() = this["weight"] as DataColumn<Int?>
+
 open class BaseTest {
 
 // Data set

src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/BaseTest.kt

@@ -1,7 +1,6 @@
 package org.jetbrains.kotlinx.dataframe.api
 
 import io.kotest.matchers.shouldBe
-import org.jetbrains.kotlinx.dataframe.prev
 import org.junit.Test
 
 class AddTests {
@@ -10,7 +9,7 @@ class AddTests {
     fun `add with new`() {
         val x by columnOf(7, 2, 0, 3, 4, 2, 5, 0, 3, 4)
         val df = dataFrameOf(x)
-        val added = df.add("Y") { if (x() == 0) 0 else (prev?.new() ?: 0) + 1 }
+        val added = df.add("Y") { if (x() == 0) 0 else (prev()?.new() ?: 0) + 1 }
         val expected = listOf(1, 2, 0, 1, 2, 3, 4, 0, 1, 2)
         added["Y"].values() shouldBe expected
     }

src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt renamed to tests/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt

@@ -1,7 +1,6 @@
 package org.jetbrains.kotlinx.dataframe.api
 
 import io.kotest.matchers.shouldBe
-import org.jetbrains.kotlinx.dataframe.nrow
 import org.jetbrains.kotlinx.dataframe.size
 import org.junit.Test
 
@@ -12,7 +11,7 @@ class ChunkedTests {
         val a by columnOf(listOf(1, 2, 3).toColumn("b"), listOf(4, 5, 6).toColumn("c"))
         val chunked = a.asColumnGroup().chunked(2)
         chunked.size shouldBe 2
-        chunked.name shouldBe "a"
-        chunked[1].nrow shouldBe 1
+        chunked.name() shouldBe "a"
+        chunked[1].rowsCount() shouldBe 1
     }
 }

src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/cast.kt renamed to tests/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/cast.kt

@@ -3,8 +3,6 @@ package org.jetbrains.kotlinx.dataframe.api
 import io.kotest.matchers.doubles.ToleranceMatcher
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
-import org.jetbrains.kotlinx.dataframe.ncol
-import org.jetbrains.kotlinx.dataframe.nrow
 import org.junit.Test
 
 class CorrTests {
@@ -17,8 +15,8 @@ class CorrTests {
     @Test
     fun `corr with boolean`() {
         val corr = df.corr("a", "b").with("c")
-        corr.nrow shouldBe 2
-        corr.ncol shouldBe 2
+        corr.rowsCount() shouldBe 2
+        corr.columnsCount() shouldBe 2
         corr.getColumn(0) shouldBe (columnOf("a", "b") named "column")
         corr.getColumn(1).name() shouldBe "c"
         corr["c"][0] as Double should ToleranceMatcher(1.0, 0.01)