Skip to content

Commit ecd971a

Browse files
author
Sven Obser
committed
Refactor tests
1 parent 84bc636 commit ecd971a

21 files changed

+710
-884
lines changed

‎library/src/test/kotlin/kotlinx/serialization/csv/config/CsvDelimiterTest.kt‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import kotlinx.serialization.csv.Csv
55
import kotlinx.serialization.csv.CsvConfiguration
66
import kotlinx.serialization.csv.records.ComplexRecord
77
import kotlinx.serialization.csv.records.Enum
8-
import kotlinx.serialization.test.assertStringFormAndRestored
8+
import kotlinx.serialization.test.assertEncodeAndDecode
99
import kotlin.test.Test
1010

1111
/**
@@ -15,7 +15,7 @@ import kotlin.test.Test
1515
class CsvDelimiterTest {
1616

1717
@Test
18-
fun testDefault() = assertStringFormAndRestored(
18+
fun testDefault() = Csv.assertEncodeAndDecode(
1919
"-150,-1,42,9223372036854775807,-2.0,24.24,true,testing,,kotlin.Unit,FIRST",
2020
ComplexRecord(
2121
-150,
@@ -30,12 +30,15 @@ class CsvDelimiterTest {
3030
Unit,
3131
Enum.FIRST
3232
),
33-
ComplexRecord.serializer(),
34-
Csv
33+
ComplexRecord.serializer()
3534
)
3635

3736
@Test
38-
fun testComma() = assertStringFormAndRestored(
37+
fun testComma() = Csv(
38+
CsvConfiguration(
39+
delimiter = ','
40+
)
41+
).assertEncodeAndDecode(
3942
"-150,-1,42,9223372036854775807,-2.0,24.24,true,testing,,kotlin.Unit,FIRST",
4043
ComplexRecord(
4144
-150,
@@ -50,16 +53,15 @@ class CsvDelimiterTest {
5053
Unit,
5154
Enum.FIRST
5255
),
53-
ComplexRecord.serializer(),
54-
Csv(
55-
CsvConfiguration(
56-
delimiter = ','
57-
)
58-
)
56+
ComplexRecord.serializer()
5957
)
6058

6159
@Test
62-
fun testColon() = assertStringFormAndRestored(
60+
fun testColon() = Csv(
61+
CsvConfiguration(
62+
delimiter = ';'
63+
)
64+
).assertEncodeAndDecode(
6365
"-150;-1;42;9223372036854775807;-2.0;24.24;true;testing;;kotlin.Unit;FIRST",
6466
ComplexRecord(
6567
-150,
@@ -74,16 +76,15 @@ class CsvDelimiterTest {
7476
Unit,
7577
Enum.FIRST
7678
),
77-
ComplexRecord.serializer(),
78-
Csv(
79-
CsvConfiguration(
80-
delimiter = ';'
81-
)
82-
)
79+
ComplexRecord.serializer()
8380
)
8481

8582
@Test
86-
fun testDot() = assertStringFormAndRestored(
83+
fun testDot() = Csv(
84+
CsvConfiguration(
85+
delimiter = '.'
86+
)
87+
).assertEncodeAndDecode(
8788
"-150.-1.42.9223372036854775807.\"-2.0\".\"24.24\".true.testing..\"kotlin.Unit\".FIRST",
8889
ComplexRecord(
8990
-150,
@@ -98,16 +99,15 @@ class CsvDelimiterTest {
9899
Unit,
99100
Enum.FIRST
100101
),
101-
ComplexRecord.serializer(),
102-
Csv(
103-
CsvConfiguration(
104-
delimiter = '.'
105-
)
106-
)
102+
ComplexRecord.serializer()
107103
)
108104

109105
@Test
110-
fun testTab() = assertStringFormAndRestored(
106+
fun testTab() = Csv(
107+
CsvConfiguration(
108+
delimiter = '\t'
109+
)
110+
).assertEncodeAndDecode(
111111
"-150\t-1\t42\t9223372036854775807\t-2.0\t24.24\ttrue\ttesting\t\tkotlin.Unit\tFIRST",
112112
ComplexRecord(
113113
-150,
@@ -122,11 +122,6 @@ class CsvDelimiterTest {
122122
Unit,
123123
Enum.FIRST
124124
),
125-
ComplexRecord.serializer(),
126-
Csv(
127-
CsvConfiguration(
128-
delimiter = '\t'
129-
)
130-
)
125+
ComplexRecord.serializer()
131126
)
132127
}

‎library/src/test/kotlin/kotlinx/serialization/csv/config/CsvEmptyLinesTest.kt‎

Lines changed: 64 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import kotlinx.serialization.csv.Csv
77
import kotlinx.serialization.csv.CsvConfiguration
88
import kotlinx.serialization.csv.records.IntStringRecord
99
import kotlinx.serialization.csv.records.NullRecord
10-
import kotlinx.serialization.test.assertParse
10+
import kotlinx.serialization.test.assertDecode
1111
import kotlin.test.Test
1212

1313
/**
@@ -17,139 +17,129 @@ import kotlin.test.Test
1717
class CsvEmptyLinesTest {
1818

1919
@Test
20-
fun testIntList() = assertParse(
20+
fun testIntList() = Csv(
21+
CsvConfiguration(
22+
ignoreEmptyLines = true
23+
)
24+
).assertDecode(
2125
"\r\n-150\r\n150\r\n\r\n42\r\n",
2226
listOf(-150, 150, 42),
23-
ListSerializer(Int.serializer()),
24-
Csv(
25-
CsvConfiguration(
26-
ignoreEmptyLines = true
27-
)
28-
)
27+
ListSerializer(Int.serializer())
2928
)
3029

3130
@Test
32-
fun testEmptyIntList() = assertParse(
31+
fun testEmptyIntList() = Csv(
32+
CsvConfiguration(
33+
ignoreEmptyLines = true
34+
)
35+
).assertDecode(
3336
"\r\n\r\n\r\n\r\n",
3437
listOf(),
35-
ListSerializer(Int.serializer()),
36-
Csv(
37-
CsvConfiguration(
38-
ignoreEmptyLines = true
39-
)
40-
)
38+
ListSerializer(Int.serializer())
4139
)
4240

4341
@Test
44-
fun testRecordList() = assertParse(
42+
fun testRecordList() = Csv(
43+
CsvConfiguration(
44+
ignoreEmptyLines = true
45+
)
46+
).assertDecode(
4547
"\r\n\r\n1,testing\r\n\r\n2,bar\r\n\r\n",
4648
listOf(
4749
IntStringRecord(1, "testing"),
4850
IntStringRecord(2, "bar")
4951
),
50-
ListSerializer(IntStringRecord.serializer()),
51-
Csv(
52-
CsvConfiguration(
53-
ignoreEmptyLines = true
54-
)
55-
)
52+
ListSerializer(IntStringRecord.serializer())
5653
)
5754

5855
@Test
59-
fun testEmptyRecordList() = assertParse(
56+
fun testEmptyRecordList() = Csv(
57+
CsvConfiguration(
58+
ignoreEmptyLines = true
59+
)
60+
).assertDecode(
6061
"\r\n\r\n\r\n\r\n",
6162
listOf(),
6263
ListSerializer(IntStringRecord.serializer()),
63-
Csv(
64-
CsvConfiguration(
65-
ignoreEmptyLines = true
66-
)
67-
)
6864
)
6965

7066
@Test
71-
fun testRecordListWithHeaders() = assertParse(
67+
fun testRecordListWithHeaders() = Csv(
68+
CsvConfiguration(
69+
ignoreEmptyLines = true,
70+
hasHeaderRecord = true
71+
)
72+
).assertDecode(
7273
"\r\na,b\r\n\r\n1,testing\r\n\r\n2,bar\r\n\r\n",
7374
listOf(
7475
IntStringRecord(1, "testing"),
7576
IntStringRecord(2, "bar")
7677
),
77-
ListSerializer(IntStringRecord.serializer()),
78-
Csv(
79-
CsvConfiguration(
80-
ignoreEmptyLines = true,
81-
hasHeaderRecord = true
82-
)
83-
)
78+
ListSerializer(IntStringRecord.serializer())
8479
)
8580

8681
@Test
87-
fun testEmptyRecordListWithHeaders() = assertParse(
82+
fun testEmptyRecordListWithHeaders() = Csv(
83+
CsvConfiguration(
84+
ignoreEmptyLines = true,
85+
hasHeaderRecord = true
86+
)
87+
).assertDecode(
8888
"\r\na,b\r\n\r\n\r\n\r\n",
8989
listOf(),
90-
ListSerializer(IntStringRecord.serializer()),
91-
Csv(
92-
CsvConfiguration(
93-
ignoreEmptyLines = true,
94-
hasHeaderRecord = true
95-
)
96-
)
90+
ListSerializer(IntStringRecord.serializer())
9791
)
9892

9993
@Test
100-
fun testListOfIntList() = assertParse(
94+
fun testListOfIntList() = Csv(
95+
CsvConfiguration(
96+
ignoreEmptyLines = true
97+
)
98+
).assertDecode(
10199
"\r\n\r\n1,2\r\n\r\n3,4\r\n\r\n5,6,7\r\n",
102100
listOf(
103101
listOf(1, 2),
104102
listOf(3, 4),
105103
listOf(5, 6, 7)
106104
),
107-
ListSerializer(ListSerializer(Int.serializer())),
108-
Csv(
109-
CsvConfiguration(
110-
ignoreEmptyLines = true
111-
)
112-
)
105+
ListSerializer(ListSerializer(Int.serializer()))
113106
)
114107

115108
@Test
116-
fun testEmptyListOfIntList() = assertParse(
109+
fun testEmptyListOfIntList() = Csv(
110+
CsvConfiguration(
111+
ignoreEmptyLines = true
112+
)
113+
).assertDecode(
117114
"\r\n\r\n\r\n\r\n",
118115
listOf(),
119-
ListSerializer(ListSerializer(Int.serializer())),
120-
Csv(
121-
CsvConfiguration(
122-
ignoreEmptyLines = true
123-
)
124-
)
116+
ListSerializer(ListSerializer(Int.serializer()))
125117
)
126118

127119
@Test
128-
fun testNullRecordList() = assertParse(
120+
fun testNullRecordList() = Csv(
121+
CsvConfiguration(
122+
ignoreEmptyLines = true,
123+
nullString = "null"
124+
)
125+
).assertDecode(
129126
"\r\n\r\nnull\r\n\r\nnull\r\n\r\n",
130127
listOf(
131128
NullRecord(null),
132129
NullRecord(null)
133130
),
134-
ListSerializer(NullRecord.serializer()),
135-
Csv(
136-
CsvConfiguration(
137-
ignoreEmptyLines = true,
138-
nullString = "null"
139-
)
140-
)
131+
ListSerializer(NullRecord.serializer())
141132
)
142133

143134
@Test
144-
fun testNullRecordListWithEmptyNullString() = assertParse(
135+
fun testNullRecordListWithEmptyNullString() = Csv(
136+
CsvConfiguration(
137+
ignoreEmptyLines = true,
138+
nullString = ""
139+
)
140+
).assertDecode(
145141
"\r\n\r\n\r\n\r\n\r\n\r\n",
146142
listOf(),
147-
ListSerializer(NullRecord.serializer()),
148-
Csv(
149-
CsvConfiguration(
150-
ignoreEmptyLines = true,
151-
nullString = ""
152-
)
153-
)
143+
ListSerializer(NullRecord.serializer())
154144
)
155145
}

0 commit comments

Comments
 (0)