Skip to content

Commit 853405e

Browse files
AndreiKingsleyAndreiKingsley
committed
cols -> all() replace
1 parent daa642d commit 853405e

File tree

8 files changed

+72
-71
lines changed

8 files changed

+72
-71
lines changed

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class AllTests : ColumnsSelectionDslTests() {
4949
df.select { cols(name, age, city, weight, isHappy) },
5050
df.select { all() },
5151
df.select { all().all() },
52-
df.select { cols().all() },
53-
df.select { cols() },
52+
df.select { all().all() },
53+
df.select { all() },
5454
).shouldAllBeEqual()
5555

5656
listOf(
@@ -101,43 +101,43 @@ class AllTests : ColumnsSelectionDslTests() {
101101
val weightAccessor = column<Int?>("weight")
102102
listOf(
103103
df.select { weight and isHappy },
104-
df.select { cols().allAfter { "city" in it.name } },
105-
df.select { cols().allAfter { it.data == cityAccessor() } },
106-
df.select { cols().allAfter { it.data == city } },
107-
df.select { cols().allAfter(city) },
108-
df.select { cols().allAfter(cityAccessor) },
109-
df.select { cols().allAfter("city") },
110-
df.select { cols().allAfter(Person::city) },
111-
df.select { cols().allAfter(pathOf("city")) },
112-
df.select { cols().allFrom { "weight" in it.name } },
113-
df.select { cols().allFrom { it.data == weightAccessor() } },
114-
df.select { cols().allFrom { it.data == weight } },
115-
df.select { cols().allFrom(weight) },
116-
df.select { cols().allFrom(weightAccessor) },
117-
df.select { cols().allFrom("weight") },
118-
df.select { cols().allFrom(Person::weight) },
119-
df.select { cols().allFrom(pathOf("weight")) },
104+
df.select { all().allAfter { "city" in it.name } },
105+
df.select { all().allAfter { it.data == cityAccessor() } },
106+
df.select { all().allAfter { it.data == city } },
107+
df.select { all().allAfter(city) },
108+
df.select { all().allAfter(cityAccessor) },
109+
df.select { all().allAfter("city") },
110+
df.select { all().allAfter(Person::city) },
111+
df.select { all().allAfter(pathOf("city")) },
112+
df.select { all().allFrom { "weight" in it.name } },
113+
df.select { all().allFrom { it.data == weightAccessor() } },
114+
df.select { all().allFrom { it.data == weight } },
115+
df.select { all().allFrom(weight) },
116+
df.select { all().allFrom(weightAccessor) },
117+
df.select { all().allFrom("weight") },
118+
df.select { all().allFrom(Person::weight) },
119+
df.select { all().allFrom(pathOf("weight")) },
120120
).shouldAllBeEqual()
121121

122122
val ageAccessor = column<Int>("age")
123123
listOf(
124124
df.select { name and age },
125-
df.select { cols().allBefore { "city" in it.name } },
126-
df.select { cols().allBefore { it.data == cityAccessor() } },
127-
df.select { cols().allBefore { it.data == city } },
128-
df.select { cols().allBefore(city) },
129-
df.select { cols().allBefore(cityAccessor) },
130-
df.select { cols().allBefore("city") },
131-
df.select { cols().allBefore(Person::city) },
132-
df.select { cols().allBefore(pathOf("city")) },
133-
df.select { cols().allUpTo { "age" in it.name } },
134-
df.select { cols().allUpTo { it.data == ageAccessor() } },
135-
df.select { cols().allUpTo { it.data == age } },
136-
df.select { cols().allUpTo(age) },
137-
df.select { cols().allUpTo(ageAccessor) },
138-
df.select { cols().allUpTo("age") },
139-
df.select { cols().allUpTo(Person::age) },
140-
df.select { cols().allUpTo(pathOf("age")) },
125+
df.select { all().allBefore { "city" in it.name } },
126+
df.select { all().allBefore { it.data == cityAccessor() } },
127+
df.select { all().allBefore { it.data == city } },
128+
df.select { all().allBefore(city) },
129+
df.select { all().allBefore(cityAccessor) },
130+
df.select { all().allBefore("city") },
131+
df.select { all().allBefore(Person::city) },
132+
df.select { all().allBefore(pathOf("city")) },
133+
df.select { all().allUpTo { "age" in it.name } },
134+
df.select { all().allUpTo { it.data == ageAccessor() } },
135+
df.select { all().allUpTo { it.data == age } },
136+
df.select { all().allUpTo(age) },
137+
df.select { all().allUpTo(ageAccessor) },
138+
df.select { all().allUpTo("age") },
139+
df.select { all().allUpTo(Person::age) },
140+
df.select { all().allUpTo(pathOf("age")) },
141141
).shouldAllBeEqual()
142142
}
143143

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,26 @@ class AllExceptTests : ColumnsSelectionDslTests() {
113113
val nameAccessor = column<String>("name")
114114
listOf(
115115
df.select { cols(age, weight, isHappy) },
116-
df.select { cols().except { cols { it.name in listOf("name", "city") } } },
117-
df.select { cols().except { cityAccessor and nameAccessor } },
118-
df.select { cols().except { city and name } },
119-
df.select { cols().except(city and name) },
120-
df.select { cols().except(city, name) },
121-
df.select { cols().except(cityAccessor, nameAccessor) },
122-
df.select { cols().except("city", "name") },
123-
df.select { cols().except(Person::city, Person::name) },
124-
df.select { cols().except(pathOf("city"), pathOf("name")) },
116+
df.select { all().except { cols { it.name in listOf("name", "city") } } },
117+
df.select { all().except { cityAccessor and nameAccessor } },
118+
df.select { all().except { city and name } },
119+
df.select { all().except(city and name) },
120+
df.select { all().except(city, name) },
121+
df.select { all().except(cityAccessor, nameAccessor) },
122+
df.select { all().except("city", "name") },
123+
df.select { all().except(Person::city, Person::name) },
124+
df.select { all().except(pathOf("city"), pathOf("name")) },
125125
).shouldAllBeEqual()
126126

127127
listOf(
128128
df.select { cols(age, city, weight, isHappy) },
129-
df.select { cols() except { cols { it.name == "name" } } },
130-
df.select { cols() except cols { it.name == "name" } },
131-
df.select { cols() except nameAccessor },
132-
df.select { cols() except name },
133-
df.select { cols() except "name" },
134-
df.select { cols() except Person::name },
135-
df.select { cols() except pathOf("name") },
129+
df.select { all() except { cols { it.name == "name" } } },
130+
df.select { all() except cols { it.name == "name" } },
131+
df.select { all() except nameAccessor },
132+
df.select { all() except name },
133+
df.select { all() except "name" },
134+
df.select { all() except Person::name },
135+
df.select { all() except pathOf("name") },
136136
).shouldAllBeEqual()
137137

138138
listOf(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ColsTests : ColumnsSelectionDslTests() {
1515
@Test
1616
fun `cols exceptions`() {
1717
shouldThrow<IllegalArgumentException> {
18-
df.select { "age".cols() }
18+
df.select { "age".allCols() }
1919
}
2020
shouldThrow<IllegalArgumentException> {
2121
df.select { cols("non-existent") }
@@ -43,17 +43,17 @@ class ColsTests : ColumnsSelectionDslTests() {
4343
fun `cols and get with predicate`() {
4444
listOf(
4545
df.select { cols(name, age, city, weight, isHappy) },
46-
df.select { all().cols() },
47-
df.select { cols() },
46+
df.select { all().all() },
47+
df.select { all() },
4848
df.select { all() },
4949
).shouldAllBeEqual()
5050

5151
listOf(
5252
df.select { name },
5353
df.select { name }.select { all() },
54-
df.select { name }.select { cols() },
55-
df.select { name }.select { cols().all() },
56-
df.select { name }.select { all().cols() },
54+
df.select { name }.select { all() },
55+
df.select { name }.select { all().all() },
56+
df.select { name }.select { all().all() },
5757
).shouldAllBeEqual()
5858

5959
listOf(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class AtAnyDepth : TestBase() {
102102

103103
@Test
104104
fun `cols atAnyDepth`() {
105-
dfGroup.getColumnsWithPaths { colsAtAnyDepth().cols() }.sortedBy { it.name } shouldBe atAnyDepthGoal
105+
dfGroup.getColumnsWithPaths { colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal
106106
}
107107

108108
@Test
@@ -121,9 +121,9 @@ class AtAnyDepth : TestBase() {
121121

122122
@Test
123123
fun `cols allAtAnyDepth`() {
124-
dfGroup.getColumnsWithPaths { cols().colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal
124+
dfGroup.getColumnsWithPaths { all().colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal
125125
dfGroup
126-
.getColumnsWithPaths { cols().colsAtAnyDepth().filter { !it.isColumnGroup() } }
126+
.getColumnsWithPaths { all().colsAtAnyDepth().filter { !it.isColumnGroup() } }
127127
.sortedBy { it.name } shouldBe atAnyDepthNoGroups
128128
}
129129

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class SingleTests : ColumnsSelectionDslTests() {
1919
df.select { Person::age.singleCol() }
2020
}
2121
shouldThrow<NoSuchElementException> {
22-
df.select { cols().filter { false }.single() }
22+
df.select { all().filter { false }.single() }
2323
}
2424
shouldThrow<IllegalArgumentException> {
2525
df.select { single() }
@@ -32,7 +32,7 @@ class SingleTests : ColumnsSelectionDslTests() {
3232
singleDf.select { name },
3333
singleDf.select { single() },
3434
singleDf.select { all().single() },
35-
df.select { cols().filter { it.name().startsWith("n") }.single() },
35+
df.select { all().filter { it.name().startsWith("n") }.single() },
3636
).shouldAllBeEqual()
3737

3838
listOf(

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package org.jetbrains.kotlinx.dataframe.samples.api
44

55
import org.jetbrains.kotlinx.dataframe.api.aggregate
6+
import org.jetbrains.kotlinx.dataframe.api.all
67
import org.jetbrains.kotlinx.dataframe.api.asComparable
78
import org.jetbrains.kotlinx.dataframe.api.asGroupBy
89
import org.jetbrains.kotlinx.dataframe.api.asNumbers
@@ -411,7 +412,7 @@ class Analyze : TestBase() {
411412
df.max { name.firstName and name.lastName }
412413
df.sum { age and weight }
413414
df.mean { cols(1, 3).asNumbers() }
414-
df.median<_, String> { name.cols().cast() }
415+
df.median<_, String> { name.allCols().cast() }
415416
// SampleEnd
416417
}
417418

@@ -429,7 +430,7 @@ class Analyze : TestBase() {
429430
df.sum { "age"<Int>() and "weight"<Int?>() }
430431

431432
df.mean { cols(1, 3).asNumbers() }
432-
df.median<_, String> { name.cols().cast() }
433+
df.median<_, String> { name.allCols().cast() }
433434
// SampleEnd
434435
}
435436

@@ -441,7 +442,7 @@ class Analyze : TestBase() {
441442
df.maxFor { name.firstName and name.lastName }
442443
df.sumFor { age and weight }
443444
df.meanFor { cols(1, 3).asNumbers() }
444-
df.medianFor { name.cols().asComparable() }
445+
df.medianFor { name.allCols().asComparable() }
445446
// SampleEnd
446447
}
447448

@@ -466,7 +467,7 @@ class Analyze : TestBase() {
466467
df.sum(age, weight)
467468

468469
df.mean { cols(1, 3).asNumbers() }
469-
df.median<_, String> { name.cols().cast() }
470+
df.median<_, String> { name.allCols().cast() }
470471
// SampleEnd
471472
}
472473

@@ -482,7 +483,7 @@ class Analyze : TestBase() {
482483
df.sumFor { "age"<Int>() and "weight"<Int?>() }
483484

484485
df.meanFor { cols(1, 3).asNumbers() }
485-
df.medianFor { name.cols().asComparable() }
486+
df.medianFor { name.allCols().asComparable() }
486487
// SampleEnd
487488
}
488489

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ class Modify : TestBase() {
373373

374374
// name.firstName -> firstName
375375
// name.lastName -> lastName
376-
df.move { name.cols() }.toTop()
376+
df.move { name.allCols() }.toTop()
377377

378378
// a.b.e -> be
379379
// c.d.e -> de

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,17 @@ class DataFrameTreeTests : BaseTest() {
187187

188188
@Test
189189
fun `selects`() {
190-
df2.select { nameAndCity.cols() } shouldBe typed2.nameAndCity.select { all() }
190+
df2.select { nameAndCity.allCols() } shouldBe typed2.nameAndCity.select { all() }
191191
df2.select { nameAndCity.cols { !it.hasNulls() } } shouldBe typed2.select { nameAndCity.name }
192192
df2.select { nameAndCity.cols(0..1) } shouldBe typed2.nameAndCity.select { all() }
193193
df2.select { nameAndCity.col(1) } shouldBe typed2.select { nameAndCity.city }
194194
df2.select { nameAndCity["city"] } shouldBe typed2.select { nameAndCity.city }
195195
df2.select { nameAndCity.cols("city", "name") } shouldBe typed2.select { nameAndCity.city and nameAndCity.name }
196196
df2.select { nameAndCity.cols(name, city) } shouldBe typed2.select { nameAndCity.allCols() }
197197
df2.select { nameAndCity[name] } shouldBe typed2.nameAndCity.select { name }
198-
df2.select { nameAndCity.cols().drop(1) } shouldBe typed2.nameAndCity.select { city }
198+
df2.select { nameAndCity.allCols().drop(1) } shouldBe typed2.nameAndCity.select { city }
199199

200-
typed2.select { nameAndCity.cols() } shouldBe typed2.nameAndCity.select { all() }
200+
typed2.select { nameAndCity.allCols() } shouldBe typed2.nameAndCity.select { all() }
201201
typed2.select { nameAndCity.cols { !it.hasNulls() } } shouldBe typed2.select { nameAndCity.name }
202202
typed2.select { nameAndCity.cols(0..1) } shouldBe typed2.nameAndCity.select { all() }
203203
typed2.select { nameAndCity.col(1) } shouldBe typed2.select { nameAndCity.city }
@@ -206,7 +206,7 @@ class DataFrameTreeTests : BaseTest() {
206206
typed2.select { nameAndCity.city and nameAndCity.name }
207207
typed2.select { nameAndCity.cols(name, city) } shouldBe typed2.select { nameAndCity.allCols() }
208208
typed2.select { nameAndCity[name] } shouldBe typed2.nameAndCity.select { name }
209-
typed2.select { nameAndCity.cols().drop(1) } shouldBe typed2.nameAndCity.select { city }
209+
typed2.select { nameAndCity.allCols().drop(1) } shouldBe typed2.nameAndCity.select { city }
210210

211211
df2.select { col(1) } shouldBe typed2.select { age }
212212
df2.select { nameInGroup } shouldBe typed2.nameAndCity.select { name }

0 commit comments

Comments
 (0)