Skip to content

Tracksection dto adjustment #92

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.

Sign up for GitHub

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
deka91 merged 2 commits into from
Jun 6, 2025
Merged

Tracksection dto adjustment #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
127dca9
Make linkProjection nullable
deka91 May 14, 2025
962287b
Add new unit test for a valid response
deka91 May 14, 2025
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
2 changes: 1 addition & 1 deletion sdk/src/main/java/ch/opentransportdata/ojp/data/dto/response/tir/leg/TrackSectionDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ data class TrackSectionDto(
// val trackSectionStart: TrackSectionStopPlaceRef?,
// val trackSectionEnd: TrackSectionStopPlaceRef?,
@Element(name = "LinkProjection")
val linkProjection: LinearShapeDto,
val linkProjection: LinearShapeDto?
) : Parcelable
22 changes: 22 additions & 0 deletions sdk/src/test/java/ch/opentransportdata/ojp/OjpSdkTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import assertk.assertions.isInstanceOf
import assertk.assertions.isNotEmpty
import assertk.assertions.isNotNull
import ch.opentransportdata.ojp.data.dto.OjpDto
import ch.opentransportdata.ojp.data.dto.converter.DurationTypeConverter
import ch.opentransportdata.ojp.data.dto.converter.LocalDateTimeTypeConverter
import ch.opentransportdata.ojp.data.dto.converter.PtModeTypeConverter
import ch.opentransportdata.ojp.data.dto.converter.TransferTypeConverter
import ch.opentransportdata.ojp.domain.model.*
import ch.opentransportdata.ojp.domain.model.error.OjpError
import ch.opentransportdata.ojp.domain.usecase.Initializer
Expand All @@ -16,6 +18,7 @@ import kotlinx.coroutines.test.runTest
import org.junit.Assert.assertThrows
import org.junit.Before
import org.junit.Test
import java.time.Duration
import java.time.ZoneId


Expand Down Expand Up @@ -96,6 +99,25 @@ internal class OjpSdkTest {
assertThat(result).isNotNull()
}

@Test
fun `Another valid XML data should allow successful parsing to an OjpDto`() {
// GIVEN
val xmlFile = "src/test/resources/response_valid_2.xml"
val bufferedSource = TestUtils().readXmlFile(xmlFile)
val tikXml = TikXml.Builder()
.addTypeConverter(java.time.LocalDateTime::class.java, LocalDateTimeTypeConverter(initializer))
.addTypeConverter(Duration::class.java, DurationTypeConverter())
.addTypeConverter(PtMode::class.java, PtModeTypeConverter())
.addTypeConverter(TransferType::class.java, TransferTypeConverter())
.build()

// ACTION
val result = tikXml.read<OjpDto>(bufferedSource, OjpDto::class.java)

// ASSERTION
assertThat(result).isNotNull()
}

@Test
fun `requestLocationsFromSearchTerm with valid data should return a list of places`() {
runTest {
Expand Down
Loading
Loading