Merge pull request #780 from adobe/feature/disqualification

Feature/disqualification -> dev

Author: spoorthipujariadobe

code/core/api/core.api

@@ -9,6 +9,7 @@ public abstract interface class com/adobe/marketing/mobile/AdobeCallbackWithErro
 public class com/adobe/marketing/mobile/AdobeError : java/io/Serializable {
 	public static final field CALLBACK_NULL Lcom/adobe/marketing/mobile/AdobeError;
 	public static final field CALLBACK_TIMEOUT Lcom/adobe/marketing/mobile/AdobeError;
+	public static final field DATABASE_ERROR Lcom/adobe/marketing/mobile/AdobeError;
 	public static final field EXTENSION_NOT_INITIALIZED Lcom/adobe/marketing/mobile/AdobeError;
 	public static final field INVALID_REQUEST Lcom/adobe/marketing/mobile/AdobeError;
 	public static final field INVALID_RESPONSE Lcom/adobe/marketing/mobile/AdobeError;
@@ -56,6 +57,23 @@ public class com/adobe/marketing/mobile/EventHistoryRequest {
 	public fun getToDate ()J
 }
 
+public final class com/adobe/marketing/mobile/EventHistoryResult {
+	public static final field $stable I
+	public final field count I
+	public final field newestOccurrence Ljava/lang/Long;
+	public final field oldestOccurrence Ljava/lang/Long;
+	public fun <init> (ILjava/lang/Long;Ljava/lang/Long;)V
+	public synthetic fun <init> (ILjava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()I
+	public final fun component2 ()Ljava/lang/Long;
+	public final fun component3 ()Ljava/lang/Long;
+	public final fun copy (ILjava/lang/Long;Ljava/lang/Long;)Lcom/adobe/marketing/mobile/EventHistoryResult;
+	public static synthetic fun copy$default (Lcom/adobe/marketing/mobile/EventHistoryResult;ILjava/lang/Long;Ljava/lang/Long;ILjava/lang/Object;)Lcom/adobe/marketing/mobile/EventHistoryResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public abstract interface class com/adobe/marketing/mobile/EventHistoryResultHandler {
 	public abstract fun call (Ljava/lang/Object;)V
 }
@@ -138,9 +156,11 @@ public abstract class com/adobe/marketing/mobile/ExtensionApi {
 	public abstract fun createSharedState (Ljava/util/Map;Lcom/adobe/marketing/mobile/Event;)V
 	public abstract fun createXDMSharedState (Ljava/util/Map;Lcom/adobe/marketing/mobile/Event;)V
 	public abstract fun dispatch (Lcom/adobe/marketing/mobile/Event;)V
+	public abstract fun getHistoricalEvents ([Lcom/adobe/marketing/mobile/EventHistoryRequest;ZLcom/adobe/marketing/mobile/AdobeCallbackWithError;)V
 	public abstract fun getHistoricalEvents ([Lcom/adobe/marketing/mobile/EventHistoryRequest;ZLcom/adobe/marketing/mobile/EventHistoryResultHandler;)V
 	public abstract fun getSharedState (Ljava/lang/String;Lcom/adobe/marketing/mobile/Event;ZLcom/adobe/marketing/mobile/SharedStateResolution;)Lcom/adobe/marketing/mobile/SharedStateResult;
 	public abstract fun getXDMSharedState (Ljava/lang/String;Lcom/adobe/marketing/mobile/Event;ZLcom/adobe/marketing/mobile/SharedStateResolution;)Lcom/adobe/marketing/mobile/SharedStateResult;
+	public abstract fun recordHistoricalEvent (Lcom/adobe/marketing/mobile/Event;Lcom/adobe/marketing/mobile/AdobeCallbackWithError;)V
 	public abstract fun registerEventListener (Ljava/lang/String;Ljava/lang/String;Lcom/adobe/marketing/mobile/ExtensionEventListener;)V
 	public abstract fun startEvents ()V
 	public abstract fun stopEvents ()V

code/core/build.gradle.kts

@@ -60,4 +60,5 @@ dependencies {
     androidTestImplementation(project(":testutils"))
     testImplementation("org.robolectric:robolectric:4.7")
     testImplementation(project(":testutils"))
+    testImplementation(BuildConstants.Dependencies.MOCKK)
 }

code/core/src/androidTest/java/com/adobe/marketing/mobile/internal/eventhub/history/AndroidEventHistoryDatabaseTests.kt

@@ -21,6 +21,7 @@ import com.adobe.marketing.mobile.internal.util.SQLiteDatabaseHelper
 import com.adobe.marketing.mobile.services.MockAppContextService
 import com.adobe.marketing.mobile.services.ServiceProviderModifier
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
@@ -33,6 +34,7 @@ import java.io.File
 class AndroidEventHistoryDatabaseTests {
     private lateinit var androidEventHistoryDatabase: EventHistoryDatabase
     private lateinit var context: Context
+    private lateinit var databaseFile: File
 
     @Before
     fun beforeEach() {
@@ -43,9 +45,10 @@ class AndroidEventHistoryDatabaseTests {
         ServiceProviderModifier.setAppContextService(mockAppContextService)
 
         // Make sure databases directory exist
-        context.applicationContext.getDatabasePath(DATABASE_NAME).parentFile?.mkdirs()
+        databaseFile = context.applicationContext.getDatabasePath(DATABASE_NAME)
+        databaseFile.parentFile?.mkdirs()
         TestUtils.deleteAllFilesInCacheDir(context)
-        context.applicationContext.getDatabasePath(DATABASE_NAME).delete()
+        databaseFile.delete()
 
         try {
             androidEventHistoryDatabase = AndroidEventHistoryDatabase()
@@ -81,8 +84,8 @@ class AndroidEventHistoryDatabaseTests {
         // verify
         assertNotNull(result)
         assertEquals(1, result?.count)
-        assertEquals(timestamp, result?.oldestTimestamp)
-        assertEquals(timestamp, result?.newestTimeStamp)
+        assertEquals(timestamp, result?.oldestOccurrence)
+        assertEquals(timestamp, result?.newestOccurrence)
     }
 
     @Test
@@ -109,8 +112,8 @@ class AndroidEventHistoryDatabaseTests {
 
         // verify
         assertEquals(11, result?.count)
-        assertEquals(startTimestamp, result?.oldestTimestamp)
-        assertEquals(endTimestamp, result?.newestTimeStamp)
+        assertEquals(startTimestamp, result?.oldestOccurrence)
+        assertEquals(endTimestamp, result?.newestOccurrence)
     }
 
     @Test
@@ -146,7 +149,7 @@ class AndroidEventHistoryDatabaseTests {
     @Test
     fun testInsert_DatabasesDirectoryAbsent() {
         // delete databases dir
-        deleteFile(context.getDatabasePath(DATABASE_NAME).parentFile, true)
+        deleteFile(databaseFile.parentFile, true)
 
         // create new event history database
         val eventHistoryDatabase = AndroidEventHistoryDatabase()
@@ -156,13 +159,24 @@ class AndroidEventHistoryDatabaseTests {
         assertEquals(1, res?.count)
     }
 
+    @Test
+    fun testInsert_DatabasesDeleted() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+
+        // delete databases dir
+        databaseFile.delete()
+
+        assertFalse(eventHistoryDatabase.insert(222222222, System.currentTimeMillis()))
+    }
+
     @Test
     fun testInsert_MigrationFromCacheDirectory() {
         // create event history database in cache directory
         createEventHistoryDatabaseInCacheDirectory()
 
         // delete any existing event history database
-        context.getDatabasePath(DATABASE_NAME).delete()
+        databaseFile.delete()
 
         // create new event history database
         val eventHistoryDatabase = AndroidEventHistoryDatabase()
@@ -182,7 +196,7 @@ class AndroidEventHistoryDatabaseTests {
         createEventHistoryDatabaseInCacheDirectory()
 
         // delete databases dir
-        deleteFile(context.getDatabasePath(DATABASE_NAME).parentFile, true)
+        deleteFile(databaseFile.parentFile, true)
 
         // create new event history database
         val eventHistoryDatabase = AndroidEventHistoryDatabase()
@@ -196,6 +210,92 @@ class AndroidEventHistoryDatabaseTests {
         assertEquals(1, query2?.count)
     }
 
+    @Test
+    fun testQuery_noRecordExists() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+
+        // query for a record that does not exist
+        val res = eventHistoryDatabase.query(222222222, 0, System.currentTimeMillis())
+
+        assertNotNull(res)
+        assertEquals(0, res?.count)
+        assertEquals(null, res?.oldestOccurrence)
+        assertEquals(null, res?.newestOccurrence)
+    }
+    @Test
+    fun testQuery_DatabasesDeleted() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+        assertTrue(eventHistoryDatabase.insert(222222222, System.currentTimeMillis()))
+
+        // corrupt the databases dir
+        databaseFile.delete()
+
+        val res = eventHistoryDatabase.query(222222222, 0, System.currentTimeMillis())
+        assertNotNull(res)
+        assertEquals(-1, res?.count)
+        assertEquals(null, res?.oldestOccurrence)
+        assertEquals(null, res?.newestOccurrence)
+    }
+
+    @Test
+    fun testQuery_CorruptDatabases() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+        assertTrue(eventHistoryDatabase.insert(222222222, System.currentTimeMillis()))
+
+        // corrupt the databases dir
+        corruptDatabase()
+
+        val res = eventHistoryDatabase.query(222222222, 0, System.currentTimeMillis())
+        assertNotNull(res)
+        assertEquals(-1, res?.count)
+        assertEquals(null, res?.oldestOccurrence)
+        assertEquals(null, res?.newestOccurrence)
+    }
+
+    @Test
+    fun testDelete_DatabasesDeleted() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+        assertTrue(eventHistoryDatabase.insert(222222222, System.currentTimeMillis()))
+
+        // corrupt the databases dir
+        databaseFile.delete()
+
+        val res = eventHistoryDatabase.delete(222222222, 0, System.currentTimeMillis())
+        assertEquals(-1, res)
+    }
+
+    @Test
+    fun testDelete_CorruptDatabases() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+        assertTrue(eventHistoryDatabase.insert(222222222, System.currentTimeMillis()))
+
+        // corrupt the databases dir
+        corruptDatabase()
+
+        val res = eventHistoryDatabase.delete(222222222, 0, System.currentTimeMillis())
+        assertNotNull(res)
+        assertEquals(-1, res)
+    }
+
+    @Test
+    fun testDelete_AlreadyDeletedRecord() {
+        // create new event history database
+        val eventHistoryDatabase = AndroidEventHistoryDatabase()
+        val currentTimestamp = System.currentTimeMillis()
+        assertTrue(eventHistoryDatabase.insert(222222222, currentTimestamp))
+
+        val res1 = eventHistoryDatabase.delete(222222222, 0, currentTimestamp)
+        assertEquals(1, res1)
+
+        val res2 = eventHistoryDatabase.delete(222222222, 0, currentTimestamp)
+        assertEquals(0, res2)
+    }
+
     @Throws(Exception::class)
     private fun createEventHistoryDatabaseInCacheDirectory() {
         val cacheDatabaseFile = File(context.cacheDir, DATABASE_NAME_1X)
@@ -218,6 +318,11 @@ class AndroidEventHistoryDatabaseTests {
         cacheDatabase.insert(TABLE_NAME, null, contentValues)
     }
 
+    private fun corruptDatabase() {
+        // Write invalid data to corrupt the database
+        databaseFile.writeBytes(ByteArray(10) { 0 })
+    }
+
     companion object {
         private const val DATABASE_NAME = "com.adobe.module.core.eventhistory"
         private const val DATABASE_NAME_1X = "EventHistory"