[EMBR-631] Fix Unit tests.

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

@@ -284,7 +284,7 @@ internal class EmbraceApplicationExitInfoServiceTest {
  startApplicationExitInfoService()
 
  // then no null traces should be sent
- assertTrue(deliveryService.appExitInfoRequests.isEmpty())
+ assertTrue(deliveryService.blobMessages.isEmpty())
  }
 
  @Test
@@ -388,7 +388,7 @@ internal class EmbraceApplicationExitInfoServiceTest {
  startApplicationExitInfoService()
 
  // then a null trace should be sent
- assertTrue(deliveryService.appExitInfoRequests.isEmpty())
+ assertTrue(deliveryService.blobMessages.isEmpty())
  }
 
  @Test
@@ -405,9 +405,9 @@ internal class EmbraceApplicationExitInfoServiceTest {
  startApplicationExitInfoService()
 
  // each AEI object with a trace should be sent in a separate payload
- val payloads = checkNotNull(deliveryService.appExitInfoRequests)
+ val payloads = checkNotNull(deliveryService.blobMessages)
  assertEquals(32, payloads.size)
  }
 
- private fun getLastAeiRequest() = deliveryService.appExitInfoRequests.single().applicationExits.single()
+ private fun getLastAeiRequest() = deliveryService.blobMessages.single().applicationExits.single()
 }

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

@@ -28,7 +28,7 @@ internal class FakeDeliveryService : DeliveryService {
  var lastSentCachedSession: String? = null
  var lastSavedSession: SessionMessage? = null
  val lastSentSessions: MutableList<Pair<SessionMessage, SessionMessageState>> = mutableListOf()
- var appExitInfoRequests: MutableList<BlobMessage> = mutableListOf()
+ var blobMessages: MutableList<BlobMessage> = mutableListOf()
 
  override fun saveSession(sessionMessage: SessionMessage) {
  lastSavedSession = sessionMessage
@@ -85,6 +85,6 @@ internal class FakeDeliveryService : DeliveryService {
  }
 
  override fun sendAEIBlob(blobMessage: BlobMessage) {
- this.appExitInfoRequests.add(blobMessage)
+ blobMessages.add(blobMessage)
  }
 }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/aei/AeiNdkCrashProtobufSendTest.kt

@@ -8,8 +8,10 @@ import com.google.gson.Gson
 import io.embrace.android.embracesdk.FakeDeliveryService
 import io.embrace.android.embracesdk.ResourceReader
 import io.embrace.android.embracesdk.config.local.AppExitInfoLocalConfig
+import io.embrace.android.embracesdk.fakes.FakeAndroidMetadataService
 import io.embrace.android.embracesdk.fakes.FakeConfigService
 import io.embrace.android.embracesdk.fakes.FakePreferenceService
+import io.embrace.android.embracesdk.fakes.FakeUserService
 import io.embrace.android.embracesdk.fakes.fakeAppExitInfoBehavior
 import io.embrace.android.embracesdk.internal.utils.VersionChecker
 import io.embrace.android.embracesdk.payload.AppExitInfoData
@@ -112,7 +114,7 @@ internal class AeiNdkCrashProtobufSendTest {
  * Gets the AEI object that was sent to the delivery service
  */
  private fun FakeDeliveryService.getAeiObject(): AppExitInfoData {
- val requests: List<AppExitInfoData> = appExitInfoRequests.single()
+ val requests: List<AppExitInfoData> = blobMessages.single().applicationExits
  return requests.single()
  }
 
@@ -149,6 +151,8 @@ internal class AeiNdkCrashProtobufSendTest {
  activityManager,
  FakePreferenceService(),
  deliveryService,
+ FakeAndroidMetadataService(),
+ FakeUserService(),