Skip to content

Commit 9a87d0e

Browse files
committed
fixed tests csv, fixed gradle plugin delimiter for csv
1 parent 546f021 commit 9a87d0e

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

core/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ dependencies {
8686
testImplementation(libs.jsoup)
8787
testImplementation(libs.sl4jsimple)
8888

89-
// for JupyterCodegenTests only
90-
testRuntimeOnly(project(":dataframe-csv"))
89+
// for JupyterCodegenTests and samples.api
90+
testImplementation(project(":dataframe-csv"))
9191
}
9292

9393
val samplesImplementation by configurations.getting {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ class Schemas {
127127
@TransformDataFrameExpressions
128128
fun useInferredSchema() {
129129
// SampleStart
130-
// Repository.readCSV() has argument 'path' with default value https://raw.githubusercontent.com/Kotlin/dataframe/master/data/jetbrains_repositories.csv
131-
val df = Repository.readCSV()
130+
// Repository.readCsv() has argument 'path' with default value https://raw.githubusercontent.com/Kotlin/dataframe/master/data/jetbrains_repositories.csv
131+
val df = Repository.readCsv()
132132
// Use generated properties to access data in rows
133133
df.maxBy { stargazersCount }.print()
134134
// Or to access columns in dataframe.

dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import kotlin.reflect.typeOf
1212

1313
public class CsvDeephaven(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat {
1414
override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
15-
DataFrame.readCsv(inputStream = stream, header = header)
15+
DataFrame.readCsv(inputStream = stream, header = header, delimiter = delimiter)
1616

1717
override fun readDataFrame(file: File, header: List<String>): DataFrame<*> =
18-
DataFrame.readCsv(file = file, header = header)
18+
DataFrame.readCsv(file = file, header = header, delimiter = delimiter)
1919

2020
override fun acceptsExtension(ext: String): Boolean = ext == "csv"
2121

dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import kotlin.reflect.typeOf
1212

1313
public class TsvDeephaven(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat {
1414
override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
15-
DataFrame.readTsv(inputStream = stream, header = header)
15+
DataFrame.readTsv(inputStream = stream, header = header, delimiter = delimiter)
1616

1717
override fun readDataFrame(file: File, header: List<String>): DataFrame<*> =
18-
DataFrame.readTsv(file = file, header = header)
18+
DataFrame.readTsv(file = file, header = header, delimiter = delimiter)
1919

2020
override fun acceptsExtension(ext: String): Boolean = ext == "tsv"
2121

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import kotlinx.serialization.SerializationException
99
import org.jetbrains.kotlinx.dataframe.DataFrame
1010
import org.jetbrains.kotlinx.dataframe.api.isEmpty
1111
import org.jetbrains.kotlinx.dataframe.io.read
12+
import org.jetbrains.kotlinx.dataframe.io.readCsv
1213
import org.jetbrains.kotlinx.dataframe.io.readSqlTable
1314
import org.junit.Test
1415
import java.io.File
@@ -82,7 +83,7 @@ class DataFrameReadTest {
8283
@Test
8384
fun `data accessible and readable`() {
8485
shouldNotThrowAny {
85-
DataFrame.read(Paths.get("../../data/jetbrains repositories.csv").absolutePathString())
86+
DataFrame.readCsv(Paths.get("../../data/jetbrains repositories.csv").absolutePathString(), skipLines = 1)
8687
}
8788
}
8889

0 commit comments

Comments
 (0)