Add more tests to EmbraceApiService

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/api/CachedConfig.kt

@@ -3,8 +3,8 @@ package io.embrace.android.embracesdk.comms.api
 import io.embrace.android.embracesdk.config.remote.RemoteConfig
 
 internal class CachedConfig(
-    val config: RemoteConfig? = null,
+    val remoteConfig: RemoteConfig? = null,
     val eTag: String? = null
 ) {
-    fun isValid() = config != null && eTag != null
+    fun isValid() = remoteConfig != null && eTag != null
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/api/EmbraceApiService.kt

@@ -42,7 +42,7 @@ internal class EmbraceApiService(
     init {
         networkConnectivityService.addNetworkConnectivityListener(this)
         lastNetworkStatus = networkConnectivityService.getCurrentNetworkStatus()
-        deliveryRetryManager.setPostExecutor(this::executePost)
+        deliveryRetryManager.setRetryMethod(this::executePost)
     }
 
     /**
@@ -57,31 +57,10 @@ internal class EmbraceApiService(
     override fun getConfig(): RemoteConfig? {
         var request = prepareConfigRequest(configUrl)
         val cachedResponse = cachedConfigProvider(configUrl, request)
-
         if (cachedResponse.isValid()) { // only bother if we have a useful response.
             request = request.copy(eTag = cachedResponse.eTag)
         }
         val response = apiClient.executeGet(request)
-        return handleRemoteConfigResponse(response, cachedResponse.config)
-    }
-
-    override fun getCachedConfig(): CachedConfig {
-        val request = prepareConfigRequest(configUrl)
-        return cachedConfigProvider(configUrl, request)
-    }
-
-    private fun prepareConfigRequest(url: String) = ApiRequest(
-        contentType = "application/json",
-        userAgent = "Embrace/a/" + BuildConfig.VERSION_NAME,
-        accept = "application/json",
-        url = EmbraceUrl.create(url),
-        httpMethod = HttpMethod.GET,
-    )
-
-    private fun handleRemoteConfigResponse(
-        response: ApiResponse<String>,
-        cachedConfig: RemoteConfig?
-    ): RemoteConfig? {
         return when (response.statusCode) {
             HttpURLConnection.HTTP_OK -> {
                 logger.logInfo("Fetched new config successfully.")
@@ -91,7 +70,7 @@ internal class EmbraceApiService(
 
             HttpURLConnection.HTTP_NOT_MODIFIED -> {
                 logger.logInfo("Confirmed config has not been modified.")
-                cachedConfig
+                cachedResponse.remoteConfig
             }
 
             ApiClient.NO_HTTP_RESPONSE -> {
@@ -106,6 +85,19 @@ internal class EmbraceApiService(
         }
     }
 
+    override fun getCachedConfig(): CachedConfig {
+        val request = prepareConfigRequest(configUrl)
+        return cachedConfigProvider(configUrl, request)
+    }
+
+    private fun prepareConfigRequest(url: String) = ApiRequest(
+        contentType = "application/json",
+        userAgent = "Embrace/a/" + BuildConfig.VERSION_NAME,
+        accept = "application/json",
+        url = EmbraceUrl.create(url),
+        httpMethod = HttpMethod.GET,
+    )
+
     override fun onNetworkConnectivityStatusChanged(status: NetworkStatus) {
         lastNetworkStatus = status
     }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/delivery/DeliveryRetryManager.kt

@@ -13,7 +13,7 @@ internal interface DeliveryRetryManager {
     fun scheduleForRetry(request: ApiRequest, payload: ByteArray)
 
     /**
-     * Sets the executor that will be used to retry failed API calls.
+     * Sets the method to run to retry an [ApiRequest]
      */
-    fun setPostExecutor(postExecutor: (request: ApiRequest, payload: ByteArray) -> Unit)
+    fun setRetryMethod(retryMethod: (request: ApiRequest, payload: ByteArray) -> Unit)
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/delivery/EmbraceDeliveryRetryManager.kt

@@ -20,7 +20,7 @@ internal class EmbraceDeliveryRetryManager(
     private val retryQueue: DeliveryFailedApiCalls by lazy { cacheManager.loadFailedApiCalls() }
     private var lastRetryTask: ScheduledFuture<*>? = null
     private var lastNetworkStatus: NetworkStatus = NetworkStatus.UNKNOWN
-    private lateinit var postExecutor: (request: ApiRequest, payload: ByteArray) -> Unit
+    private lateinit var retryMethod: (request: ApiRequest, payload: ByteArray) -> Unit
 
     init {
         logger.logDeveloper(TAG, "Starting DeliveryRetryManager")
@@ -32,10 +32,10 @@ internal class EmbraceDeliveryRetryManager(
     }
 
     /**
-     * Sets the executor that will be used to retry failed API calls.
+     * Sets the method to execute to retry requests
      */
-    override fun setPostExecutor(postExecutor: (request: ApiRequest, payload: ByteArray) -> Unit) {
-        this.postExecutor = postExecutor
+    override fun setRetryMethod(retryMethod: (request: ApiRequest, payload: ByteArray) -> Unit) {
+        this.retryMethod = retryMethod
     }
 
     /**
@@ -175,7 +175,7 @@ internal class EmbraceDeliveryRetryManager(
         if (payload != null) {
             try {
                 logger.logDeveloper(TAG, "Retrying failed API call")
-                postExecutor(call.apiRequest, payload)
+                retryMethod(call.apiRequest, payload)
                 cacheManager.deletePayload(call.cachedPayload)
             } catch (ex: Exception) {
                 logger.logDeveloper(

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/EmbraceConfigService.kt

@@ -196,7 +196,7 @@ internal class EmbraceConfigService @JvmOverloads constructor(
     fun loadConfigFromCache() {
         logger.logDeveloper("EmbraceConfigService", "Attempting to load config from cache")
         val cachedConfig = apiService.getCachedConfig()
-        val obj = cachedConfig.config
+        val obj = cachedConfig.remoteConfig
 
         if (obj != null) {
             val oldConfig = configProp

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/FakeWorkerThreadModule.kt

@@ -6,6 +6,7 @@ import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.worker.ExecutorName
 import io.embrace.android.embracesdk.worker.WorkerThreadModule
 import kotlin.reflect.KFunction1
+import kotlin.reflect.KFunction2
 
 /**
  * Version of [WorkerThreadModule] used for tests that uses and exposes [BlockableExecutorService] and [BlockingScheduledExecutorService]
@@ -16,7 +17,7 @@ import kotlin.reflect.KFunction1
  */
 internal class FakeWorkerThreadModule(
     executorProvider: KFunction1<Boolean, BlockableExecutorService> = ::BlockableExecutorService,
-    scheduledExecutorProvider: KFunction1<FakeClock, BlockingScheduledExecutorService> = ::BlockingScheduledExecutorService,
+    scheduledExecutorProvider: KFunction2<FakeClock, Boolean, BlockingScheduledExecutorService> = ::BlockingScheduledExecutorService,
     private val clock: FakeClock = FakeClock(),
     private val blockingMode: Boolean = false
 ) : WorkerThreadModule {
@@ -27,7 +28,7 @@ internal class FakeWorkerThreadModule(
 
     private val scheduledExecutorServices =
         ExecutorName.values().associateWith {
-            scheduledExecutorProvider(clock)
+            scheduledExecutorProvider(clock, blockingMode)
         }
 
     override fun backgroundExecutor(executorName: ExecutorName): BlockableExecutorService {