refactor(ndk): removed old binary-dump event logic & added a new test…

… for the JSON serializer

bugsnag-android-core/src/main/java/com/bugsnag/android/FileStore.kt

@@ -14,7 +14,7 @@ import java.util.concurrent.locks.Lock
 import java.util.concurrent.locks.ReentrantLock
 
 internal abstract class FileStore(
-    private val storageDir: File,
+    val storageDir: File,
     private val maxStoreCount: Int,
     private val comparator: Comparator<in File?>,
     protected open val logger: Logger,

bugsnag-android-core/src/main/java/com/bugsnag/android/NativeInterface.java

@@ -81,15 +81,7 @@ public static String getContext() {
      */
     @NonNull
     public static File getNativeReportPath() {
-        return getNativeReportPath(getPersistenceDirectory());
-    }
-
-    private static @NonNull File getNativeReportPath(@NonNull File persistenceDirectory) {
-        return new File(persistenceDirectory, "bugsnag/native");
-    }
-
-    private static @NonNull File getPersistenceDirectory() {
-        return getClient().getConfig().getPersistenceDirectory().getValue();
+        return getClient().getEventStore().getStorageDir();
     }
 
     /**

bugsnag-android-core/src/test/java/com/bugsnag/android/NativeInterfaceApiTest.kt

@@ -7,6 +7,7 @@ import com.bugsnag.android.internal.ImmutableConfig
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -21,7 +22,6 @@ import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`
 import org.mockito.junit.MockitoJUnitRunner
-import java.io.File
 import java.nio.file.Files
 
 /**
@@ -87,10 +87,9 @@ internal class NativeInterfaceApiTest {
     @Test
     fun getNativeReportPathPersistenceDirectory() {
         val customDir = Files.createTempDirectory("custom").toFile()
-        `when`(immutableConfig.persistenceDirectory).thenReturn(lazy { customDir })
+        `when`(eventStore.storageDir).thenReturn(customDir)
         val observed = NativeInterface.getNativeReportPath()
-        val expected = File(customDir, "bugsnag/native")
-        assertEquals(expected, observed)
+        assertSame(customDir, observed)
     }
 
     @Test

bugsnag-plugin-android-ndk/api/bugsnag-plugin-android-ndk.api

@@ -16,12 +16,11 @@ public final class com/bugsnag/android/ndk/NativeBridge : com/bugsnag/android/in
 	public final fun clearFeatureFlag (Ljava/lang/String;)V
 	public final fun clearFeatureFlags ()V
 	public final fun clearMetadataTab (Ljava/lang/String;)V
-	public final fun deliverReportAtPath (Ljava/lang/String;)V
 	public final fun getCurrentCallbackSetCounts ()Ljava/util/Map;
 	public final fun getCurrentNativeApiCallUsage ()Ljava/util/Map;
 	public final fun getSignalUnwindStackFunction ()J
 	public final fun initCallbackCounts (Ljava/util/Map;)V
-	public final fun install (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZIZII)V
+	public final fun install (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZIZII)V
 	public final fun notifyAddCallback (Ljava/lang/String;)V
 	public final fun notifyRemoveCallback (Ljava/lang/String;)V
 	public fun onStateChange (Lcom/bugsnag/android/StateEvent;)V

bugsnag-plugin-android-ndk/detekt-baseline.xml

@@ -4,7 +4,7 @@
   <CurrentIssues>
     <ID>CyclomaticComplexMethod:NativeBridge.kt$NativeBridge$override fun onStateChange(event: StateEvent)</ID>
     <ID>LongMethod:EventOnDiskTests.kt$EventOnDiskTests$@Test fun testEvent()</ID>
-    <ID>LongParameterList:NativeBridge.kt$NativeBridge$( apiKey: String, reportingDirectory: String, lastRunInfoPath: String, consecutiveLaunchCrashes: Int, autoDetectNdkCrashes: Boolean, apiLevel: Int, is32bit: Boolean, threadSendPolicy: Int, maxBreadcrumbs: Int, )</ID>
+    <ID>LongParameterList:NativeBridge.kt$NativeBridge$( apiKey: String, reportingDirectory: String, lastRunInfoPath: String, eventUUID: String, consecutiveLaunchCrashes: Int, autoDetectNdkCrashes: Boolean, apiLevel: Int, is32bit: Boolean, threadSendPolicy: Int, maxBreadcrumbs: Int, )</ID>
     <ID>NestedBlockDepth:NativeBridge.kt$NativeBridge$private fun deliverPendingReports()</ID>
     <ID>TooManyFunctions:NativeBridge.kt$NativeBridge : StateObserver</ID>
     <ID>UseCheckOrError:ResourceUtils.kt$throw IllegalStateException("Failed to read JSON from $resourceName")</ID>

bugsnag-plugin-android-ndk/src/androidTest/java/com/bugsnag/android/ndk/NativeJsonSerializeTest.kt

@@ -1,6 +1,10 @@
 package com.bugsnag.android.ndk
 
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Test
+import java.io.File
 
 class NativeJsonSerializeTest {
 
@@ -11,10 +15,25 @@ class NativeJsonSerializeTest {
         }
     }
 
-    external fun run(): Int
+    private val path = File(System.getProperty("java.io.tmpdir"), this::class.simpleName!!)
+
+    @Before
+    fun setupTmpdir() {
+        path.mkdirs()
+    }
+
+    @After
+    fun deleteTmpdir() {
+        path.deleteRecursively()
+    }
+
+    external fun run(outputDir: String): Int
 
     @Test
     fun testPassesNativeSuite() {
-        verifyNativeRun(run())
+        verifyNativeRun(run(path.absolutePath))
+        val jsonFile = path.listFiles()!!.maxByOrNull { it.lastModified() }!!
+        val expected = loadJson("event_serialization.json")
+        assertEquals(expected, jsonFile.readText())
     }
 }