In instrumentation tests, keep @pm@ incremental backups

If we request backup in several chunks, @pm@ gets backed up for each chunk, so due to incremental backups, we need to keep old data when comparing.
grote · Feb 14, 2024 · 840e264 · 840e264
1 parent b47b4ad
commit 840e264
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeBackupTestBase.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeBackupTestBase.kt
@@ -2,6 +2,7 @@ package com.stevesoltys.seedvault.e2e
 
 import android.content.pm.PackageInfo
 import android.os.ParcelFileDescriptor
+import com.stevesoltys.seedvault.MAGIC_PACKAGE_MANAGER
 import com.stevesoltys.seedvault.e2e.io.BackupDataInputIntercept
 import com.stevesoltys.seedvault.e2e.io.InputStreamIntercept
 import com.stevesoltys.seedvault.e2e.screen.impl.BackupScreen
@@ -119,9 +120,21 @@ internal interface LargeBackupTestBase : LargeTestBase {
         coEvery {
             spyKVBackup.finishBackup()
         } answers {
+            val oldMap = HashMap<String, String>()
+            // @pm@ can get backed up multiple times (if we need more than one request)
+            // so we need to keep the data it backed up before
+            if (packageName == MAGIC_PACKAGE_MANAGER && backupResult.kv.containsKey(packageName)) {
+                backupResult.kv[packageName]?.forEach { (key, value) ->
+                    // if a key existing in new data, we use its value from new data, don't override
+                    if (!data.containsKey(key)) oldMap[key] = value
+                }
+            }
             backupResult.kv[packageName!!] = data
                 .mapValues { entry -> entry.value.sha256() }
                 .toMutableMap()
+                .apply {
+                    putAll(oldMap)
+                }
 
             packageName = null
             data = mutableMapOf()