Skip to content

Remove examples for deprecated overloads from tests #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.jetbrains.kotlinx.dataframe.api.after
import org.jetbrains.kotlinx.dataframe.api.chunked
import org.jetbrains.kotlinx.dataframe.api.colsOf
import org.jetbrains.kotlinx.dataframe.api.column
import org.jetbrains.kotlinx.dataframe.api.columnGroup
import org.jetbrains.kotlinx.dataframe.api.columnOf
import org.jetbrains.kotlinx.dataframe.api.countDistinct
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
Expand Down Expand Up @@ -68,19 +67,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnByName_accessors() {
// SampleStart
val age by column<Int>()
val name by columnGroup()
val lastName by name.column<String>()

df[age]
df[lastName]
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnByName_strings() {
Expand All @@ -98,16 +84,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumn_accessors() {
// SampleStart
val age by column<Int>()

df.getColumn { age }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumn_strings() {
Expand All @@ -124,16 +100,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnOrNull_accessors() {
// SampleStart
val age by column<Int>()

df.getColumnOrNull(age)
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnOrNull_strings() {
Expand All @@ -150,17 +116,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumns_accessors() {
// SampleStart
val age by column<Int>()
val name by columnGroup()

df.getColumns { age and name }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumns_strings() {
Expand All @@ -177,16 +132,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnGroup_accessors() {
// SampleStart
val name by columnGroup()

df.getColumnGroup(name)
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnGroup_strings() {
Expand Down Expand Up @@ -224,23 +169,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getRowByCondition_accessors() {
// SampleStart
val age by column<Int>()
val weight by column<Int?>()
val name by columnGroup()
val firstName by name.column<String>()

df.single { age() == 45 }
df.first { weight() != null }
df.minBy(age)
df.maxBy { firstName().length }
df.maxByOrNull { weight() }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getRowByCondition_strings() {
Expand Down Expand Up @@ -271,17 +199,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getCell_accessors() {
// SampleStart
val age by column<String>()

df[age][1]
df[1][age]
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnsByName_properties() {
Expand All @@ -290,17 +207,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnsByName_accessors() {
// SampleStart
val age by column<Int>()
val weight by column<Int?>()

df[age, weight]
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun getColumnsByName_strings() {
Expand All @@ -317,18 +223,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun select_accessors() {
// SampleStart
val age by column<Int>()
val weight by column<Int?>()

df.select { age and weight }
df.select(age, weight)
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun select_strings() {
Expand Down Expand Up @@ -422,20 +316,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun filter_accessors() {
// SampleStart
val age by column<Int>()
val name by columnGroup()
val firstName by name.column<String>()

df.filter { age() > 18 && firstName().startsWith("A") }
// or
df.filter { it[age] > 18 && it[firstName].startsWith("A") }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun filter_strings() {
Expand All @@ -452,15 +332,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun filterBy_accessors() {
// SampleStart
val isHappy by column<Boolean>()
df.filterBy { isHappy }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun filterBy_strings() {
Expand All @@ -477,20 +348,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun dropWhere_accessors() {
// SampleStart
val name by columnGroup()
val weight by column<Int?>()
val city by column<String?>()

df.drop { weight() == null || city() == null }
// or
df.drop { it[weight] == null || it[city] == null }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun dropWhere_strings() {
Expand Down Expand Up @@ -545,18 +402,6 @@ class Access : TestBase() {
// TODO: df["age"][2..4]
}

@Test
@TransformDataFrameExpressions
fun byColumn_accessors() {
// SampleStart
val name by column<String>()
val age by column<Int>()
df[name][0]
df[name, age][3, 5, 6]
// SampleEnd
// TODO: df[age][2..4]
}

@Test
@TransformDataFrameExpressions
fun byColumn_properties() {
Expand All @@ -577,18 +422,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun byRow_accessors() {
// SampleStart
val name by column<String>()
val age by column<Int>()
df[0][name]
df[3, 5, 6][name, age]
df[3..5][age]
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun byRow_properties() {
Expand Down Expand Up @@ -659,18 +492,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun distinctColumns_accessors() {
// SampleStart
val age by column<Int>()
val name by columnGroup()
df.distinct { age and name }
// same as
df.select { age and name }.distinct()
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun countDistinct() {
Expand All @@ -687,16 +508,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun countDistinctColumns_accessors() {
// SampleStart
val age by column<Int>()
val name by columnGroup()
df.countDistinct { age and name }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun countDistinctColumns_strings() {
Expand Down Expand Up @@ -725,20 +536,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun distinctBy_accessors() {
// SampleStart
val age by column<Int>()
val name by columnGroup()
val firstName by name.column<String>()

df.distinctBy { age and name }
// same as
df.groupBy { age and name }.mapToRows { group.first() }
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun distinctBy_strings() {
Expand Down Expand Up @@ -798,43 +595,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun columnSelectors_accessors() {
// SampleStart
// by column name
val name by columnGroup()
df.select { it[name] }
df.select { name }

// by column path
val firstName by name.column<String>()
df.select { firstName }

// with a new name
df.select { name named "Full Name" }

// converted
df.select { firstName.map { it.lowercase() } }

// column arithmetics
val age by column<Int>()
df.select { 2021 - age }

// two columns
df.select { name and age }

// range of columns
df.select { name..age }

// all columns of ColumnGroup
df.select { name.allCols() }

// traversal of columns at any depth from here excluding ColumnGroups
df.select { name.colsAtAnyDepth { !it.isColumnGroup() } }
// SampleEnd
}

@Test
fun columnSelectors_kproperties() {
// SampleStart
Expand Down Expand Up @@ -1019,26 +779,6 @@ class Access : TestBase() {
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun forRows_accessors() {
// SampleStart
val age by column<Int>()

for (row in df) {
println(row[age])
}

df.forEach {
println(it[age])
}

df.rows().forEach {
println(it[age])
}
// SampleEnd
}

@Test
@TransformDataFrameExpressions
fun forRows_strings() {
Expand Down
Loading
Loading