Skip to content
This repository was archived by the owner on Feb 17, 2020. It is now read-only.

Commit 998c51c

Browse files
committed
fix wrong merging of a test
1 parent 71ea724 commit 998c51c

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package net.squanchy.service.firebase
22

3+
import com.google.common.truth.Truth.assertThat
34
import net.squanchy.A_DATE
45
import net.squanchy.A_TIMEZONE
5-
import com.google.common.truth.Truth.assertThat
66
import net.squanchy.eventdetails.domain.view.ExperienceLevel
77
import net.squanchy.schedule.domain.view.Event
88
import net.squanchy.support.checksum.Checksum
@@ -13,7 +13,6 @@ import org.mockito.Mock
1313
import org.mockito.Mockito.`when`
1414
import org.mockito.junit.MockitoJUnit
1515
import org.mockito.junit.MockitoRule
16-
import java.util.Date
1716

1817
private const val A_VALUE = "whatever"
1918
private const val A_CHECKSUM = 1000L
@@ -44,16 +43,14 @@ class FirestoreEventMapperTest {
4443

4544
@Test
4645
fun `event start date should match when mapped`() {
47-
val date = Date(1518471471)
48-
val firestoreEvent = aFirestoreEvent(startTime = date)
46+
val firestoreEvent = aFirestoreEvent(startTime = A_DATE.toDate())
4947
val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
5048
assertThat(event.startTime).isEqualTo(A_DATE.toDateTime(A_TIMEZONE).toLocalDateTime())
5149
}
5250

5351
@Test
5452
fun `event end date should match when mapped`() {
55-
val date = Date(1518471471)
56-
val firestoreEvent = aFirestoreEvent(endTime = date)
53+
val firestoreEvent = aFirestoreEvent(endTime = A_DATE.toDate())
5754
val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
5855
assertThat(event.endTime).isEqualTo(A_DATE.toDateTime(A_TIMEZONE).toLocalDateTime())
5956
}
@@ -120,7 +117,7 @@ class FirestoreEventMapperTest {
120117
fun `event description should match when mapped`() {
121118
val firestoreEvent = aFirestoreEvent(description = A_VALUE)
122119
val event = firestoreEvent.toEvent(checksum, A_TIMEZONE)
123-
assertThat(A_VALUE).isEqualTo(event.description.get())
120+
assertThat(event.description.get()).isEqualTo(A_VALUE)
124121
}
125122

126123
@Test

0 commit comments

Comments
 (0)