Skip to content

Commit 35e4e19

Browse files
JolanrensenJolanrensen
committed
Applying KT-64092 temp-fix to all(Cols)X functions as well
1 parent 9ed12ed commit 35e4e19

File tree

1 file changed

+42
-0
lines changed
  • core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api

1 file changed

+42
-0
lines changed

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ class AllTests : ColumnsSelectionDslTests() {
151151
).shouldAllBeEqual()
152152
}
153153

154+
@Suppress("CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION")
154155
@Test
155156
fun `all subset at lower level after and from`() {
156157
listOf(
@@ -182,6 +183,7 @@ class AllTests : ColumnsSelectionDslTests() {
182183
df.select { "name".allColsAfter(pathOf("firstName")) },
183184
df.select { "name".allColsAfter(pathOf("name", "firstName")) },
184185

186+
df.select { Person::name.allColsAfter { firstName } },
185187
df.select { Person::name.allColsAfter { firstNameAccessor } },
186188
df.select { Person::name.allColsAfter(name.firstName) },
187189
df.select { Person::name.allColsAfter(firstNameAccessor) },
@@ -190,6 +192,15 @@ class AllTests : ColumnsSelectionDslTests() {
190192
df.select { Person::name.allColsAfter(pathOf("firstName")) },
191193
df.select { Person::name.allColsAfter(pathOf("name", "firstName")) },
192194

195+
df.select { NonDataSchemaPerson::name.allColsAfter { firstName } },
196+
df.select { NonDataSchemaPerson::name.allColsAfter { firstNameAccessor } },
197+
df.select { NonDataSchemaPerson::name.allColsAfter(name.firstName) },
198+
df.select { NonDataSchemaPerson::name.allColsAfter(firstNameAccessor) },
199+
df.select { NonDataSchemaPerson::name.allColsAfter("firstName") },
200+
df.select { NonDataSchemaPerson::name.allColsAfter(Name::firstName) },
201+
df.select { NonDataSchemaPerson::name.allColsAfter(pathOf("firstName")) },
202+
df.select { NonDataSchemaPerson::name.allColsAfter(pathOf("name", "firstName")) },
203+
193204
df.select { pathOf("name").allColsAfter { firstNameAccessor } },
194205
df.select { pathOf("name").allColsAfter(name.firstName) },
195206
df.select { pathOf("name").allColsAfter(firstNameAccessor) },
@@ -215,6 +226,7 @@ class AllTests : ColumnsSelectionDslTests() {
215226
df.select { "name".allColsFrom(pathOf("lastName")) },
216227
df.select { "name".allColsFrom(pathOf("name", "lastName")) },
217228

229+
df.select { Person::name.allColsFrom { lastName } },
218230
df.select { Person::name.allColsFrom { lastNameAccessor } },
219231
df.select { Person::name.allColsFrom(name.lastName) },
220232
df.select { Person::name.allColsFrom(lastNameAccessor) },
@@ -223,6 +235,15 @@ class AllTests : ColumnsSelectionDslTests() {
223235
df.select { Person::name.allColsFrom(pathOf("lastName")) },
224236
df.select { Person::name.allColsFrom(pathOf("name", "lastName")) },
225237

238+
df.select { NonDataSchemaPerson::name.allColsFrom { lastName } },
239+
df.select { NonDataSchemaPerson::name.allColsFrom { lastNameAccessor } },
240+
df.select { NonDataSchemaPerson::name.allColsFrom(name.lastName) },
241+
df.select { NonDataSchemaPerson::name.allColsFrom(lastNameAccessor) },
242+
df.select { NonDataSchemaPerson::name.allColsFrom("lastName") },
243+
df.select { NonDataSchemaPerson::name.allColsFrom(Name::lastName) },
244+
df.select { NonDataSchemaPerson::name.allColsFrom(pathOf("lastName")) },
245+
df.select { NonDataSchemaPerson::name.allColsFrom(pathOf("name", "lastName")) },
246+
226247
df.select { pathOf("name").allColsFrom { lastNameAccessor } },
227248
df.select { pathOf("name").allColsFrom(name.lastName) },
228249
df.select { pathOf("name").allColsFrom(lastNameAccessor) },
@@ -233,6 +254,7 @@ class AllTests : ColumnsSelectionDslTests() {
233254
).shouldAllBeEqual()
234255
}
235256

257+
@Suppress("CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION")
236258
@Test
237259
fun `all subset at lower level before and upTo`() {
238260
val firstNameAccessor = column<String>("firstName")
@@ -258,6 +280,7 @@ class AllTests : ColumnsSelectionDslTests() {
258280
df.select { "name".allColsBefore(pathOf("lastName")) },
259281
df.select { "name".allColsBefore(pathOf("name", "lastName")) },
260282

283+
df.select { Person::name.allColsBefore { lastName } },
261284
df.select { Person::name.allColsBefore { lastNameAccessor } },
262285
df.select { Person::name.allColsBefore(name.lastName) },
263286
df.select { Person::name.allColsBefore(lastNameAccessor) },
@@ -266,6 +289,15 @@ class AllTests : ColumnsSelectionDslTests() {
266289
df.select { Person::name.allColsBefore(pathOf("lastName")) },
267290
df.select { Person::name.allColsBefore(pathOf("name", "lastName")) },
268291

292+
df.select { NonDataSchemaPerson::name.allColsBefore { lastName } },
293+
df.select { NonDataSchemaPerson::name.allColsBefore { lastNameAccessor } },
294+
df.select { NonDataSchemaPerson::name.allColsBefore(name.lastName) },
295+
df.select { NonDataSchemaPerson::name.allColsBefore(lastNameAccessor) },
296+
df.select { NonDataSchemaPerson::name.allColsBefore("lastName") },
297+
df.select { NonDataSchemaPerson::name.allColsBefore(Name::lastName) },
298+
df.select { NonDataSchemaPerson::name.allColsBefore(pathOf("lastName")) },
299+
df.select { NonDataSchemaPerson::name.allColsBefore(pathOf("name", "lastName")) },
300+
269301
df.select { pathOf("name").allColsBefore { lastNameAccessor } },
270302
df.select { pathOf("name").allColsBefore(name.lastName) },
271303
df.select { pathOf("name").allColsBefore(lastNameAccessor) },
@@ -291,6 +323,7 @@ class AllTests : ColumnsSelectionDslTests() {
291323
df.select { "name".allColsUpTo(pathOf("firstName")) },
292324
df.select { "name".allColsUpTo(pathOf("name", "firstName")) },
293325

326+
df.select { Person::name.allColsUpTo { firstName } },
294327
df.select { Person::name.allColsUpTo { firstNameAccessor } },
295328
df.select { Person::name.allColsUpTo(name.firstName) },
296329
df.select { Person::name.allColsUpTo(firstNameAccessor) },
@@ -299,6 +332,15 @@ class AllTests : ColumnsSelectionDslTests() {
299332
df.select { Person::name.allColsUpTo(pathOf("firstName")) },
300333
df.select { Person::name.allColsUpTo(pathOf("name", "firstName")) },
301334

335+
df.select { NonDataSchemaPerson::name.allColsUpTo { firstName } },
336+
df.select { NonDataSchemaPerson::name.allColsUpTo { firstNameAccessor } },
337+
df.select { NonDataSchemaPerson::name.allColsUpTo(name.firstName) },
338+
df.select { NonDataSchemaPerson::name.allColsUpTo(firstNameAccessor) },
339+
df.select { NonDataSchemaPerson::name.allColsUpTo("firstName") },
340+
df.select { NonDataSchemaPerson::name.allColsUpTo(Name::firstName) },
341+
df.select { NonDataSchemaPerson::name.allColsUpTo(pathOf("firstName")) },
342+
df.select { NonDataSchemaPerson::name.allColsUpTo(pathOf("name", "firstName")) },
343+
302344
df.select { pathOf("name").allColsUpTo { firstNameAccessor } },
303345
df.select { pathOf("name").allColsUpTo(name.firstName) },
304346
df.select { pathOf("name").allColsUpTo(firstNameAccessor) },

0 commit comments

Comments
 (0)