Merge remote-tracking branch 'origin/main'

hyperledger · May 7, 2024 · 2c76fa5 · 2c76fa5
2 parents cc64fb4 + d674f31
commit 2c76fa5
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 68 deletions.
diff --git a/tests/integration-tests/build.gradle.kts b/tests/integration-tests/build.gradle.kts
@@ -33,9 +33,9 @@ dependencies {
     testImplementation("io.ktor:ktor-server-netty:2.3.0")
     testImplementation("io.ktor:ktor-client-apache:2.3.0")
     // RestAPI client
-    testImplementation("org.hyperledger.identus:cloud-agent-client-kotlin:1.32.0")
+    testImplementation("org.hyperledger.identus:cloud-agent-client-kotlin:1.32.1")
     // Test helpers library
-    testImplementation("io.iohk.atala:atala-automation:0.3.2")
+    testImplementation("io.iohk.atala:atala-automation:0.4.0")
     // Hoplite for configuration
     testImplementation("com.sksamuel.hoplite:hoplite-core:2.7.5")
     testImplementation("com.sksamuel.hoplite:hoplite-hocon:2.7.5")

diff --git a/tests/integration-tests/src/test/kotlin/abilities/ListenToEvents.kt b/tests/integration-tests/src/test/kotlin/abilities/ListenToEvents.kt
@@ -23,9 +23,7 @@ open class ListenToEvents(
 ) : Ability, HasTeardown {
 
     private val server: ApplicationEngine
-    private val gson = GsonBuilder()
-        .registerTypeAdapter(OffsetDateTime::class.java, CustomGsonObjectMapperFactory.OffsetDateTimeDeserializer())
-        .create()
+    private val gson = GsonBuilder().registerTypeAdapter(OffsetDateTime::class.java, CustomGsonObjectMapperFactory.OffsetDateTimeTypeAdapter()).create()
 
     var connectionEvents: MutableList<ConnectionEvent> = mutableListOf()
     var credentialEvents: MutableList<CredentialEvent> = mutableListOf()

diff --git a/tests/integration-tests/src/test/kotlin/common/CredentialSchema.kt b/tests/integration-tests/src/test/kotlin/common/CredentialSchema.kt
@@ -1,8 +1,8 @@
 package common
 
-import org.hyperledger.identus.client.models.CredentialSchemaInput
 import models.JsonSchema
 import models.JsonSchemaProperty
+import org.hyperledger.identus.client.models.CredentialSchemaInput
 import java.util.UUID
 
 enum class CredentialSchema {

diff --git a/tests/integration-tests/src/test/kotlin/steps/Setup.kt b/tests/integration-tests/src/test/kotlin/steps/Setup.kt
@@ -8,15 +8,15 @@ import config.AgentRole
 import config.Config
 import io.cucumber.java.AfterAll
 import io.cucumber.java.BeforeAll
-import org.hyperledger.identus.client.models.CreateWalletRequest
-import org.hyperledger.identus.client.models.CreateWebhookNotification
 import io.restassured.RestAssured
 import io.restassured.builder.RequestSpecBuilder
 import net.serenitybdd.screenplay.Actor
 import net.serenitybdd.screenplay.actors.Cast
 import net.serenitybdd.screenplay.actors.OnStage
 import net.serenitybdd.screenplay.rest.abilities.CallAnApi
 import org.apache.http.HttpStatus
+import org.hyperledger.identus.client.models.CreateWalletRequest
+import org.hyperledger.identus.client.models.CreateWebhookNotification
 import java.util.UUID
 
 object Setup {

diff --git a/tests/integration-tests/src/test/kotlin/steps/common/CommonSteps.kt b/tests/integration-tests/src/test/kotlin/steps/common/CommonSteps.kt
@@ -5,14 +5,14 @@ import io.cucumber.java.ParameterType
 import io.cucumber.java.en.Given
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.Connection
-import org.hyperledger.identus.client.models.ConnectionsPage
-import org.hyperledger.identus.client.models.IssueCredentialRecord
-import org.hyperledger.identus.client.models.IssueCredentialRecordPage
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import net.serenitybdd.screenplay.actors.OnStage
 import org.apache.http.HttpStatus
+import org.hyperledger.identus.client.models.Connection
+import org.hyperledger.identus.client.models.ConnectionsPage
+import org.hyperledger.identus.client.models.IssueCredentialRecord
+import org.hyperledger.identus.client.models.IssueCredentialRecordPage
 import steps.connection.ConnectionSteps
 import steps.credentials.IssueCredentialsSteps
 import steps.did.PublishDidSteps

diff --git a/tests/integration-tests/src/test/kotlin/steps/connection/ConnectionSteps.kt b/tests/integration-tests/src/test/kotlin/steps/connection/ConnectionSteps.kt
@@ -8,14 +8,14 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.AcceptConnectionInvitationRequest
-import org.hyperledger.identus.client.models.Connection
-import org.hyperledger.identus.client.models.CreateConnectionRequest
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus.SC_CREATED
 import org.apache.http.HttpStatus.SC_OK
 import org.assertj.core.api.Assertions.assertThat
+import org.hyperledger.identus.client.models.AcceptConnectionInvitationRequest
+import org.hyperledger.identus.client.models.Connection
+import org.hyperledger.identus.client.models.CreateConnectionRequest
 
 class ConnectionSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/credentials/IssueCredentialsSteps.kt b/tests/integration-tests/src/test/kotlin/steps/credentials/IssueCredentialsSteps.kt
@@ -8,13 +8,13 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.*
 import models.AnoncredsSchema
 import models.CredentialEvent
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import net.serenitybdd.screenplay.rest.abilities.CallAnApi
 import org.apache.http.HttpStatus.*
+import org.hyperledger.identus.client.models.*
 import java.util.UUID
 
 class IssueCredentialsSteps {

diff --git a/tests/integration-tests/src/test/kotlin/steps/did/DeactivateDidSteps.kt b/tests/integration-tests/src/test/kotlin/steps/did/DeactivateDidSteps.kt
@@ -8,11 +8,11 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.DIDOperationResponse
-import org.hyperledger.identus.client.models.DIDResolutionResult
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus
+import org.hyperledger.identus.client.models.DIDOperationResponse
+import org.hyperledger.identus.client.models.DIDResolutionResult
 
 class DeactivateDidSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/did/ManageDidSteps.kt b/tests/integration-tests/src/test/kotlin/steps/did/ManageDidSteps.kt
@@ -7,6 +7,9 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
+import net.serenitybdd.rest.SerenityRest
+import net.serenitybdd.screenplay.Actor
+import org.apache.http.HttpStatus.SC_CREATED
 import org.hyperledger.identus.client.models.CreateManagedDidRequest
 import org.hyperledger.identus.client.models.CreateManagedDidRequestDocumentTemplate
 import org.hyperledger.identus.client.models.Json
@@ -15,9 +18,6 @@ import org.hyperledger.identus.client.models.ManagedDIDKeyTemplate
 import org.hyperledger.identus.client.models.ManagedDIDPage
 import org.hyperledger.identus.client.models.Purpose
 import org.hyperledger.identus.client.models.Service
-import net.serenitybdd.rest.SerenityRest
-import net.serenitybdd.screenplay.Actor
-import org.apache.http.HttpStatus.SC_CREATED
 
 class ManageDidSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/did/PublishDidSteps.kt b/tests/integration-tests/src/test/kotlin/steps/did/PublishDidSteps.kt
@@ -10,12 +10,12 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.*
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus
 import org.apache.http.HttpStatus.SC_CREATED
 import org.apache.http.HttpStatus.SC_OK
+import org.hyperledger.identus.client.models.*
 
 class PublishDidSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/did/UpdateDidSteps.kt b/tests/integration-tests/src/test/kotlin/steps/did/UpdateDidSteps.kt
@@ -8,6 +8,9 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
+import net.serenitybdd.rest.SerenityRest
+import net.serenitybdd.screenplay.Actor
+import org.apache.http.HttpStatus
 import org.hyperledger.identus.client.models.ActionType
 import org.hyperledger.identus.client.models.DIDOperationResponse
 import org.hyperledger.identus.client.models.DIDResolutionResult
@@ -19,9 +22,6 @@ import org.hyperledger.identus.client.models.Service
 import org.hyperledger.identus.client.models.UpdateManagedDIDRequest
 import org.hyperledger.identus.client.models.UpdateManagedDIDRequestAction
 import org.hyperledger.identus.client.models.UpdateManagedDIDServiceAction
-import net.serenitybdd.rest.SerenityRest
-import net.serenitybdd.screenplay.Actor
-import org.apache.http.HttpStatus
 
 class UpdateDidSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/multitenancy/EntitySteps.kt b/tests/integration-tests/src/test/kotlin/steps/multitenancy/EntitySteps.kt
@@ -3,12 +3,12 @@ package steps.multitenancy
 import interactions.Post
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.ApiKeyAuthenticationRequest
-import org.hyperledger.identus.client.models.CreateEntityRequest
-import org.hyperledger.identus.client.models.EntityResponse
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus.SC_CREATED
+import org.hyperledger.identus.client.models.ApiKeyAuthenticationRequest
+import org.hyperledger.identus.client.models.CreateEntityRequest
+import org.hyperledger.identus.client.models.EntityResponse
 import java.util.*
 
 class EntitySteps {

diff --git a/tests/integration-tests/src/test/kotlin/steps/multitenancy/EventsSteps.kt b/tests/integration-tests/src/test/kotlin/steps/multitenancy/EventsSteps.kt
@@ -2,9 +2,9 @@ package steps.multitenancy
 
 import interactions.Post
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.CreateWebhookNotification
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus
+import org.hyperledger.identus.client.models.CreateWebhookNotification
 
 class EventsSteps {
     fun registerNewWebhook(actor: Actor, webhookUrl: String) {

diff --git a/tests/integration-tests/src/test/kotlin/steps/multitenancy/WalletsSteps.kt b/tests/integration-tests/src/test/kotlin/steps/multitenancy/WalletsSteps.kt
@@ -8,12 +8,12 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.CreateWalletRequest
-import org.hyperledger.identus.client.models.WalletDetail
-import org.hyperledger.identus.client.models.WalletDetailPage
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus.*
+import org.hyperledger.identus.client.models.CreateWalletRequest
+import org.hyperledger.identus.client.models.WalletDetail
+import org.hyperledger.identus.client.models.WalletDetailPage
 import java.util.*
 import kotlin.random.Random
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/proofs/AnoncredsPresentProofSteps.kt b/tests/integration-tests/src/test/kotlin/steps/proofs/AnoncredsPresentProofSteps.kt
@@ -7,12 +7,12 @@ import interactions.Post
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.*
 import models.PresentationEvent
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import net.serenitybdd.screenplay.rest.abilities.CallAnApi
 import org.apache.http.HttpStatus.SC_CREATED
+import org.hyperledger.identus.client.models.*
 
 class AnoncredsPresentProofSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/proofs/PresentProofSteps.kt b/tests/integration-tests/src/test/kotlin/steps/proofs/PresentProofSteps.kt
@@ -8,11 +8,11 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.*
 import models.PresentationEvent
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus.SC_CREATED
+import org.hyperledger.identus.client.models.*
 
 class PresentProofSteps {
 

diff --git a/tests/integration-tests/src/test/kotlin/steps/schemas/CredentialSchemasSteps.kt b/tests/integration-tests/src/test/kotlin/steps/schemas/CredentialSchemasSteps.kt
@@ -11,12 +11,12 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.CredentialSchemaInput
-import org.hyperledger.identus.client.models.CredentialSchemaResponse
 import models.JsonSchema
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus.*
+import org.hyperledger.identus.client.models.CredentialSchemaInput
+import org.hyperledger.identus.client.models.CredentialSchemaResponse
 import java.util.UUID
 
 class CredentialSchemasSteps {

diff --git a/tests/integration-tests/src/test/kotlin/steps/system/SystemSteps.kt b/tests/integration-tests/src/test/kotlin/steps/system/SystemSteps.kt
@@ -5,10 +5,10 @@ import io.cucumber.java.en.Then
 import io.cucumber.java.en.When
 import io.iohk.atala.automation.extensions.get
 import io.iohk.atala.automation.serenity.ensure.Ensure
-import org.hyperledger.identus.client.models.HealthInfo
 import net.serenitybdd.rest.SerenityRest
 import net.serenitybdd.screenplay.Actor
 import org.apache.http.HttpStatus
+import org.hyperledger.identus.client.models.HealthInfo
 
 class SystemSteps {
     @When("{actor} makes a request to the health endpoint")