Skip to content

Commit 3e7034e

Browse files
JolanrensenJolanrensen
committed
fixed json tests
1 parent 5a241b4 commit 3e7034e

File tree

2 files changed

+20
-20
lines changed
  • dataframe-json/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io
  • dataframe-openapi-generator/src/test/kotlin

2 files changed

+20
-20
lines changed

‎dataframe-json/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/JsonTests.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -861,12 +861,12 @@ class JsonTests {
861861
it["a"][1].let { it as AnyFrame }.alsoDebug()
862862
}
863863
// ⌌------------------------------⌍
864-
// | | a:[key:String, value:Any?]|
864+
// | | a:[name:String, value:Any?]|
865865
// |--|---------------------------|
866-
// | 0| [1 x 2] { key:b, value:1 }|
867-
// | 1| [3 x 2]| -> { key:c, value:2 }
868-
// | 2| [0 x 2]| { key:d, value:null }
869-
// | 3| [0 x 2]| { key:b, value:[1,2,3] }
866+
// | 0| [1 x 2] { name:b, value:1 }|
867+
// | 1| [3 x 2]| -> { name:c, value:2 }
868+
// | 2| [0 x 2]| { name:d, value:null }
869+
// | 3| [0 x 2]| { name:b, value:[1,2,3] }
870870
// | 4| [0 x 2]|
871871
// | 5| [0 x 2]|
872872
// ⌎------------------------------⌏
@@ -880,7 +880,7 @@ class JsonTests {
880880
it[0].let {
881881
it.columnsCount() shouldBe 2
882882
it.rowsCount() shouldBe 1
883-
it["key"].let {
883+
it["name"].let {
884884
it.type() shouldBe typeOf<String>()
885885
it[0] shouldBe "b"
886886
}
@@ -892,7 +892,7 @@ class JsonTests {
892892
it[1].let {
893893
it.columnsCount() shouldBe 2
894894
it.rowsCount() shouldBe 3
895-
it["key"].let {
895+
it["name"].let {
896896
it.type() shouldBe typeOf<String>()
897897
it[0] shouldBe "c"
898898
it[1] shouldBe "d"
@@ -907,7 +907,7 @@ class JsonTests {
907907
it.columnsCount() shouldBe 2
908908
it.rowsCount() shouldBe 0
909909

910-
it["key"].type() shouldBe typeOf<String>()
910+
it["name"].type() shouldBe typeOf<String>()
911911
it["value"].type() shouldBeIn listOf(typeOf<Any?>(), typeOf<Any>()) // no data, so Any(?) ValueColumn
912912
}
913913
}
@@ -974,12 +974,12 @@ class JsonTests {
974974
}
975975

976976
// ⌌------------------------------⌍
977-
// | | a:[key:String, value:Any?]|
977+
// | | a:[name:String, value:Any?]|
978978
// |--|---------------------------|
979-
// | 0| [1 x 2] { key:b, value:1 }|
980-
// | 1| [3 x 2]| -> { key:c, value:2 }
981-
// | 2| [0 x 2]| { key:d, value:null }
982-
// | 3| [0 x 2]| { key:b, value:[1,2,3] }
979+
// | 0| [1 x 2] { name:b, value:1 }|
980+
// | 1| [3 x 2]| -> { name:c, value:2 }
981+
// | 2| [0 x 2]| { name:d, value:null }
982+
// | 3| [0 x 2]| { name:b, value:[1,2,3] }
983983
// | 4| [0 x 2]|
984984
// | 5| [0 x 2]|
985985
// ⌎------------------------------⌏
@@ -992,7 +992,7 @@ class JsonTests {
992992
it[0].let {
993993
it.columnsCount() shouldBe 2
994994
it.rowsCount() shouldBe 1
995-
it["key"].let {
995+
it["name"].let {
996996
it.type() shouldBe typeOf<String>()
997997
it[0] shouldBe "b"
998998
}
@@ -1004,7 +1004,7 @@ class JsonTests {
10041004
it[1].let {
10051005
it.columnsCount() shouldBe 2
10061006
it.rowsCount() shouldBe 3
1007-
it["key"].let {
1007+
it["name"].let {
10081008
it.type() shouldBe typeOf<String>()
10091009
it[0] shouldBe "c"
10101010
it[1] shouldBe "d"
@@ -1020,7 +1020,7 @@ class JsonTests {
10201020
it.columnsCount() shouldBe 2
10211021
it.rowsCount() shouldBe 0
10221022

1023-
it["key"].type() shouldBe typeOf<String>()
1023+
it["name"].type() shouldBe typeOf<String>()
10241024
it["value"].type() shouldBeIn listOf(typeOf<Any?>(), typeOf<Any>()) // no data, so Any(?) ValueColumn
10251025
}
10261026
}

‎dataframe-openapi-generator/src/test/kotlin/OpenApiTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ class OpenApiTests : JupyterReplTestCase() {
736736
interface ObjectWithAdditionalProperties : org.jetbrains.kotlinx.dataframe.io.AdditionalProperty<kotlin.String> {
737737
@ColumnName("value")
738738
override val `value`: kotlin.String
739-
override val key: kotlin.String
739+
override val name: kotlin.String
740740
public companion object {
741741
public val keyValuePaths: kotlin.collections.List<org.jetbrains.kotlinx.dataframe.api.JsonPath>
742742
get() = listOf(JsonPath(""${'"'}${'$'}""${'"'}))
@@ -769,7 +769,7 @@ class OpenApiTests : JupyterReplTestCase() {
769769
interface ObjectWithAdditional2 : org.jetbrains.kotlinx.dataframe.io.AdditionalProperty<kotlin.Any> {
770770
@ColumnName("value")
771771
override val `value`: kotlin.Any
772-
override val key: kotlin.String
772+
override val name: kotlin.String
773773
public companion object {
774774
public val keyValuePaths: kotlin.collections.List<org.jetbrains.kotlinx.dataframe.api.JsonPath>
775775
get() = listOf(JsonPath(""${'"'}${'$'}""${'"'}))
@@ -802,7 +802,7 @@ class OpenApiTests : JupyterReplTestCase() {
802802
interface ObjectWithAdditional3 : org.jetbrains.kotlinx.dataframe.io.AdditionalProperty<kotlin.Any?> {
803803
@ColumnName("value")
804804
override val `value`: kotlin.Any?
805-
override val key: kotlin.String
805+
override val name: kotlin.String
806806
public companion object {
807807
public val keyValuePaths: kotlin.collections.List<org.jetbrains.kotlinx.dataframe.api.JsonPath>
808808
get() = listOf(JsonPath(""${'"'}${'$'}""${'"'}))
@@ -916,7 +916,7 @@ class OpenApiTests : JupyterReplTestCase() {
916916
interface ObjectWithAdditional : org.jetbrains.kotlinx.dataframe.io.AdditionalProperty<kotlin.Int> {
917917
@ColumnName("value")
918918
override val `value`: kotlin.Int
919-
override val key: kotlin.String
919+
override val name: kotlin.String
920920
public companion object {
921921
public val keyValuePaths: kotlin.collections.List<org.jetbrains.kotlinx.dataframe.api.JsonPath>
922922
get() = listOf(JsonPath(""${'"'}${'$'}""${'"'}))

0 commit comments

Comments
 (0)