From c7894351285f9bff4df715919db10c5b3df7ccd0 Mon Sep 17 00:00:00 2001 From: Cristian G Date: Tue, 4 Jun 2024 09:31:33 -0400 Subject: [PATCH 1/8] fix: e2e test broken after pull credential changed based on validUntil --- .../identus/walletsdk/pluto/PlutoImpl.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt b/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt index 3e44778db..5cd10e8a0 100644 --- a/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt +++ b/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt @@ -6,7 +6,6 @@ import app.cash.sqldelight.coroutines.mapToList import app.cash.sqldelight.db.AfterVersion import io.iohk.atala.prism.apollo.base64.base64UrlDecodedBytes import io.iohk.atala.prism.apollo.base64.base64UrlEncoded -import io.ktor.util.date.getTimeMillis import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow @@ -976,19 +975,13 @@ class PlutoImpl(private val connection: DbConnection) : Pluto { override fun getAllCredentials(): Flow> { return getInstance().storableCredentialQueries.fetchAllCredentials() .asFlow() - .map { - it.executeAsList() - .mapNotNull { credential -> - // Convert timestamp in millisecond to seconds to compare with the credential timestamp - if (credential.validUntil != null && credential.validUntil.toInt() > (getTimeMillis() / 1000)) { + .map { list -> + list.executeAsList() + .map { credential -> CredentialRecovery( restorationId = credential.recoveryId, credentialData = credential.credentialData, - revoked = credential.revoked != 0 - ) - } else { - null - } + revoked = credential.revoked != 0) }.takeIf { it.isNotEmpty() } ?: emptyList() } } From 213ec4f064609bd27f04e146a1298703e019f709 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 4 Jun 2024 19:05:32 +0300 Subject: [PATCH 2/8] chore: linting Signed-off-by: Ahmed Moussa --- .../org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt b/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt index 5cd10e8a0..069539346 100644 --- a/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt +++ b/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoImpl.kt @@ -978,10 +978,11 @@ class PlutoImpl(private val connection: DbConnection) : Pluto { .map { list -> list.executeAsList() .map { credential -> - CredentialRecovery( - restorationId = credential.recoveryId, - credentialData = credential.credentialData, - revoked = credential.revoked != 0) + CredentialRecovery( + restorationId = credential.recoveryId, + credentialData = credential.credentialData, + revoked = credential.revoked != 0 + ) }.takeIf { it.isNotEmpty() } ?: emptyList() } } From 1a5364f178ac0f5ad301578c761fb1bfef2cdff5 Mon Sep 17 00:00:00 2001 From: Allain Magyar Date: Wed, 29 May 2024 01:11:40 -0300 Subject: [PATCH 3/8] chore: renames e2e test folder Signed-off-by: Allain Magyar --- tests/end-to-end/build.gradle.kts | 2 +- .../hyperledger/identus}/TestSuite.kt | 2 +- .../identus}/abilities/UseWalletSdk.kt | 6 +-- .../identus}/configuration/Environment.kt | 37 +++++++++---------- .../identus}/configuration/HooksSetup.kt | 4 +- .../identus}/models/AnoncredSchema.kt | 2 +- .../hyperledger/identus}/models/JwtSchema.kt | 2 +- .../identus}/models/JwtSchemaProperty.kt | 2 +- .../identus}/steps/CloudAgentSteps.kt | 6 +-- .../identus}/steps/EdgeAgentSteps.kt | 8 ++-- .../hyperledger/identus}/utils/Notes.kt | 2 +- .../hyperledger/identus}/utils/Utils.kt | 2 +- .../identus}/workflow/CloudAgentWorkflow.kt | 6 +-- .../identus}/workflow/EdgeAgentWorkflow.kt | 4 +- ....properties.example => example.properties} | 2 +- 15 files changed, 43 insertions(+), 44 deletions(-) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/TestSuite.kt (90%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/abilities/UseWalletSdk.kt (97%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/configuration/Environment.kt (88%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/configuration/HooksSetup.kt (89%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/models/AnoncredSchema.kt (90%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/models/JwtSchema.kt (91%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/models/JwtSchemaProperty.kt (78%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/steps/CloudAgentSteps.kt (95%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/steps/EdgeAgentSteps.kt (95%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/utils/Notes.kt (95%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/utils/Utils.kt (92%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/workflow/CloudAgentWorkflow.kt (98%) rename tests/end-to-end/src/test/kotlin/{io/iohk/atala/prism => org/hyperledger/identus}/workflow/EdgeAgentWorkflow.kt (97%) rename tests/end-to-end/src/test/resources/{local.properties.example => example.properties} (81%) diff --git a/tests/end-to-end/build.gradle.kts b/tests/end-to-end/build.gradle.kts index d8bc6de39..cd1309200 100644 --- a/tests/end-to-end/build.gradle.kts +++ b/tests/end-to-end/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("net.serenity-bdd.serenity-gradle-plugin") version "4.0.1" } -group = "io.iohk.atala.prism" +group = "org.hyperledger.identus" version = "1.0-SNAPSHOT" repositories { diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/TestSuite.kt similarity index 90% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/TestSuite.kt index ec4af8011..6a819bc13 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/TestSuite.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism +package org.hyperledger.identus import io.cucumber.junit.CucumberOptions import net.serenitybdd.cucumber.CucumberWithSerenity diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/abilities/UseWalletSdk.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/abilities/UseWalletSdk.kt similarity index 97% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/abilities/UseWalletSdk.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/abilities/UseWalletSdk.kt index 1a234ef92..96244bba0 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/abilities/UseWalletSdk.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/abilities/UseWalletSdk.kt @@ -1,8 +1,8 @@ -package io.iohk.atala.prism.abilities +package org.hyperledger.identus.abilities import com.jayway.jsonpath.JsonPath import io.iohk.atala.automation.utils.Logger -import io.iohk.atala.prism.configuration.Environment +import org.hyperledger.identus.configuration.Environment import io.iohk.atala.prism.walletsdk.apollo.ApolloImpl import io.iohk.atala.prism.walletsdk.castor.CastorImpl import io.iohk.atala.prism.walletsdk.domain.models.ApiImpl @@ -17,7 +17,7 @@ import io.iohk.atala.prism.walletsdk.pollux.PolluxImpl import io.iohk.atala.prism.walletsdk.prismagent.PrismAgent import io.iohk.atala.prism.walletsdk.prismagent.mediation.BasicMediatorHandler import io.iohk.atala.prism.walletsdk.prismagent.protocols.ProtocolType -import io.iohk.atala.prism.workflow.EdgeAgentWorkflow +import org.hyperledger.identus.workflow.EdgeAgentWorkflow import io.restassured.RestAssured import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/configuration/Environment.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/configuration/Environment.kt similarity index 88% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/configuration/Environment.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/configuration/Environment.kt index c068405a4..7fca2739c 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/configuration/Environment.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/configuration/Environment.kt @@ -1,23 +1,22 @@ -package io.iohk.atala.prism.configuration +package org.hyperledger.identus.configuration -import io.cucumber.java.BeforeAll -import io.iohk.atala.automation.utils.Logger import io.iohk.atala.automation.utils.Wait import io.iohk.atala.prism.models.* -import io.iohk.atala.prism.utils.Notes +import org.hyperledger.identus.utils.Notes import io.restassured.RestAssured import io.restassured.builder.RequestSpecBuilder import io.restassured.response.Response import net.serenitybdd.rest.SerenityRest import org.apache.http.HttpStatus import org.assertj.core.api.Assertions.assertThat +import org.hyperledger.identus.models.AnoncredSchema +import org.hyperledger.identus.models.JwtSchema +import org.hyperledger.identus.models.JwtSchemaProperty import java.io.File import java.util.* import kotlin.time.Duration.Companion.seconds object Environment { - private val logger = Logger.get() - lateinit var agentUrl: String lateinit var mediatorOobUrl: String lateinit var publishedDid: String @@ -43,7 +42,7 @@ object Environment { properties.putAll(System.getenv()) mediatorOobUrl = properties.getProperty("MEDIATOR_OOB_URL") - agentUrl = properties.getProperty("PRISM_AGENT_URL") + agentUrl = properties.getProperty("AGENT_URL") // set base uri for rest assured RestAssured.baseURI = agentUrl @@ -77,7 +76,7 @@ object Environment { } /** - * Checks if the environment PUBLISHED_DID variable exists in prism-agent, otherwise it creates a new one. + * Checks if the environment PUBLISHED_DID variable exists in cloud-agent, otherwise it creates a new one. */ private fun preparePublishedDid(publishedDid: String?) { try { @@ -85,7 +84,7 @@ object Environment { RestAssured .given().get("did-registrar/dids/$publishedDid") .then().assertThat().statusCode(200) - this.publishedDid = publishedDid!! + Environment.publishedDid = publishedDid!! return } catch (e: AssertionError) { Notes.appendMessage("DID [${publishedDid}] not found. Creating a new one.") @@ -124,11 +123,11 @@ object Environment { .thenReturn() response.body.jsonPath().getString("status") == "PUBLISHED" } - this.publishedDid = response.body.jsonPath().getString("did") + Environment.publishedDid = response.body.jsonPath().getString("did") } /** - * Checks if the environment variable exists in prism-agent, otherwise it creates a new one. + * Checks if the environment variable exists in cloud-agent, otherwise it creates a new one. */ private fun checkJwtSchema(schemaGuid: String?) { try { @@ -136,7 +135,7 @@ object Environment { RestAssured .given().get("schema-registry/schemas/$schemaGuid") .then().assertThat().statusCode(200) - this.jwtSchemaGuid = schemaGuid!! + jwtSchemaGuid = schemaGuid!! return } catch (e: AssertionError) { Notes.appendMessage("JWT schema [${schemaGuid}] not found. Creating a new one.") @@ -154,7 +153,7 @@ object Environment { jwtSchema.properties["automation-optional"] = JwtSchemaProperty("string") val credentialSchemaInput = CredentialSchemaInput( - author = this.publishedDid, + author = publishedDid, description = "Some description to automation generated schema", name = schemaName, tags = listOf("automation"), @@ -168,7 +167,7 @@ object Environment { .post("/schema-registry/schemas") .thenReturn() - this.jwtSchemaGuid = schemaCreationResponse.body.jsonPath().getString("guid") + jwtSchemaGuid = schemaCreationResponse.body.jsonPath().getString("guid") } private fun checkAnonCredSchema(definitionId: String?) { @@ -178,7 +177,7 @@ object Environment { .given().get("credential-definition-registry/definitions/${definitionId}") .then().assertThat().statusCode(200) - this.anoncredDefinitionId = definitionId!! + anoncredDefinitionId = definitionId!! return } catch (e: AssertionError) { Notes.appendMessage("Anoncred Definition not found for [${definitionId}]. Creating a new one.") @@ -189,11 +188,11 @@ object Environment { val anoncredSchema = AnoncredSchema() anoncredSchema.name = "Automation Anoncred" anoncredSchema.version = "1.0" - anoncredSchema.issuerId = this.publishedDid + anoncredSchema.issuerId = publishedDid anoncredSchema.attrNames = mutableListOf("name", "age", "gender") val credentialSchemaInput = CredentialSchemaInput( - author = this.publishedDid, + author = publishedDid, description = "Some description to automation generated schema", name = schemaName, tags = listOf("automation"), @@ -217,7 +216,7 @@ object Environment { version = "1.0.0", tag = "automation-test", author = publishedDid, - schemaId = "${agentUrl}/schema-registry/schemas/${newSchemaGuid}/schema", + schemaId = "$agentUrl/schema-registry/schemas/${newSchemaGuid}/schema", signatureType = "CL", supportRevocation = false, description = "Test Automation Auto-Generated" @@ -228,6 +227,6 @@ object Environment { .then().assertThat().statusCode(201) .extract().`as`(CredentialDefinitionResponse::class.java) - this.anoncredDefinitionId = credentialDefinition.guid.toString() + anoncredDefinitionId = credentialDefinition.guid.toString() } } diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/configuration/HooksSetup.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/configuration/HooksSetup.kt similarity index 89% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/configuration/HooksSetup.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/configuration/HooksSetup.kt index 462cb0e65..8651276a7 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/configuration/HooksSetup.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/configuration/HooksSetup.kt @@ -1,9 +1,9 @@ -package io.iohk.atala.prism.configuration +package org.hyperledger.identus.configuration import io.cucumber.java.Before import io.cucumber.java.BeforeAll import io.cucumber.java.ParameterType -import io.iohk.atala.prism.abilities.UseWalletSdk +import org.hyperledger.identus.abilities.UseWalletSdk import net.serenitybdd.screenplay.Actor import net.serenitybdd.screenplay.actors.Cast import net.serenitybdd.screenplay.actors.OnStage diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/AnoncredSchema.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/AnoncredSchema.kt similarity index 90% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/AnoncredSchema.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/AnoncredSchema.kt index 3a6fe259a..17a7ff511 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/AnoncredSchema.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/AnoncredSchema.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.models +package org.hyperledger.identus.models import com.google.gson.annotations.SerializedName diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/JwtSchema.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/JwtSchema.kt similarity index 91% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/JwtSchema.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/JwtSchema.kt index 32e077cf1..50a46d014 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/JwtSchema.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/JwtSchema.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.models +package org.hyperledger.identus.models import com.google.gson.annotations.SerializedName diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/JwtSchemaProperty.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/JwtSchemaProperty.kt similarity index 78% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/JwtSchemaProperty.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/JwtSchemaProperty.kt index 818147316..a7b765c3a 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/models/JwtSchemaProperty.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/models/JwtSchemaProperty.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.models +package org.hyperledger.identus.models import com.google.gson.annotations.SerializedName diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/steps/CloudAgentSteps.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/steps/CloudAgentSteps.kt similarity index 95% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/steps/CloudAgentSteps.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/steps/CloudAgentSteps.kt index db706587a..ab988d58a 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/steps/CloudAgentSteps.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/steps/CloudAgentSteps.kt @@ -1,10 +1,10 @@ -package io.iohk.atala.prism.steps +package org.hyperledger.identus.steps import io.cucumber.java.en.Given import io.cucumber.java.en.Then import io.cucumber.java.en.When -import io.iohk.atala.prism.workflow.CloudAgentWorkflow -import io.iohk.atala.prism.workflow.EdgeAgentWorkflow +import org.hyperledger.identus.workflow.CloudAgentWorkflow +import org.hyperledger.identus.workflow.EdgeAgentWorkflow import net.serenitybdd.screenplay.Actor import javax.inject.Inject diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/steps/EdgeAgentSteps.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/steps/EdgeAgentSteps.kt similarity index 95% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/steps/EdgeAgentSteps.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/steps/EdgeAgentSteps.kt index 790197c1d..b22ac491f 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/steps/EdgeAgentSteps.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/steps/EdgeAgentSteps.kt @@ -1,11 +1,11 @@ -package io.iohk.atala.prism.steps +package org.hyperledger.identus.steps import io.cucumber.java.After import io.cucumber.java.en.Then import io.cucumber.java.en.When -import io.iohk.atala.prism.abilities.UseWalletSdk -import io.iohk.atala.prism.workflow.CloudAgentWorkflow -import io.iohk.atala.prism.workflow.EdgeAgentWorkflow +import org.hyperledger.identus.abilities.UseWalletSdk +import org.hyperledger.identus.workflow.CloudAgentWorkflow +import org.hyperledger.identus.workflow.EdgeAgentWorkflow import net.serenitybdd.screenplay.Actor import net.serenitybdd.screenplay.actors.OnStage import javax.inject.Inject diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/utils/Notes.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/utils/Notes.kt similarity index 95% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/utils/Notes.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/utils/Notes.kt index 8cfd04e6a..ada383a45 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/utils/Notes.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/utils/Notes.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.utils +package org.hyperledger.identus.utils import io.iohk.atala.automation.utils.Logger import java.io.File diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/utils/Utils.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/utils/Utils.kt similarity index 92% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/utils/Utils.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/utils/Utils.kt index 92a89f426..b68566a5c 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/utils/Utils.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/utils/Utils.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.utils +package org.hyperledger.identus.utils import java.security.SecureRandom diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/workflow/CloudAgentWorkflow.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/workflow/CloudAgentWorkflow.kt similarity index 98% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/workflow/CloudAgentWorkflow.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/workflow/CloudAgentWorkflow.kt index 25aaa188a..a297df67d 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/workflow/CloudAgentWorkflow.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/workflow/CloudAgentWorkflow.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.workflow +package org.hyperledger.identus.workflow import io.iohk.atala.automation.extensions.body import io.iohk.atala.automation.extensions.get @@ -6,7 +6,7 @@ import io.iohk.atala.automation.matchers.RestAssuredJsonProperty import io.iohk.atala.automation.serenity.ensure.Ensure import io.iohk.atala.automation.serenity.interactions.PollingWait import io.iohk.atala.automation.serenity.questions.HttpRequest -import io.iohk.atala.prism.configuration.Environment +import org.hyperledger.identus.configuration.Environment import io.iohk.atala.prism.models.AnoncredPresentationRequestV1 import io.iohk.atala.prism.models.AnoncredRequestedAttributeV1 import io.iohk.atala.prism.models.AnoncredRequestedPredicateV1 @@ -15,7 +15,7 @@ import io.iohk.atala.prism.models.CreateIssueCredentialRecordRequest import io.iohk.atala.prism.models.Options import io.iohk.atala.prism.models.ProofRequestAux import io.iohk.atala.prism.models.RequestPresentationInput -import io.iohk.atala.prism.utils.Utils +import org.hyperledger.identus.utils.Utils import net.serenitybdd.rest.SerenityRest.lastResponse import net.serenitybdd.screenplay.Actor import net.serenitybdd.screenplay.rest.interactions.Post diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/workflow/EdgeAgentWorkflow.kt b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/workflow/EdgeAgentWorkflow.kt similarity index 97% rename from tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/workflow/EdgeAgentWorkflow.kt rename to tests/end-to-end/src/test/kotlin/org/hyperledger/identus/workflow/EdgeAgentWorkflow.kt index 61af40d80..675f5a7e5 100644 --- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/workflow/EdgeAgentWorkflow.kt +++ b/tests/end-to-end/src/test/kotlin/org/hyperledger/identus/workflow/EdgeAgentWorkflow.kt @@ -1,9 +1,9 @@ -package io.iohk.atala.prism.workflow +package org.hyperledger.identus.workflow import com.google.gson.GsonBuilder import io.iohk.atala.automation.serenity.interactions.PollingWait import io.iohk.atala.automation.utils.Logger -import io.iohk.atala.prism.abilities.UseWalletSdk +import org.hyperledger.identus.abilities.UseWalletSdk import io.iohk.atala.prism.walletsdk.domain.models.CastorError import io.iohk.atala.prism.walletsdk.prismagent.protocols.issueCredential.IssueCredential import io.iohk.atala.prism.walletsdk.prismagent.protocols.issueCredential.OfferCredential diff --git a/tests/end-to-end/src/test/resources/local.properties.example b/tests/end-to-end/src/test/resources/example.properties similarity index 81% rename from tests/end-to-end/src/test/resources/local.properties.example rename to tests/end-to-end/src/test/resources/example.properties index c9e5a3a37..0aa8c6ca4 100644 --- a/tests/end-to-end/src/test/resources/local.properties.example +++ b/tests/end-to-end/src/test/resources/example.properties @@ -1,5 +1,5 @@ MEDIATOR_OOB_URL= -PRISM_AGENT_URL= +AGENT_URL= PUBLISHED_DID= JWT_SCHEMA_ID= ANONCRED_SCHEMA_ID= From f7dda10ff2cf38828ec5800b2e1ecffff91b51b1 Mon Sep 17 00:00:00 2001 From: mkbreuning <97112931+mkbreuningIOHK@users.noreply.github.com> Date: Wed, 29 May 2024 13:30:52 +0800 Subject: [PATCH 4/8] Update CreateConnection.feature renaming PRISM Agent renamed to Cloud Agent --- .../test/resources/features/connection/CreateConnection.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/end-to-end/src/test/resources/features/connection/CreateConnection.feature b/tests/end-to-end/src/test/resources/features/connection/CreateConnection.feature index 26993017e..d7637dd74 100644 --- a/tests/end-to-end/src/test/resources/features/connection/CreateConnection.feature +++ b/tests/end-to-end/src/test/resources/features/connection/CreateConnection.feature @@ -1,6 +1,6 @@ @connection Feature: Create connection - The Edge Agent should be able to create a connection to prism-agent + The Edge Agent should be able to create a connection to Cloud Agent Scenario Outline: Create connection Given Cloud Agent has a connection invitation with '