test: add backup and verification e2e scenarios (#170)

Signed-off-by: Allain Magyar <allain.magyar@iohk.io> Co-authored-by: Cristian G <cristian.castro@iohk.io>
hyperledger · Sep 11, 2024 · 576d0de · 576d0de
1 parent 778cb91
commit 576d0de
Show file tree

Hide file tree

Showing 26 changed files with 788 additions and 345 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,9 @@
 root = true
 
 [*.{kt,kts}]
+ij_kotlin_packages_to_use_import_on_demand = unset
+ij_kotlin_name_count_to_use_star_import_for_members = 99
+ij_kotlin_name_count_to_use_star_import = 99
 ktlint_experimental = disabled
 ktlint_code_style = intellij_idea
 ktlint_standard_no_semi = disabled

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-@goncalo-frade-iohk @yshyn-iohk @elribonazo @cristianIOHK
+@elribonazo @cristianIOHK
 
 # Test related:
 /tests/ @amagyar-iohk

diff --git a/edge-agent-sdk/build.gradle.kts b/edge-agent-sdk/build.gradle.kts
@@ -80,9 +80,6 @@ kotlin {
                 jvmTarget = "17"
             }
         }
-        testRuns["test"].executionTask.configure {
-            useJUnitPlatform()
-        }
         publishing {
             publications {
                 withType<MavenPublication> {
@@ -145,10 +142,9 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")
                 implementation("io.ktor:ktor-client-mock:2.3.11")
-                implementation("junit:junit:4.13.2")
                 implementation("org.mockito:mockito-core:4.4.0")
                 implementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
             }
@@ -172,10 +168,8 @@ kotlin {
         val androidInstrumentedTest by getting {
             dependencies {
                 dependsOn(commonTest)
-                implementation(kotlin("test"))
                 implementation("androidx.test.espresso:espresso-core:3.5.1")
                 implementation("androidx.test.ext:junit:1.1.5")
-                implementation("junit:junit:4.13.2")
             }
         }
         /*

diff --git a/...k/src/androidMain/kotlin/org/hyperledger/identus/walletsdk/pluto/data/DbConnectionImpl.kt b/...k/src/androidMain/kotlin/org/hyperledger/identus/walletsdk/pluto/data/DbConnectionImpl.kt
@@ -24,10 +24,10 @@ actual class DbConnectionImpl actual constructor() : DbConnection {
  */
 actual val SqlDriver.isConnected: Boolean
     get() {
-        try {
-            return this.execute(null, "SELECT 1", 0).value == 1L
+        return try {
+            this.execute(null, "SELECT 1", 0).value == 0L
             // return this.executeQuery(null, "SELECT 1", 0).next()
         } catch (ex: Exception) {
-            return false
+            false
         }
     }
diff --git a/...dk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/edgeagent/ConnectionManager.kt b/...dk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/edgeagent/ConnectionManager.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.hyperledger.identus.apollo.base64.base64UrlDecoded
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Castor
@@ -25,7 +26,6 @@ import org.hyperledger.identus.walletsdk.edgeagent.protocols.ProtocolType
 import org.hyperledger.identus.walletsdk.edgeagent.protocols.issueCredential.IssueCredential
 import org.hyperledger.identus.walletsdk.edgeagent.protocols.revocation.RevocationNotification
 import java.time.Duration
-import kotlin.jvm.Throws
 
 interface ConnectionManager : ConnectionsManager, DIDCommConnection {
 
@@ -106,10 +106,9 @@ class ConnectionManagerImpl(
                         }
                     }
                 }
-
                 // Fallback mechanism if no WebSocket service endpoint is available
                 if (serviceEndpoint == null) {
-                    while (true) {
+                    while (this.isActive) {
                         // Continuously await and process new messages
                         awaitMessages().collect { array ->
                             processMessages(array)

diff --git a/...rc/commonTest/kotlin/org/hyperledger/identus/walletsdk/edgeagent/ConnectionManagerTest.kt b/...rc/commonTest/kotlin/org/hyperledger/identus/walletsdk/edgeagent/ConnectionManagerTest.kt
@@ -1,10 +1,10 @@
 package org.hyperledger.identus.walletsdk.edgeagent
 
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.hyperledger.identus.apollo.base64.base64UrlEncoded
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Castor
@@ -54,7 +54,8 @@ class ConnectionManagerTest {
 
     lateinit var connectionManager: ConnectionManagerImpl
 
-    val testDispatcher = TestCoroutineDispatcher()
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val testDispatcher = UnconfinedTestDispatcher()
 
     @BeforeTest
     fun setup() {
@@ -118,7 +119,7 @@ class ConnectionManagerTest {
         `when`(castorMock.resolveDID(any())).thenReturn(didDoc)
 
         connectionManager.startFetchingMessages()
-        assertNotNull((connectionManager as ConnectionManagerImpl).fetchingMessagesJob)
+        assertNotNull(connectionManager.fetchingMessagesJob)
         verify(basicMediatorHandlerMock).listenUnreadMessages(any(), any())
     }
 
@@ -220,91 +221,91 @@ class ConnectionManagerTest {
     }
 
     @Test
-    fun testStartFetchingMessages_whenServiceEndpointNotContainsWSS_thenUseAPIRequest() =
-        runBlockingTest {
-            `when`(basicMediatorHandlerMock.mediatorDID)
-                .thenReturn(DID("did:prism:b6c0c33d701ac1b9a262a14454d1bbde3d127d697a76950963c5fd930605:Cj8KPRI7CgdtYXN0ZXIwEAFKLgoJc2VmsxEiECSTjyV7sUfCr_ArpN9rvCwR9fRMAhcsr_S7ZRiJk4p5k"))
-
-            val vmAuthentication = DIDDocument.VerificationMethod(
-                id = DIDUrl(DID("2", "1", "0")),
-                controller = DID("2", "2", "0"),
-                type = Curve.ED25519.value,
-                publicKeyJwk = mapOf("crv" to Curve.ED25519.value, "x" to "")
-            )
+    fun testStartFetchingMessages_whenServiceEndpointNotContainsWSS_thenUseAPIRequest() = runTest {
+        `when`(basicMediatorHandlerMock.mediatorDID)
+            .thenReturn(DID("did:prism:b6c0c33d701ac1b9a262a14454d1bbde3d127d697a76950963c5fd930605:Cj8KPRI7CgdtYXN0ZXIwEAFKLgoJc2VmsxEiECSTjyV7sUfCr_ArpN9rvCwR9fRMAhcsr_S7ZRiJk4p5k"))
 
-            val vmKeyAgreement = DIDDocument.VerificationMethod(
-                id = DIDUrl(DID("3", "1", "0")),
-                controller = DID("3", "2", "0"),
-                type = Curve.X25519.value,
-                publicKeyJwk = mapOf("crv" to Curve.X25519.value, "x" to "")
-            )
+        val vmAuthentication = DIDDocument.VerificationMethod(
+            id = DIDUrl(DID("2", "1", "0")),
+            controller = DID("2", "2", "0"),
+            type = Curve.ED25519.value,
+            publicKeyJwk = mapOf("crv" to Curve.ED25519.value, "x" to "")
+        )
 
-            val vmService = DIDDocument.Service(
-                id = UUID.randomUUID().toString(),
-                type = emptyArray(),
-                serviceEndpoint = DIDDocument.ServiceEndpoint(
-                    uri = "https://serviceEndpoint"
-                )
+        val vmKeyAgreement = DIDDocument.VerificationMethod(
+            id = DIDUrl(DID("3", "1", "0")),
+            controller = DID("3", "2", "0"),
+            type = Curve.X25519.value,
+            publicKeyJwk = mapOf("crv" to Curve.X25519.value, "x" to "")
+        )
+
+        val vmService = DIDDocument.Service(
+            id = UUID.randomUUID().toString(),
+            type = emptyArray(),
+            serviceEndpoint = DIDDocument.ServiceEndpoint(
+                uri = "https://serviceEndpoint"
             )
+        )
 
-            val didDoc = DIDDocument(
-                id = DID("did:prism:asdfasdf"),
-                coreProperties = arrayOf(
-                    DIDDocument.Authentication(
-                        urls = emptyArray(),
-                        verificationMethods = arrayOf(vmAuthentication)
-                    ),
-                    DIDDocument.KeyAgreement(
-                        urls = emptyArray(),
-                        verificationMethods = arrayOf(vmKeyAgreement)
-                    ),
-                    DIDDocument.Services(
-                        values = arrayOf(vmService)
-                    )
+        val didDoc = DIDDocument(
+            id = DID("did:prism:asdfasdf"),
+            coreProperties = arrayOf(
+                DIDDocument.Authentication(
+                    urls = emptyArray(),
+                    verificationMethods = arrayOf(vmAuthentication)
+                ),
+                DIDDocument.KeyAgreement(
+                    urls = emptyArray(),
+                    verificationMethods = arrayOf(vmKeyAgreement)
+                ),
+                DIDDocument.Services(
+                    values = arrayOf(vmService)
                 )
             )
+        )
 
-            `when`(castorMock.resolveDID(any())).thenReturn(didDoc)
-            val messages = arrayOf(Pair("1234", Message(piuri = "", body = "")))
-            `when`(basicMediatorHandlerMock.pickupUnreadMessages(any())).thenReturn(
-                flow {
-                    emit(
-                        messages
-                    )
-                }
-            )
-            val attachments: Array<AttachmentDescriptor> =
-                arrayOf(
-                    AttachmentDescriptor(
-                        mediaType = "application/json",
-                        format = CredentialType.JWT.type,
-                        data = AttachmentBase64(base64 = "asdfasdfasdfasdfasdfasdfasdfasdfasdf".base64UrlEncoded)
-                    )
+        `when`(castorMock.resolveDID(any())).thenReturn(didDoc)
+        val messages = arrayOf(Pair("1234", Message(piuri = "", body = "")))
+        `when`(basicMediatorHandlerMock.pickupUnreadMessages(any())).thenReturn(
+            flow {
+                emit(
+                    messages
                 )
-            val listMessages = listOf(
-                Message(
-                    piuri = ProtocolType.DidcommconnectionRequest.value,
-                    body = ""
-                ),
-                Message(
-                    piuri = ProtocolType.DidcommIssueCredential.value,
-                    thid = UUID.randomUUID().toString(),
-                    from = DID("did:peer:asdf897a6sdf"),
-                    to = DID("did:peer:f706sg678ha"),
-                    attachments = attachments,
-                    body = """{}"""
+            }
+        )
+        val attachments: Array<AttachmentDescriptor> =
+            arrayOf(
+                AttachmentDescriptor(
+                    mediaType = "application/json",
+                    format = CredentialType.JWT.type,
+                    data = AttachmentBase64(base64 = "asdfasdfasdfasdfasdfasdfasdfasdfasdf".base64UrlEncoded)
                 )
             )
-            val messageList: Flow<List<Message>> = flow {
-                emit(listMessages)
-            }
-            `when`(plutoMock.getAllMessages()).thenReturn(messageList)
-
-            connectionManager.startFetchingMessages()
-            assertNotNull((connectionManager as ConnectionManagerImpl).fetchingMessagesJob)
-            verify(basicMediatorHandlerMock).pickupUnreadMessages(10)
-            verify(basicMediatorHandlerMock).registerMessagesAsRead(arrayOf("1234"))
+        val listMessages = listOf(
+            Message(
+                piuri = ProtocolType.DidcommconnectionRequest.value,
+                body = ""
+            ),
+            Message(
+                piuri = ProtocolType.DidcommIssueCredential.value,
+                thid = UUID.randomUUID().toString(),
+                from = DID("did:peer:asdf897a6sdf"),
+                to = DID("did:peer:f706sg678ha"),
+                attachments = attachments,
+                body = """{}"""
+            )
+        )
+        val messageList: Flow<List<Message>> = flow {
+            emit(listMessages)
         }
+        `when`(plutoMock.getAllMessages()).thenReturn(messageList)
+
+        connectionManager.startFetchingMessages()
+        assertNotNull(connectionManager.fetchingMessagesJob)
+        assert(connectionManager.fetchingMessagesJob?.isActive == true)
+        verify(basicMediatorHandlerMock).pickupUnreadMessages(10)
+        verify(basicMediatorHandlerMock).registerMessagesAsRead(arrayOf("1234"))
+    }
 
     @Test
     fun testConnectionManager_whenProcessMessageRevoke_thenAllCorrect() = runTest {