Added mockito dependency, fixed radar view update bug #51

core/build.gradle

@@ -13,5 +13,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
     testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
 }

core/src/main/java/com/rtbishop/look4sat/data/DefaultSatelliteRepo.kt

@@ -31,7 +31,7 @@ class DefaultSatelliteRepo(
         return localSource.getSelectedSatellites()
     }
 
-    override suspend fun importDataFromFile(stream: InputStream) = withContext(ioDispatcher) {
+    override suspend fun importDataFromStream(stream: InputStream) = withContext(ioDispatcher) {
         val importedEntries = Satellite.importElements(stream).map { tle -> SatEntry(tle) }
         localSource.updateEntries(importedEntries)
     }
@@ -42,7 +42,7 @@ class DefaultSatelliteRepo(
                 val importedEntries = mutableListOf<SatEntry>()
                 val streams = mutableListOf<InputStream>()
                 sources.forEach { source ->
-                    remoteSource.fetchFileStream(source)?.let { stream ->
+                    remoteSource.fetchDataStream(source)?.let { stream ->
                         if (source.contains(".zip", true)) {
                             val zipStream = ZipInputStream(stream).apply { nextEntry }
                             streams.add(zipStream)

core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.kt

@@ -5,7 +5,7 @@ import java.io.InputStream
 
 interface RemoteDataSource {
 
-    suspend fun fetchFileStream(url: String): InputStream?
+    suspend fun fetchDataStream(url: String): InputStream?
 
     suspend fun fetchTransmitters(): List<SatTrans>
 }

core/src/main/java/com/rtbishop/look4sat/domain/SatelliteRepo.kt

@@ -14,7 +14,7 @@ interface SatelliteRepo {
 
     suspend fun getSelectedSatellites(): List<Satellite>
 
-    suspend fun importDataFromFile(stream: InputStream)
+    suspend fun importDataFromStream(stream: InputStream)
 
     suspend fun importDataFromWeb(sources: List<String>)
 

core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/StationPosition.kt

@@ -21,5 +21,5 @@ data class StationPosition(
     val latitude: Double,
     val longitude: Double,
     val altitude: Double,
-    val name: String = "base"
+    val name: String = "default"
 )

core/src/main/java/com/rtbishop/look4sat/interactors/ImportDataFromStream.kt

@@ -3,9 +3,9 @@ package com.rtbishop.look4sat.interactors
 import com.rtbishop.look4sat.domain.SatelliteRepo
 import java.io.InputStream
 
-class ImportDataFromFile(private val satelliteRepo: SatelliteRepo) {
+class ImportDataFromStream(private val satelliteRepo: SatelliteRepo) {
 
     suspend operator fun invoke(stream: InputStream) {
-        satelliteRepo.importDataFromFile(stream)
+        satelliteRepo.importDataFromStream(stream)
     }
 }