Skip to content

Commit 5dea535

Browse files
committed
Document the existing serial descriptor names
1 parent f2a7376 commit 5dea535

10 files changed

+35
-5
lines changed

serialization/common/test/DateTimePeriodSerializationTest.kt

+6
Original file line numberDiff line numberDiff line change
@@ -97,28 +97,34 @@ class DateTimePeriodSerializationTest {
9797

9898
@Test
9999
fun testDatePeriodIso8601Serialization() {
100+
assertKSerializerName("kotlinx.datetime.DatePeriod", DatePeriodIso8601Serializer)
100101
datePeriodIso8601Serialization(DatePeriodIso8601Serializer, DateTimePeriodIso8601Serializer)
101102
}
102103

103104
@Test
104105
fun testDatePeriodComponentSerialization() {
106+
assertKSerializerName("kotlinx.datetime.DatePeriod", DatePeriodComponentSerializer)
105107
datePeriodComponentSerialization(DatePeriodComponentSerializer, DateTimePeriodComponentSerializer)
106108
}
107109

108110
@Test
109111
fun testDateTimePeriodIso8601Serialization() {
112+
assertKSerializerName("kotlinx.datetime.DateTimePeriod", DateTimePeriodIso8601Serializer)
110113
dateTimePeriodIso8601Serialization(DateTimePeriodIso8601Serializer)
111114
}
112115

113116
@Test
114117
fun testDateTimePeriodComponentSerialization() {
118+
assertKSerializerName("kotlinx.datetime.DateTimePeriod", DateTimePeriodComponentSerializer)
115119
dateTimePeriodComponentSerialization(DateTimePeriodComponentSerializer)
116120
}
117121

118122
@Test
119123
fun testDefaultSerializers() {
120124
// Check that they behave the same as the ISO 8601 serializers
125+
assertKSerializerName<DateTimePeriod>("kotlinx.datetime.DateTimePeriod", Json.serializersModule.serializer())
121126
dateTimePeriodIso8601Serialization(Json.serializersModule.serializer())
127+
assertKSerializerName<DatePeriod>("kotlinx.datetime.DatePeriod", Json.serializersModule.serializer())
122128
datePeriodIso8601Serialization(Json.serializersModule.serializer(), Json.serializersModule.serializer())
123129
}
124130

serialization/common/test/DateTimeUnitSerializationTest.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DateTimeUnitSerializationTest {
1818
repeat(100) {
1919
val nanoseconds = Random.nextLong(1, Long.MAX_VALUE)
2020
val unit = DateTimeUnit.TimeBased(nanoseconds)
21-
val json = "{\"nanoseconds\":${nanoseconds.toString()}}" // https://youtrack.jetbrains.com/issue/KT-39891
21+
val json = "{\"nanoseconds\":$nanoseconds}"
2222
assertEquals(json, Json.encodeToString(serializer, unit))
2323
assertEquals(unit, Json.decodeFromString(serializer, json))
2424
}
@@ -65,7 +65,7 @@ class DateTimeUnitSerializationTest {
6565
repeat(100) {
6666
val nanoseconds = Random.nextLong(1, Long.MAX_VALUE)
6767
val unit = DateTimeUnit.TimeBased(nanoseconds)
68-
val json = "{\"type\":\"kotlinx.datetime.TimeBased\",\"nanoseconds\":${nanoseconds.toString()}}" // https://youtrack.jetbrains.com/issue/KT-39891
68+
val json = "{\"type\":\"kotlinx.datetime.TimeBased\",\"nanoseconds\":$nanoseconds}"
6969
assertEquals(json, Json.encodeToString(serializer, unit))
7070
assertEquals(unit, Json.decodeFromString(serializer, json))
7171
}
@@ -87,21 +87,25 @@ class DateTimeUnitSerializationTest {
8787

8888
@Test
8989
fun testTimeBasedUnitSerialization() {
90+
assertKSerializerName("kotlinx.datetime.TimeBased", TimeBasedDateTimeUnitSerializer)
9091
timeBasedSerialization(TimeBasedDateTimeUnitSerializer)
9192
}
9293

9394
@Test
9495
fun testDayBasedSerialization() {
96+
assertKSerializerName("kotlinx.datetime.DayBased", DayBasedDateTimeUnitSerializer)
9597
dayBasedSerialization(DayBasedDateTimeUnitSerializer)
9698
}
9799

98100
@Test
99101
fun testMonthBasedSerialization() {
102+
assertKSerializerName("kotlinx.datetime.MonthBased", MonthBasedDateTimeUnitSerializer)
100103
monthBasedSerialization(MonthBasedDateTimeUnitSerializer)
101104
}
102105

103106
@Test
104107
fun testDateBasedSerialization() {
108+
assertKSerializerName("kotlinx.datetime.DateTimeUnit.DateBased", DateBasedDateTimeUnitSerializer)
105109
dateBasedSerialization(DateBasedDateTimeUnitSerializer)
106110
}
107111

serialization/common/test/DayOfWeekSerializationTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ import kotlin.test.*
1313
class DayOfWeekSerializationTest {
1414
@Test
1515
fun testSerialization() {
16+
assertKSerializerName("kotlinx.datetime.DayOfWeek", DayOfWeekSerializer)
1617
for (dayOfWeek in DayOfWeek.entries) {
1718
val json = "\"${dayOfWeek.name}\""
1819
assertEquals(json, Json.encodeToString(DayOfWeekSerializer, dayOfWeek))
1920
assertEquals(dayOfWeek, Json.decodeFromString(DayOfWeekSerializer, json))
2021
}
2122
}
22-
}
23+
}

serialization/common/test/InstantSerializationTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,20 @@ class InstantSerializationTest {
5454

5555
@Test
5656
fun testIso8601Serialization() {
57+
assertKSerializerName("kotlinx.datetime.Instant", InstantIso8601Serializer)
5758
iso8601Serialization(InstantIso8601Serializer)
5859
}
5960

6061
@Test
6162
fun testComponentSerialization() {
63+
assertKSerializerName("kotlinx.datetime.Instant", InstantComponentSerializer)
6264
componentSerialization(InstantComponentSerializer)
6365
}
6466

6567
@Test
6668
fun testDefaultSerializers() {
6769
// should be the same as the ISO 8601
70+
assertKSerializerName<Instant>("kotlinx.datetime.Instant", Json.serializersModule.serializer())
6871
iso8601Serialization(Json.serializersModule.serializer())
6972
}
7073

serialization/common/test/LocalDateSerializationTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,20 @@ class LocalDateSerializationTest {
5656

5757
@Test
5858
fun testIso8601Serialization() {
59+
assertKSerializerName("kotlinx.datetime.LocalDate", LocalDateIso8601Serializer)
5960
iso8601Serialization(LocalDateIso8601Serializer)
6061
}
6162

6263
@Test
6364
fun testComponentSerialization() {
65+
assertKSerializerName("kotlinx.datetime.LocalDate", LocalDateComponentSerializer)
6466
componentSerialization(LocalDateComponentSerializer)
6567
}
6668

6769
@Test
6870
fun testDefaultSerializers() {
6971
// should be the same as the ISO 8601
72+
assertKSerializerName<LocalDate>("kotlinx.datetime.LocalDate", Json.serializersModule.serializer())
7073
iso8601Serialization(Json.serializersModule.serializer())
7174
}
7275

serialization/common/test/LocalDateTimeSerializationTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,20 @@ class LocalDateTimeSerializationTest {
7070

7171
@Test
7272
fun testIso8601Serialization() {
73+
assertKSerializerName<LocalDateTime>("kotlinx.datetime.LocalDateTime", LocalDateTimeComponentSerializer)
7374
iso8601Serialization(LocalDateTimeIso8601Serializer)
7475
}
7576

7677
@Test
7778
fun testComponentSerialization() {
79+
assertKSerializerName<LocalDateTime>("kotlinx.datetime.LocalDateTime", LocalDateTimeComponentSerializer)
7880
componentSerialization(LocalDateTimeComponentSerializer)
7981
}
8082

8183
@Test
8284
fun testDefaultSerializers() {
8385
// should be the same as the ISO 8601
86+
assertKSerializerName<LocalDateTime>("kotlinx.datetime.LocalDateTime", Json.serializersModule.serializer())
8487
iso8601Serialization(Json.serializersModule.serializer())
8588
}
8689

serialization/common/test/LocalTimeSerializationTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,20 @@ class LocalTimeSerializationTest {
6060

6161
@Test
6262
fun testIso8601Serialization() {
63+
assertKSerializerName("kotlinx.datetime.LocalTime", LocalTimeIso8601Serializer)
6364
iso8601Serialization(LocalTimeIso8601Serializer)
6465
}
6566

6667
@Test
6768
fun testComponentSerialization() {
69+
assertKSerializerName("kotlinx.datetime.LocalTime", LocalTimeComponentSerializer)
6870
componentSerialization(LocalTimeComponentSerializer)
6971
}
7072

7173
@Test
7274
fun testDefaultSerializers() {
7375
// should be the same as the ISO 8601
76+
assertKSerializerName<LocalTime>("kotlinx.datetime.LocalTime", Json.serializersModule.serializer())
7477
iso8601Serialization(Json.serializersModule.serializer())
7578
}
7679

serialization/common/test/MonthSerializationTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ import kotlin.test.*
1313
class MonthSerializationTest {
1414
@Test
1515
fun testSerialization() {
16+
assertKSerializerName("kotlinx.datetime.Month", MonthSerializer)
1617
for (month in Month.entries) {
1718
val json = "\"${month.name}\""
1819
assertEquals(json, Json.encodeToString(MonthSerializer, month))
1920
assertEquals(month, Json.decodeFromString(MonthSerializer, json))
2021
}
2122
}
22-
}
23+
}

serialization/common/test/TimeZoneSerializationTest.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ class TimeZoneSerializationTest {
4646

4747
@Test
4848
fun testDefaultSerializers() {
49+
assertKSerializerName<FixedOffsetTimeZone>(
50+
"kotlinx.datetime.FixedOffsetTimeZone", Json.serializersModule.serializer()
51+
)
4952
zoneOffsetSerialization(Json.serializersModule.serializer())
53+
assertKSerializerName<TimeZone>("kotlinx.datetime.TimeZone", Json.serializersModule.serializer())
5054
serialization(Json.serializersModule.serializer())
5155
}
52-
}
56+
}

serialization/common/test/UtcOffsetSerializationTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ class UtcOffsetSerializationTest {
2727

2828
@Test
2929
fun defaultSerializer() {
30+
assertKSerializerName<UtcOffset>("kotlinx.datetime.UtcOffset", Json.serializersModule.serializer())
3031
testSerializationAsPrimitive(Json.serializersModule.serializer())
3132
}
3233

3334
@Test
3435
fun stringPrimitiveSerializer() {
36+
assertKSerializerName("kotlinx.datetime.UtcOffset", UtcOffsetSerializer)
3537
testSerializationAsPrimitive(UtcOffsetSerializer)
3638
testSerializationAsPrimitive(UtcOffset.serializer())
3739
}

0 commit comments

Comments
 (0)