diff --git a/tests/integration-tests/src/test/kotlin/config/services/Agent.kt b/tests/integration-tests/src/test/kotlin/config/services/Agent.kt index 770c2cb424..f4d7cc0962 100644 --- a/tests/integration-tests/src/test/kotlin/config/services/Agent.kt +++ b/tests/integration-tests/src/test/kotlin/config/services/Agent.kt @@ -6,7 +6,6 @@ import org.testcontainers.containers.ComposeContainer import org.testcontainers.containers.wait.strategy.Wait import java.io.* - data class Agent( val version: String, @ConfigAlias("http_port") val httpPort: Int, @@ -18,7 +17,7 @@ data class Agent( val keycloak: Keycloak?, val vault: Vault?, @ConfigAlias("keep_running") override val keepRunning: Boolean = false, - ) : ServiceBase() { +) : ServiceBase() { override val logServices = listOf("identus-cloud-agent") override val container: ComposeContainer diff --git a/tests/integration-tests/src/test/kotlin/config/services/Vault.kt b/tests/integration-tests/src/test/kotlin/config/services/Vault.kt index 28b407b551..85f1a02b27 100644 --- a/tests/integration-tests/src/test/kotlin/config/services/Vault.kt +++ b/tests/integration-tests/src/test/kotlin/config/services/Vault.kt @@ -23,7 +23,7 @@ data class Vault( mapOf( "VAULT_PORT" to httpPort.toString(), - ), + ), ).waitingFor( "vault", Wait.forHealthcheck(), diff --git a/tests/integration-tests/src/test/kotlin/config/services/VerifiableDataRegistry.kt b/tests/integration-tests/src/test/kotlin/config/services/VerifiableDataRegistry.kt index ee624f8dd7..2997f567cc 100644 --- a/tests/integration-tests/src/test/kotlin/config/services/VerifiableDataRegistry.kt +++ b/tests/integration-tests/src/test/kotlin/config/services/VerifiableDataRegistry.kt @@ -9,7 +9,7 @@ data class VerifiableDataRegistry( @ConfigAlias("http_port") val httpPort: Int, val version: String, @ConfigAlias("keep_running") override val keepRunning: Boolean = false, - ) : ServiceBase() { +) : ServiceBase() { override val logServices: List = listOf("prism-node") private val vdrComposeFile = "src/test/resources/containers/vdr.yml" override val container: ComposeContainer = ComposeContainer(File(vdrComposeFile)).withEnv( diff --git a/tests/integration-tests/src/test/kotlin/steps/Setup.kt b/tests/integration-tests/src/test/kotlin/steps/Setup.kt index fee9f80f58..57b035ab9d 100644 --- a/tests/integration-tests/src/test/kotlin/steps/Setup.kt +++ b/tests/integration-tests/src/test/kotlin/steps/Setup.kt @@ -10,12 +10,10 @@ import io.cucumber.java.AfterAll import io.cucumber.java.BeforeAll import io.restassured.RestAssured import io.restassured.builder.RequestSpecBuilder -import net.serenitybdd.core.di.SerenityInfrastructure 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 net.thucydides.model.configuration.SystemPropertiesConfiguration import org.apache.http.HttpStatus import org.hyperledger.identus.client.models.CreateWalletRequest import org.hyperledger.identus.client.models.CreateWebhookNotification diff --git a/tests/integration-tests/src/test/kotlin/steps/credentials/IssueCredentialsSteps.kt b/tests/integration-tests/src/test/kotlin/steps/credentials/IssueCredentialsSteps.kt index 9a33151ae4..5c2c713ef9 100644 --- a/tests/integration-tests/src/test/kotlin/steps/credentials/IssueCredentialsSteps.kt +++ b/tests/integration-tests/src/test/kotlin/steps/credentials/IssueCredentialsSteps.kt @@ -141,13 +141,13 @@ class IssueCredentialsSteps { fun holderReceivesCredentialOffer(holder: Actor) { Wait.until( errorMessage = "Holder was unable to receive the credential offer from Issuer! " + - "Protocol state did not achieve ${IssueCredentialRecord.ProtocolState.OFFER_RECEIVED} state.", + "Protocol state did not achieve ${IssueCredentialRecord.ProtocolState.OFFER_RECEIVED} state.", ) { credentialEvent = ListenToEvents.with(holder).credentialEvents.lastOrNull { it.data.thid == holder.recall("thid") } credentialEvent != null && - credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.OFFER_RECEIVED + credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.OFFER_RECEIVED } val recordId = ListenToEvents.with(holder).credentialEvents.last().data.recordId @@ -193,7 +193,7 @@ class IssueCredentialsSteps { it.data.thid == issuer.recall("thid") } credentialEvent != null && - credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.REQUEST_RECEIVED + credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.REQUEST_RECEIVED } val recordId = credentialEvent!!.data.recordId issuer.attemptsTo( @@ -206,7 +206,7 @@ class IssueCredentialsSteps { Wait.until( 10.seconds, errorMessage = "Issuer was unable to issue the credential! " + - "Protocol state did not achieve ${IssueCredentialRecord.ProtocolState.CREDENTIAL_SENT} state.", + "Protocol state did not achieve ${IssueCredentialRecord.ProtocolState.CREDENTIAL_SENT} state.", ) { credentialEvent = ListenToEvents.with(issuer).credentialEvents.lastOrNull { it.data.thid == issuer.recall("thid") @@ -214,7 +214,7 @@ class IssueCredentialsSteps { issuer.remember("issuedCredential", credentialEvent!!.data) credentialEvent != null && - credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.CREDENTIAL_SENT + credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.CREDENTIAL_SENT } } @@ -222,13 +222,13 @@ class IssueCredentialsSteps { fun bobHasTheCredentialIssued(holder: Actor) { Wait.until( errorMessage = "Holder was unable to receive the credential from Issuer! " + - "Protocol state did not achieve ${IssueCredentialRecord.ProtocolState.CREDENTIAL_RECEIVED} state.", + "Protocol state did not achieve ${IssueCredentialRecord.ProtocolState.CREDENTIAL_RECEIVED} state.", ) { credentialEvent = ListenToEvents.with(holder).credentialEvents.lastOrNull { it.data.thid == holder.recall("thid") } credentialEvent != null && - credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.CREDENTIAL_RECEIVED + credentialEvent!!.data.protocolState == IssueCredentialRecord.ProtocolState.CREDENTIAL_RECEIVED } holder.remember("issuedCredential", ListenToEvents.with(holder).credentialEvents.last().data) }