Fix KVRestore spies to use new functions

app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeRestoreTestBase.kt

@@ -14,6 +14,8 @@ import com.stevesoltys.seedvault.e2e.screen.impl.RestoreScreen
 import com.stevesoltys.seedvault.transport.restore.FullRestore
 import com.stevesoltys.seedvault.transport.restore.KVRestore
 import com.stevesoltys.seedvault.transport.restore.OutputFactory
+import io.mockk.Call
+import io.mockk.MockKAnswerScope
 import io.mockk.clearMocks
 import io.mockk.coEvery
 import io.mockk.every
@@ -161,14 +163,24 @@ internal interface LargeRestoreTestBase : LargeTestBase {
 
  clearMocks(spyKVRestore)
 
- coEvery {
- spyKVRestore.initializeState(any(), any(), any(), any())
- } answers {
+ val initializeStateBlock: MockKAnswerScope<Unit, Unit>.(Call) -> Unit = {
  packageName = arg<PackageInfo>(3).packageName
  restoreResult.kv[packageName!!] = mutableMapOf()
  callOriginal()
  }
 
+ coEvery {
+ spyKVRestore.initializeState(any(), any(), any(), any())
+ } answers initializeStateBlock
+
+ coEvery {
+ spyKVRestore.initializeStateV1(any(), any(), any(), any())
+ } answers initializeStateBlock
+
+ coEvery {
+ spyKVRestore.initializeStateV0(any(), any())
+ } answers initializeStateBlock
+
  every {
  spyOutputFactory.getBackupDataOutput(any())
  } answers {
@@ -186,9 +198,7 @@ internal interface LargeRestoreTestBase : LargeTestBase {
 
  clearMocks(spyFullRestore)
 
- coEvery {
- spyFullRestore.initializeState(any(), any(), any())
- } answers {
+ val initializeStateBlock: MockKAnswerScope<Unit, Unit>.(Call) -> Unit = {
  packageName?.let {
  restoreResult.full[it] = dataIntercept.toByteArray().sha256()
  }
@@ -199,6 +209,18 @@ internal interface LargeRestoreTestBase : LargeTestBase {
  callOriginal()
  }
 
+ coEvery {
+ spyFullRestore.initializeState(any(), any(), any())
+ } answers initializeStateBlock
+
+ coEvery {
+ spyFullRestore.initializeStateV1(any(), any(), any())
+ } answers initializeStateBlock
+
+ coEvery {
+ spyFullRestore.initializeStateV0(any(), any())
+ } answers initializeStateBlock
+
  every {
  spyOutputFactory.getOutputStream(any())
  } answers {