Use more rigorous date parsing for fixtures, fix tests again

Author: rock3r

app/src/test/java/net/squanchy/TestDateTimeConstants.kt

@@ -0,0 +1,7 @@
+package net.squanchy
+
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+
+val A_DATE = DateTime("2018-04-19T02:20:00Z")
+val A_TIMEZONE = DateTimeZone.forID("Europe/Rome")!!

app/src/test/java/net/squanchy/schedule/domain/view/ScheduleFixtures.kt

@@ -1,17 +1,15 @@
 package net.squanchy.schedule.domain.view
 
+import net.squanchy.A_DATE
+import net.squanchy.A_TIMEZONE
 import net.squanchy.eventdetails.domain.view.ExperienceLevel
 import net.squanchy.speaker.domain.view.Speaker
 import net.squanchy.speaker.domain.view.aSpeaker
 import net.squanchy.support.lang.Optional
-import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import org.joda.time.LocalDate
 import org.joda.time.LocalDateTime
 
-private val A_DATE = DateTime("2018-04-19T02:20:00Z")
-private val A_TIMEZONE = DateTimeZone.forID("Europe/Rome")
-
 fun aSchedule(
     pages: List<SchedulePage> = listOf(aSchedulePage()),
     timezone: DateTimeZone = A_TIMEZONE

app/src/test/java/net/squanchy/service/firebase/FirestoreEventMapperTest.kt

@@ -1,19 +1,18 @@
 package net.squanchy.service.firebase
 
 import com.google.common.truth.Truth.assertThat
+import net.squanchy.A_DATE
+import net.squanchy.A_TIMEZONE
 import net.squanchy.eventdetails.domain.view.ExperienceLevel
 import net.squanchy.schedule.domain.view.Event
 import net.squanchy.support.checksum.Checksum
-import org.joda.time.DateTimeZone
-import org.joda.time.LocalDateTime
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.mockito.junit.MockitoJUnit
 import org.mockito.junit.MockitoRule
-import java.util.Date
 
 private const val A_VALUE = "whatever"
 private const val A_CHECKSUM = 1000L
@@ -30,113 +29,136 @@ class FirestoreEventMapperTest {
     @Mock
     private lateinit var checksum: Checksum
 
-    private lateinit var timeZone: DateTimeZone
-
     @Before
     fun before() {
         `when`(checksum.getChecksumOf(A_VALUE)).thenReturn(A_CHECKSUM)
-        timeZone = DateTimeZone.UTC
     }
 
     @Test
     fun `event id should match when mapped`() {
         val firestoreEvent = aFirestoreEvent(id = A_VALUE)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
-        assertThat(A_VALUE).isEqualTo(event.id)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
+        assertThat(event.id).isEqualTo(A_VALUE)
     }
 
     @Test
     fun `event start date should match when mapped`() {
-        val date = Date(1518471471)
-        val firestoreEvent = aFirestoreEvent(startTime = date)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
-        assertThat(LocalDateTime(date)).isEqualTo(event.startTime)
+        val firestoreEvent = aFirestoreEvent(startTime = A_DATE.toDate())
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
+        assertThat(event.startTime).isEqualTo(A_DATE.toDateTime(A_TIMEZONE).toLocalDateTime())
     }
 
     @Test
     fun `event end date should match when mapped`() {
-        val date = Date(1518471471)
-        val firestoreEvent = aFirestoreEvent(endTime = date)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
-        assertThat(LocalDateTime(date)).isEqualTo(event.endTime)
+        val firestoreEvent = aFirestoreEvent(endTime = A_DATE.toDate())
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
+        assertThat(event.endTime).isEqualTo(A_DATE.toDateTime(A_TIMEZONE).toLocalDateTime())
     }
 
     @Test
     fun `event title should match when mapped`() {
         val firestoreEvent = aFirestoreEvent(title = A_VALUE)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
-        assertThat(A_VALUE).isEqualTo(event.title)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
+        assertThat(event.title).isEqualTo(A_VALUE)
     }
 
     @Test
     fun `event place should match when mapped`() {
         val firestorePlace = aFirestorePlace()
         val firestoreEvent = aFirestoreEvent(place = firestorePlace)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(firestorePlace.toPlace()).isEqualTo(event.place.get())
     }
 
     @Test
     fun `event place should be absent when mapping null`() {
         val firestoreEvent = aFirestoreEvent(place = null)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(event.place.isPresent).isFalse()
     }
 
     @Test
     fun `event track should match when mapped`() {
         val firestoreTrack = aFirestoreTrack()
         val firestoreEvent = aFirestoreEvent(track = firestoreTrack)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(firestoreTrack.toTrack(checksum)).isEqualTo(event.track.get())
     }
 
     @Test
     fun `event track should be absent when mapping null`() {
         val firestoreEvent = aFirestoreEvent(track = null)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(event.track.isPresent).isFalse()
     }
 
     @Test
     fun `event experience level should match when mapped`() {
         val firestoreEvent = aFirestoreEvent(experienceLevel = FAKE_EXPERIENCE_LEVEL)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(ExperienceLevel.tryParsingFrom(FAKE_EXPERIENCE_LEVEL)).isEqualTo(event.experienceLevel)
     }
 
     @Test
     fun `event experience level should be absent when mapping null`() {
         val firestoreEvent = aFirestoreEvent(experienceLevel = null)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(event.experienceLevel.isPresent).isFalse()
     }
 
     @Test
     fun `event timezone should match the parameter when mapped`() {
         val firestoreEvent = aFirestoreEvent()
-        val event = firestoreEvent.toEvent(checksum, timeZone)
-        assertThat(event.timeZone).isEqualTo(timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
+        assertThat(event.timeZone).isEqualTo(A_TIMEZONE)
     }
 
     @Test
     fun `event description should match when mapped`() {
         val firestoreEvent = aFirestoreEvent(description = A_VALUE)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
-        assertThat(A_VALUE).isEqualTo(event.description.get())
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
+        assertThat(event.description.get()).isEqualTo(A_VALUE)
     }
 
     @Test
     fun `event description should be absent when mapping null`() {
         val firestoreEvent = aFirestoreEvent(description = null)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(event.description.isPresent).isFalse()
     }
 
     @Test
     fun `event type should match when mapped`() {
         val firestoreEvent = aFirestoreEvent(type = FAKE_TYPE)
-        val event = firestoreEvent.toEvent(checksum, timeZone)
+        val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
         assertThat(Event.Type.fromRawType(FAKE_TYPE)).isEqualTo(event.type)
     }
+
+    @Test
+    fun `place floor should match when mapped`() {
+        val firestorePlace = aFirestorePlace()
+        val place = firestorePlace.toPlace()
+        assertThat(place.floor.get()).isEqualTo(firestorePlace.floor)
+    }
+
+    @Test
+    fun `place floor should be absent when mapping null`() {
+        val firestorePlace = aFirestorePlace(floor = null)
+        val place = firestorePlace.toPlace()
+        assertThat(place.floor.isPresent).isFalse()
+    }
+
+    @Test
+    fun `place id should match when mapped`() {
+        val firestorePlace = aFirestorePlace()
+        val place = firestorePlace.toPlace()
+        assertThat(place.id).isEqualTo(firestorePlace.id)
+    }
+
+    @Test
+    fun `place name should match when mapped`() {
+        val firestorePlace = aFirestorePlace()
+        val place = firestorePlace.toPlace()
+        assertThat(place.name).isEqualTo(firestorePlace.name)
+    }
 }

app/src/test/java/net/squanchy/service/firebase/FirestoreFixtures.kt

@@ -1,6 +1,7 @@
 package net.squanchy.service.firebase
 
 import com.google.firebase.firestore.GeoPoint
+import net.squanchy.A_DATE
 import net.squanchy.service.firebase.model.conferenceinfo.FirestoreConferenceInfo
 import net.squanchy.service.firebase.model.conferenceinfo.FirestoreVenue
 import net.squanchy.service.firebase.model.schedule.FirestoreDay
@@ -9,11 +10,8 @@ import net.squanchy.service.firebase.model.schedule.FirestorePlace
 import net.squanchy.service.firebase.model.schedule.FirestoreSchedulePage
 import net.squanchy.service.firebase.model.schedule.FirestoreSpeaker
 import net.squanchy.service.firebase.model.schedule.FirestoreTrack
-import org.joda.time.DateTime
 import java.util.Date
 
-private val A_DATE = DateTime("2018-04-19T02:20:00Z")
-
 fun aFirestoreTrack(
     id: String = "a track id",
     name: String = "a track name",