fix the tests

Author: quiro91

app/src/main/java/net/squanchy/notification/NotificationCreator.kt

@@ -127,7 +127,7 @@ class NotificationCreator(private val context: Context) {
 
     private fun getTrackColor(event: Event): Int {
         return event.track
-            .map { (_, _, _, accentColor) -> Color.parseColor(accentColor.or(ARGB_TRANSPARENT)) }
+            .map { Color.parseColor(it.accentColor ?: ARGB_TRANSPARENT) }
             .or(Color.TRANSPARENT)
     }
 

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

@@ -2,7 +2,6 @@ package net.squanchy.service.firebase
 
 import com.google.common.truth.Truth.assertThat
 import net.squanchy.support.checksum.Checksum
-import net.squanchy.support.lang.getOrThrow
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -50,41 +49,41 @@ class FirestoreTrackMapperTest {
     fun `track url should match when mapped`() {
         val firestoreTrack = aFirestoreTrack(iconUrl = A_NAME)
         val track = firestoreTrack.toTrack(checksum)
-        assertThat(track.iconUrl.getOrThrow()).isEqualTo(A_NAME)
+        assertThat(track.iconUrl).isEqualTo(A_NAME)
     }
 
     @Test
     fun `track url should be empty when mapping null`() {
         val firestoreTrack = aFirestoreTrack(iconUrl = null)
         val track = firestoreTrack.toTrack(checksum)
-        assertThat(track.iconUrl.isEmpty()).isTrue()
+        assertThat(track.iconUrl).isNull()
     }
 
     @Test
     fun `accent color should match when mapped`() {
         val firestoreTrack = aFirestoreTrack(accentColor = A_COLOR)
         val track = firestoreTrack.toTrack(checksum)
-        assertThat(track.accentColor.getOrThrow()).isEqualTo(A_COLOR)
+        assertThat(track.accentColor).isEqualTo(A_COLOR)
     }
 
     @Test
     fun `accent color should be empty when mapping null`() {
         val firestoreTrack = aFirestoreTrack(accentColor = null)
         val track = firestoreTrack.toTrack(checksum)
-        assertThat(track.accentColor.isEmpty()).isTrue()
+        assertThat(track.accentColor).isNull()
     }
 
     @Test
     fun `text color should match when mapped`() {
         val firestoreTrack = aFirestoreTrack(textColor = A_COLOR)
         val track = firestoreTrack.toTrack(checksum)
-        assertThat(track.textColor.getOrThrow()).isEqualTo(A_COLOR)
+        assertThat(track.textColor).isEqualTo(A_COLOR)
     }
 
     @Test
     fun `text color should be empty when mapping null`() {
         val firestoreTrack = aFirestoreTrack(textColor = null)
         val track = firestoreTrack.toTrack(checksum)
-        assertThat(track.textColor.isEmpty()).isTrue()
+        assertThat(track.textColor).isNull()
     }
 }

app/src/test/java/net/squanchy/service/firebase/model/schedule/FirestoreTracksRepositoryTest.kt

@@ -1,6 +1,5 @@
 package net.squanchy.service.firebase.model.schedule
 
-import arrow.core.Option
 import io.reactivex.Observable
 import net.squanchy.schedule.domain.view.aTrack
 import net.squanchy.service.firebase.FirestoreDbService
@@ -54,7 +53,7 @@ class FirestoreTracksRepositoryTest {
         trackService.tracks()
             .test()
             .assertValue(
-                listOf(aTrack(accentColor = Option.empty(), iconUrl = Option.empty(), textColor = Option.empty()))
+                listOf(aTrack(accentColor = null, iconUrl = null, textColor = null))
             )
     }