test: hopefully clean state in between tests right

Author: williscool

android/app/src/androidTest/java/com/github/quarck/calnotify/calendar/CalendarProviderEventTest.kt

@@ -29,6 +29,9 @@ class CalendarProviderEventTest {
         DevLog.info(LOG_TAG, "Setting up test environment")
         fixture = CalendarProviderTestFixture()
 
+        // Clear any existing test state
+        fixture.clearTestState()
+        
         // Create a test calendar for all event tests
         testCalendarId = fixture.createCalendarWithSettings(
             "Test Calendar",

android/app/src/androidTest/java/com/github/quarck/calnotify/calendar/CalendarProviderReminderTest.kt

@@ -32,6 +32,9 @@ class CalendarProviderReminderTest {
         DevLog.info(LOG_TAG, "Setting up test environment")
         fixture = CalendarProviderTestFixture()
 
+        // Clear any existing test state
+        fixture.clearTestState()
+        
         // Create a test calendar for all reminder tests
         testCalendarId = fixture.createCalendarWithSettings(
             "Test Calendar",

android/app/src/androidTest/java/com/github/quarck/calnotify/calendarmonitor/CalendarTestFixtureExampleTest.kt

@@ -40,6 +40,9 @@ class CalendarTestFixtureExampleTest {
         // Create the base fixture
         baseFixture = BaseCalendarTestFixture.Builder().build()
 
+        // Clear any existing test state
+        baseFixture.clearTestState()
+        
         // Set up a test calendar
         baseFixture.setupTestCalendar("Example Test Calendar")
     }

android/app/src/androidTest/java/com/github/quarck/calnotify/calendarmonitor/ComponentIsolationTest.kt

@@ -54,6 +54,9 @@ class ComponentIsolationTest {
     fun setup() {
         DevLog.info(LOG_TAG, "Setting up base test environment")
         MockKAnnotations.init(this)
+        
+        // Clear any previous mock states
+        unmockkAll()
     }
 
     @After

android/app/src/androidTest/java/com/github/quarck/calnotify/calendarmonitor/FixturedCalendarMonitorServiceTest.kt

@@ -39,6 +39,9 @@ class FixturedCalendarMonitorServiceTest {
     fun setup() {
         DevLog.info(LOG_TAG, "Setting up fixture for calendar monitor tests")
         fixture = CalendarMonitorTestFixture()
+        
+        // Clear any existing test state
+        fixture.clearTestState()
     }
 
     @After

android/app/src/androidTest/java/com/github/quarck/calnotify/calendarmonitor/SimpleCalendarMonitoringTest.kt

@@ -36,6 +36,9 @@ class SimpleCalendarMonitoringTest {
     fun setup() {
         DevLog.info(LOG_TAG, "Setting up test with CalendarMonitorTestFixture")
         fixture = CalendarMonitorTestFixture()
+        
+        // Clear any existing test state
+        fixture.clearTestState()
     }
 
     @After

android/app/src/androidTest/java/com/github/quarck/calnotify/testutils/BaseCalendarTestFixture.kt

@@ -388,6 +388,34 @@ class BaseCalendarTestFixture private constructor(builder: Builder) {
         timeProvider.advanceTime(milliseconds)
     }
 
+    /**
+     * Clears all test state to ensure test isolation
+     */
+    fun clearTestState() {
+        DevLog.info(LOG_TAG, "Clearing test state for BaseCalendarTestFixture")
+        
+        // Clear storage databases
+        clearStorages()
+        
+        // Reset test clock to a known state
+        timeProvider.testClock.setCurrentTime(System.currentTimeMillis())
+        
+        // Clear any mock overrides
+        unmockkAll()
+        
+        // Reinitialize components
+        timeProvider.setup()
+        contextProvider.setup()
+        calendarProvider.setup()
+        applicationComponents.setup()
+        
+        // Reset calendar monitor state
+        val monitorState = CalendarMonitorState(contextProvider.fakeContext)
+        monitorState.firstScanEver = false
+        monitorState.prevEventScanTo = timeProvider.testClock.currentTimeMillis()
+        monitorState.prevEventFireFromScan = timeProvider.testClock.currentTimeMillis()
+    }
+    
     /**
      * Cleans up all mocks and resources
      */

android/app/src/androidTest/java/com/github/quarck/calnotify/testutils/CalendarMonitorTestFixture.kt

@@ -366,4 +366,33 @@ class CalendarMonitorTestFixture {
         DevLog.info(LOG_TAG, "Cleaning up CalendarMonitorTestFixture")
         baseFixture.cleanup()
     }
+    
+    /**
+     * Clears all test state to ensure test isolation
+     */
+    fun clearTestState() {
+        DevLog.info(LOG_TAG, "Clearing test state for CalendarMonitorTestFixture")
+        
+        // Get the context from the base fixture
+        val context = contextProvider.fakeContext
+        
+        // Clear monitoring state
+        MonitorStorage(context).classCustomUse { db ->
+            db.deleteAlertsMatching { true }
+            DevLog.info(LOG_TAG, "Cleared all alerts from monitor storage")
+        }
+        
+        // Clear events storage if needed
+        // TODO: do we need this here?
+        // applicationComponents.clearEventsStorage()
+
+        // Reset calendar monitor state
+        val monitorState = CalendarMonitorState(context)
+        monitorState.firstScanEver = false
+        monitorState.prevEventScanTo = timeProvider.testClock.currentTimeMillis()
+        monitorState.prevEventFireFromScan = timeProvider.testClock.currentTimeMillis()
+        
+        // Reset the base fixture test state
+        baseFixture.clearTestState()
+    }
 } 

android/app/src/androidTest/java/com/github/quarck/calnotify/testutils/CalendarProviderTestFixture.kt

@@ -1,6 +1,7 @@
 package com.github.quarck.calnotify.testutils
 
 import android.content.ContentValues
+import android.content.Context
 import android.provider.CalendarContract
 import com.github.quarck.calnotify.Settings
 import com.github.quarck.calnotify.calendar.*
@@ -325,4 +326,69 @@ class CalendarProviderTestFixture {
     fun cleanup() {
         baseFixture.cleanup()
     }
+
+    /**
+     * Clears all test state to ensure test isolation
+     */
+    fun clearTestState() {
+        DevLog.info(LOG_TAG, "Clearing test state")
+        
+        // Clear all calendar data
+        clearAllEvents()
+        clearAllReminders()
+        clearAllAlerts()
+        
+        // Clear storage databases
+        clearStorages(contextProvider.fakeContext)
+        
+        // Reset test clock to a known state
+        timeProvider.testClock.setCurrentTime(System.currentTimeMillis())
+        
+        // Clear any mock overrides
+        unmockkAll()
+        
+        // Reset calendar provider state
+        setupCalendarProvider()
+    }
+
+    private fun clearAllEvents() {
+        val context = contextProvider.fakeContext
+        val eventsUri = CalendarContract.Events.CONTENT_URI
+        context.contentResolver.delete(eventsUri, null, null)
+    }
+
+    private fun clearAllReminders() {
+        val context = contextProvider.fakeContext
+        val remindersUri = CalendarContract.Reminders.CONTENT_URI
+        context.contentResolver.delete(remindersUri, null, null)
+    }
+
+    private fun clearAllAlerts() {
+        val context = contextProvider.fakeContext
+        val alertsUri = CalendarContract.CalendarAlerts.CONTENT_URI
+        context.contentResolver.delete(alertsUri, null, null)
+    }
+
+    /**
+     * Clears all storage databases
+     */
+    private fun clearStorages(context: Context) {
+        baseFixture.clearStorages()
+    }
+
+    /**
+     * Clears all MockK overrides
+     */
+    private fun unmockkAll() {
+        // Use MockK's unmockAll function to clear all mocks
+        io.mockk.unmockkAll()
+    }
+
+    /**
+     * Resets the calendar provider to its initial state
+     */
+    private fun setupCalendarProvider() {
+        // Re-setup the calendar provider from the base fixture
+        baseFixture.calendarProvider.setup()
+    }
 }