new tests taking sortWithConstructors into account

Jolanrensen · Jolanrensen · commit a22f863367b9 · 2024-04-09T13:53:34.000+02:00
diff --git a/core/generated-sources/src/test/java/org/jetbrains/kotlinx/dataframe/api/JavaPojo.java b/core/generated-sources/src/test/java/org/jetbrains/kotlinx/dataframe/api/JavaPojo.java
@@ -9,7 +9,7 @@ public class JavaPojo {
 
     public JavaPojo() {}
 
-    public JavaPojo(int a, String b) {
+    public JavaPojo(String b, int a) {
         this.a = a;
         this.b = b;
     }
@@ -51,8 +51,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return "TestPojo{" +
-                "a=" + a +
-                ", b='" + b + '\'' +
-                '}';
+            "a=" + a +
+            ", b='" + b + '\'' +
+            '}';
     }
 }
diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/Utils.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/Utils.kt
@@ -24,4 +24,3 @@ fun <T : DataFrame<*>> T.alsoDebug(println: String? = null, rowsLimit: Int = 20)
     print(borders = true, title = true, columnTypes = true, valueLimit = -1, rowsLimit = rowsLimit)
     schema().print()
 }
-
diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt
@@ -193,6 +193,7 @@ class CreateDataFrameTests {
     fun treatErasedGenericAsAny() {
         class IncompatibleVersionErrorData<T>(val expected: T, val actual: T)
         class DeserializedContainerSource(val incompatibility: IncompatibleVersionErrorData<*>)
+
         val functions = listOf(DeserializedContainerSource(IncompatibleVersionErrorData(1, 2)))
 
         val df = functions.toDataFrame(maxDepth = 2)
@@ -320,11 +321,19 @@ class CreateDataFrameTests {
 
         constructor()
 
-        constructor(a: Int, b: String) {
+        constructor(b: String, a: Int) {
             this.a = a
             this.b = b
         }
 
+        constructor(b: String) {
+            this.b = b
+        }
+
+        constructor(a: Int) {
+            this.a = a
+        }
+
         fun getA(): Int = a
         fun setA(a: Int) {
             this.a = a
@@ -358,18 +367,21 @@ class CreateDataFrameTests {
 
     @Test
     fun `convert POJO to DF`() {
-        listOf(KotlinPojo(1, "a")).toDataFrame() shouldBe dataFrameOf("a", "b")(1, "a")
-        listOf(JavaPojo(1, "a")).toDataFrame() shouldBe dataFrameOf("a", "b")(1, "a")
+        // even though the names b, a, follow the constructor order
+        listOf(KotlinPojo("bb", 1)).toDataFrame() shouldBe dataFrameOf("b", "a")("bb", 1)
+
+        // cannot read java constructor parameter names with reflection, so sort lexigographically
+        listOf(JavaPojo("bb", 1)).toDataFrame() shouldBe dataFrameOf("a", "b")(1, "bb")
 
-        listOf(KotlinPojo(1, "a")).toDataFrame { properties(KotlinPojo::getA) } shouldBe dataFrameOf("a")(1)
-        listOf(KotlinPojo(1, "a")).toDataFrame { properties(KotlinPojo::getB) } shouldBe dataFrameOf("b")("a")
+        listOf(KotlinPojo("bb", 1)).toDataFrame { properties(KotlinPojo::getA) } shouldBe dataFrameOf("a")(1)
+        listOf(KotlinPojo("bb", 1)).toDataFrame { properties(KotlinPojo::getB) } shouldBe dataFrameOf("b")("bb")
 
-        listOf(JavaPojo(1, "a")).toDataFrame {
+        listOf(JavaPojo("bb", 1)).toDataFrame {
             properties(JavaPojo::getA)
         } shouldBe dataFrameOf("a")(1)
 
-        listOf(JavaPojo(1, "a")).toDataFrame {
+        listOf(JavaPojo("bb", 1)).toDataFrame {
             properties(JavaPojo::getB)
-        } shouldBe dataFrameOf("b")("a")
+        } shouldBe dataFrameOf("b")("bb")
     }
 }
diff --git a/core/src/test/java/org/jetbrains/kotlinx/dataframe/api/JavaPojo.java b/core/src/test/java/org/jetbrains/kotlinx/dataframe/api/JavaPojo.java
@@ -9,7 +9,7 @@ public class JavaPojo {
 
     public JavaPojo() {}
 
-    public JavaPojo(int a, String b) {
+    public JavaPojo(String b, int a) {
         this.a = a;
         this.b = b;
     }
@@ -51,8 +51,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return "TestPojo{" +
-                "a=" + a +
-                ", b='" + b + '\'' +
-                '}';
+            "a=" + a +
+            ", b='" + b + '\'' +
+            '}';
     }
 }
diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/Utils.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/Utils.kt
@@ -24,4 +24,3 @@ fun <T : DataFrame<*>> T.alsoDebug(println: String? = null, rowsLimit: Int = 20)
     print(borders = true, title = true, columnTypes = true, valueLimit = -1, rowsLimit = rowsLimit)
     schema().print()
 }
-
diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt
@@ -193,6 +193,7 @@ class CreateDataFrameTests {
     fun treatErasedGenericAsAny() {
         class IncompatibleVersionErrorData<T>(val expected: T, val actual: T)
         class DeserializedContainerSource(val incompatibility: IncompatibleVersionErrorData<*>)
+
         val functions = listOf(DeserializedContainerSource(IncompatibleVersionErrorData(1, 2)))
 
         val df = functions.toDataFrame(maxDepth = 2)
@@ -320,11 +321,19 @@ class CreateDataFrameTests {
 
         constructor()
 
-        constructor(a: Int, b: String) {
+        constructor(b: String, a: Int) {
             this.a = a
             this.b = b
         }
 
+        constructor(b: String) {
+            this.b = b
+        }
+
+        constructor(a: Int) {
+            this.a = a
+        }
+
         fun getA(): Int = a
         fun setA(a: Int) {
             this.a = a
@@ -358,18 +367,21 @@ class CreateDataFrameTests {
 
     @Test
     fun `convert POJO to DF`() {
-        listOf(KotlinPojo(1, "a")).toDataFrame() shouldBe dataFrameOf("a", "b")(1, "a")
-        listOf(JavaPojo(1, "a")).toDataFrame() shouldBe dataFrameOf("a", "b")(1, "a")
+        // even though the names b, a, follow the constructor order
+        listOf(KotlinPojo("bb", 1)).toDataFrame() shouldBe dataFrameOf("b", "a")("bb", 1)
+
+        // cannot read java constructor parameter names with reflection, so sort lexigographically
+        listOf(JavaPojo("bb", 1)).toDataFrame() shouldBe dataFrameOf("a", "b")(1, "bb")
 
-        listOf(KotlinPojo(1, "a")).toDataFrame { properties(KotlinPojo::getA) } shouldBe dataFrameOf("a")(1)
-        listOf(KotlinPojo(1, "a")).toDataFrame { properties(KotlinPojo::getB) } shouldBe dataFrameOf("b")("a")
+        listOf(KotlinPojo("bb", 1)).toDataFrame { properties(KotlinPojo::getA) } shouldBe dataFrameOf("a")(1)
+        listOf(KotlinPojo("bb", 1)).toDataFrame { properties(KotlinPojo::getB) } shouldBe dataFrameOf("b")("bb")
 
-        listOf(JavaPojo(1, "a")).toDataFrame {
+        listOf(JavaPojo("bb", 1)).toDataFrame {
             properties(JavaPojo::getA)
         } shouldBe dataFrameOf("a")(1)
 
-        listOf(JavaPojo(1, "a")).toDataFrame {
+        listOf(JavaPojo("bb", 1)).toDataFrame {
             properties(JavaPojo::getB)
-        } shouldBe dataFrameOf("b")("a")
+        } shouldBe dataFrameOf("b")("bb")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class JavaPojo {`
`9`	`9`
`10`	`10`	`public JavaPojo() {}`
`11`	`11`
`12`		`- public JavaPojo(int a, String b) {`
	`12`	`+ public JavaPojo(String b, int a) {`
`13`	`13`	`this.a = a;`
`14`	`14`	`this.b = b;`
`15`	`15`	`}`
`@@ -51,8 +51,8 @@ public int hashCode() {`
`51`	`51`	`@Override`
`52`	`52`	`public String toString() {`
`53`	`53`	`return "TestPojo{" +`
`54`		`- "a=" + a +`
`55`		`- ", b='" + b + '\'' +`
`56`		`- '}';`
	`54`	`+ "a=" + a +`
	`55`	`+ ", b='" + b + '\'' +`
	`56`	`+ '}';`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,3 @@ fun <T : DataFrame<*>> T.alsoDebug(println: String? = null, rowsLimit: Int = 20)`
`24`	`24`	`print(borders = true, title = true, columnTypes = true, valueLimit = -1, rowsLimit = rowsLimit)`
`25`	`25`	`schema().print()`
`26`	`26`	`}`
`27`		`-`