Skip to content

Commit 456f454

Browse files
koperagenkoperagen
committed
Remove examples for deprecated overloads from tests
1 parent 1ca32d4 commit 456f454

File tree

6 files changed

+0
-1041
lines changed

6 files changed

+0
-1041
lines changed

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

Lines changed: 0 additions & 260 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.jetbrains.kotlinx.dataframe.api.after
77
import org.jetbrains.kotlinx.dataframe.api.chunked
88
import org.jetbrains.kotlinx.dataframe.api.colsOf
99
import org.jetbrains.kotlinx.dataframe.api.column
10-
import org.jetbrains.kotlinx.dataframe.api.columnGroup
1110
import org.jetbrains.kotlinx.dataframe.api.columnOf
1211
import org.jetbrains.kotlinx.dataframe.api.countDistinct
1312
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
@@ -68,19 +67,6 @@ class Access : TestBase() {
6867
// SampleEnd
6968
}
7069

71-
@Test
72-
@TransformDataFrameExpressions
73-
fun getColumnByName_accessors() {
74-
// SampleStart
75-
val age by column<Int>()
76-
val name by columnGroup()
77-
val lastName by name.column<String>()
78-
79-
df[age]
80-
df[lastName]
81-
// SampleEnd
82-
}
83-
8470
@Test
8571
@TransformDataFrameExpressions
8672
fun getColumnByName_strings() {
@@ -98,16 +84,6 @@ class Access : TestBase() {
9884
// SampleEnd
9985
}
10086

101-
@Test
102-
@TransformDataFrameExpressions
103-
fun getColumn_accessors() {
104-
// SampleStart
105-
val age by column<Int>()
106-
107-
df.getColumn { age }
108-
// SampleEnd
109-
}
110-
11187
@Test
11288
@TransformDataFrameExpressions
11389
fun getColumn_strings() {
@@ -124,16 +100,6 @@ class Access : TestBase() {
124100
// SampleEnd
125101
}
126102

127-
@Test
128-
@TransformDataFrameExpressions
129-
fun getColumnOrNull_accessors() {
130-
// SampleStart
131-
val age by column<Int>()
132-
133-
df.getColumnOrNull(age)
134-
// SampleEnd
135-
}
136-
137103
@Test
138104
@TransformDataFrameExpressions
139105
fun getColumnOrNull_strings() {
@@ -150,17 +116,6 @@ class Access : TestBase() {
150116
// SampleEnd
151117
}
152118

153-
@Test
154-
@TransformDataFrameExpressions
155-
fun getColumns_accessors() {
156-
// SampleStart
157-
val age by column<Int>()
158-
val name by columnGroup()
159-
160-
df.getColumns { age and name }
161-
// SampleEnd
162-
}
163-
164119
@Test
165120
@TransformDataFrameExpressions
166121
fun getColumns_strings() {
@@ -177,16 +132,6 @@ class Access : TestBase() {
177132
// SampleEnd
178133
}
179134

180-
@Test
181-
@TransformDataFrameExpressions
182-
fun getColumnGroup_accessors() {
183-
// SampleStart
184-
val name by columnGroup()
185-
186-
df.getColumnGroup(name)
187-
// SampleEnd
188-
}
189-
190135
@Test
191136
@TransformDataFrameExpressions
192137
fun getColumnGroup_strings() {
@@ -224,23 +169,6 @@ class Access : TestBase() {
224169
// SampleEnd
225170
}
226171

227-
@Test
228-
@TransformDataFrameExpressions
229-
fun getRowByCondition_accessors() {
230-
// SampleStart
231-
val age by column<Int>()
232-
val weight by column<Int?>()
233-
val name by columnGroup()
234-
val firstName by name.column<String>()
235-
236-
df.single { age() == 45 }
237-
df.first { weight() != null }
238-
df.minBy(age)
239-
df.maxBy { firstName().length }
240-
df.maxByOrNull { weight() }
241-
// SampleEnd
242-
}
243-
244172
@Test
245173
@TransformDataFrameExpressions
246174
fun getRowByCondition_strings() {
@@ -271,17 +199,6 @@ class Access : TestBase() {
271199
// SampleEnd
272200
}
273201

274-
@Test
275-
@TransformDataFrameExpressions
276-
fun getCell_accessors() {
277-
// SampleStart
278-
val age by column<String>()
279-
280-
df[age][1]
281-
df[1][age]
282-
// SampleEnd
283-
}
284-
285202
@Test
286203
@TransformDataFrameExpressions
287204
fun getColumnsByName_properties() {
@@ -290,17 +207,6 @@ class Access : TestBase() {
290207
// SampleEnd
291208
}
292209

293-
@Test
294-
@TransformDataFrameExpressions
295-
fun getColumnsByName_accessors() {
296-
// SampleStart
297-
val age by column<Int>()
298-
val weight by column<Int?>()
299-
300-
df[age, weight]
301-
// SampleEnd
302-
}
303-
304210
@Test
305211
@TransformDataFrameExpressions
306212
fun getColumnsByName_strings() {
@@ -317,18 +223,6 @@ class Access : TestBase() {
317223
// SampleEnd
318224
}
319225

320-
@Test
321-
@TransformDataFrameExpressions
322-
fun select_accessors() {
323-
// SampleStart
324-
val age by column<Int>()
325-
val weight by column<Int?>()
326-
327-
df.select { age and weight }
328-
df.select(age, weight)
329-
// SampleEnd
330-
}
331-
332226
@Test
333227
@TransformDataFrameExpressions
334228
fun select_strings() {
@@ -422,20 +316,6 @@ class Access : TestBase() {
422316
// SampleEnd
423317
}
424318

425-
@Test
426-
@TransformDataFrameExpressions
427-
fun filter_accessors() {
428-
// SampleStart
429-
val age by column<Int>()
430-
val name by columnGroup()
431-
val firstName by name.column<String>()
432-
433-
df.filter { age() > 18 && firstName().startsWith("A") }
434-
// or
435-
df.filter { it[age] > 18 && it[firstName].startsWith("A") }
436-
// SampleEnd
437-
}
438-
439319
@Test
440320
@TransformDataFrameExpressions
441321
fun filter_strings() {
@@ -452,15 +332,6 @@ class Access : TestBase() {
452332
// SampleEnd
453333
}
454334

455-
@Test
456-
@TransformDataFrameExpressions
457-
fun filterBy_accessors() {
458-
// SampleStart
459-
val isHappy by column<Boolean>()
460-
df.filterBy { isHappy }
461-
// SampleEnd
462-
}
463-
464335
@Test
465336
@TransformDataFrameExpressions
466337
fun filterBy_strings() {
@@ -477,20 +348,6 @@ class Access : TestBase() {
477348
// SampleEnd
478349
}
479350

480-
@Test
481-
@TransformDataFrameExpressions
482-
fun dropWhere_accessors() {
483-
// SampleStart
484-
val name by columnGroup()
485-
val weight by column<Int?>()
486-
val city by column<String?>()
487-
488-
df.drop { weight() == null || city() == null }
489-
// or
490-
df.drop { it[weight] == null || it[city] == null }
491-
// SampleEnd
492-
}
493-
494351
@Test
495352
@TransformDataFrameExpressions
496353
fun dropWhere_strings() {
@@ -545,18 +402,6 @@ class Access : TestBase() {
545402
// TODO: df["age"][2..4]
546403
}
547404

548-
@Test
549-
@TransformDataFrameExpressions
550-
fun byColumn_accessors() {
551-
// SampleStart
552-
val name by column<String>()
553-
val age by column<Int>()
554-
df[name][0]
555-
df[name, age][3, 5, 6]
556-
// SampleEnd
557-
// TODO: df[age][2..4]
558-
}
559-
560405
@Test
561406
@TransformDataFrameExpressions
562407
fun byColumn_properties() {
@@ -577,18 +422,6 @@ class Access : TestBase() {
577422
// SampleEnd
578423
}
579424

580-
@Test
581-
@TransformDataFrameExpressions
582-
fun byRow_accessors() {
583-
// SampleStart
584-
val name by column<String>()
585-
val age by column<Int>()
586-
df[0][name]
587-
df[3, 5, 6][name, age]
588-
df[3..5][age]
589-
// SampleEnd
590-
}
591-
592425
@Test
593426
@TransformDataFrameExpressions
594427
fun byRow_properties() {
@@ -659,18 +492,6 @@ class Access : TestBase() {
659492
// SampleEnd
660493
}
661494

662-
@Test
663-
@TransformDataFrameExpressions
664-
fun distinctColumns_accessors() {
665-
// SampleStart
666-
val age by column<Int>()
667-
val name by columnGroup()
668-
df.distinct { age and name }
669-
// same as
670-
df.select { age and name }.distinct()
671-
// SampleEnd
672-
}
673-
674495
@Test
675496
@TransformDataFrameExpressions
676497
fun countDistinct() {
@@ -687,16 +508,6 @@ class Access : TestBase() {
687508
// SampleEnd
688509
}
689510

690-
@Test
691-
@TransformDataFrameExpressions
692-
fun countDistinctColumns_accessors() {
693-
// SampleStart
694-
val age by column<Int>()
695-
val name by columnGroup()
696-
df.countDistinct { age and name }
697-
// SampleEnd
698-
}
699-
700511
@Test
701512
@TransformDataFrameExpressions
702513
fun countDistinctColumns_strings() {
@@ -725,20 +536,6 @@ class Access : TestBase() {
725536
// SampleEnd
726537
}
727538

728-
@Test
729-
@TransformDataFrameExpressions
730-
fun distinctBy_accessors() {
731-
// SampleStart
732-
val age by column<Int>()
733-
val name by columnGroup()
734-
val firstName by name.column<String>()
735-
736-
df.distinctBy { age and name }
737-
// same as
738-
df.groupBy { age and name }.mapToRows { group.first() }
739-
// SampleEnd
740-
}
741-
742539
@Test
743540
@TransformDataFrameExpressions
744541
fun distinctBy_strings() {
@@ -798,43 +595,6 @@ class Access : TestBase() {
798595
// SampleEnd
799596
}
800597

801-
@Test
802-
@TransformDataFrameExpressions
803-
fun columnSelectors_accessors() {
804-
// SampleStart
805-
// by column name
806-
val name by columnGroup()
807-
df.select { it[name] }
808-
df.select { name }
809-
810-
// by column path
811-
val firstName by name.column<String>()
812-
df.select { firstName }
813-
814-
// with a new name
815-
df.select { name named "Full Name" }
816-
817-
// converted
818-
df.select { firstName.map { it.lowercase() } }
819-
820-
// column arithmetics
821-
val age by column<Int>()
822-
df.select { 2021 - age }
823-
824-
// two columns
825-
df.select { name and age }
826-
827-
// range of columns
828-
df.select { name..age }
829-
830-
// all columns of ColumnGroup
831-
df.select { name.allCols() }
832-
833-
// traversal of columns at any depth from here excluding ColumnGroups
834-
df.select { name.colsAtAnyDepth { !it.isColumnGroup() } }
835-
// SampleEnd
836-
}
837-
838598
@Test
839599
fun columnSelectors_kproperties() {
840600
// SampleStart
@@ -1019,26 +779,6 @@ class Access : TestBase() {
1019779
// SampleEnd
1020780
}
1021781

1022-
@Test
1023-
@TransformDataFrameExpressions
1024-
fun forRows_accessors() {
1025-
// SampleStart
1026-
val age by column<Int>()
1027-
1028-
for (row in df) {
1029-
println(row[age])
1030-
}
1031-
1032-
df.forEach {
1033-
println(it[age])
1034-
}
1035-
1036-
df.rows().forEach {
1037-
println(it[age])
1038-
}
1039-
// SampleEnd
1040-
}
1041-
1042782
@Test
1043783
@TransformDataFrameExpressions
1044784
fun forRows_strings() {

0 commit comments

Comments
 (0)