diff --git a/.gitignore b/.gitignore index 195cb999e..bcc0cd750 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ Pods/ dependinces.log node_modules megalinter-reports +tests/end-to-end/target diff --git a/tests/end-to-end/README.md b/tests/end-to-end/README.md index 0a08c974e..0a0aa815d 100644 --- a/tests/end-to-end/README.md +++ b/tests/end-to-end/README.md @@ -7,9 +7,9 @@ Duplicate `local.properties.example` file from `test/resources` and rename the c Setup properties: | Property | Explanation | -|--------------------------|------------------------------------| +| ------------------------ | ---------------------------------- | | MEDIATOR_OOB_URL | Mediator OOB url invitation | -| PRISM_AGENT_URL | Open enterprise agent url | +| AGENT_URL | Agent url | | PUBLISHED_DID | Existing published DID | | JWT_SCHEMA_GUID | Existing JWT schema guid | | ANONCRED_DEFINITION_GUID | Existing Anoncred definition guid | diff --git a/tests/end-to-end/build.gradle.kts b/tests/end-to-end/build.gradle.kts index d8bc6de39..fa47a2b1d 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 { @@ -28,7 +28,7 @@ repositories { } dependencies { - testImplementation("io.iohk.atala.prism.walletsdk:atala-prism-sdk:3.0.0") + testImplementation("org.hyperledger.identus:edge-agent-sdk:3.0.0") testImplementation("io.iohk.atala.prism:prism-kotlin-client:1.31.0") testImplementation("io.iohk.atala:atala-automation:0.3.2") } 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/walletsdk/TestSuite.kt similarity index 88% 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/walletsdk/TestSuite.kt index ec4af8011..bfbe04d33 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/walletsdk/TestSuite.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism +package org.hyperledger.identus.walletsdk 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/walletsdk/abilities/UseWalletSdk.kt similarity index 81% 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/walletsdk/abilities/UseWalletSdk.kt index 1a234ef92..e313f3ddc 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/walletsdk/abilities/UseWalletSdk.kt @@ -1,23 +1,10 @@ -package io.iohk.atala.prism.abilities +package org.hyperledger.identus.walletsdk.abilities import com.jayway.jsonpath.JsonPath import io.iohk.atala.automation.utils.Logger -import io.iohk.atala.prism.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 -import io.iohk.atala.prism.walletsdk.domain.models.DID -import io.iohk.atala.prism.walletsdk.domain.models.Message -import io.iohk.atala.prism.walletsdk.domain.models.httpClient -import io.iohk.atala.prism.walletsdk.mercury.MercuryImpl -import io.iohk.atala.prism.walletsdk.mercury.resolvers.DIDCommWrapper -import io.iohk.atala.prism.walletsdk.pluto.PlutoImpl -import io.iohk.atala.prism.walletsdk.pluto.data.DbConnection -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.walletsdk.configuration.Environment + +import org.hyperledger.identus.walletsdk.workflow.EdgeAgentWorkflow import io.restassured.RestAssured import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -27,6 +14,20 @@ import net.serenitybdd.screenplay.Ability import net.serenitybdd.screenplay.Actor import net.serenitybdd.screenplay.Question import net.serenitybdd.screenplay.SilentInteraction +import org.hyperledger.identus.walletsdk.apollo.ApolloImpl +import org.hyperledger.identus.walletsdk.castor.CastorImpl +import org.hyperledger.identus.walletsdk.domain.models.ApiImpl +import org.hyperledger.identus.walletsdk.domain.models.DID +import org.hyperledger.identus.walletsdk.domain.models.Message +import org.hyperledger.identus.walletsdk.domain.models.httpClient +import org.hyperledger.identus.walletsdk.edgeagent.EdgeAgent +import org.hyperledger.identus.walletsdk.edgeagent.mediation.BasicMediatorHandler +import org.hyperledger.identus.walletsdk.edgeagent.protocols.ProtocolType +import org.hyperledger.identus.walletsdk.mercury.MercuryImpl +import org.hyperledger.identus.walletsdk.mercury.resolvers.DIDCommWrapper +import org.hyperledger.identus.walletsdk.pluto.PlutoImpl +import org.hyperledger.identus.walletsdk.pluto.data.DbConnection +import org.hyperledger.identus.walletsdk.pollux.PolluxImpl import java.util.* @@ -98,7 +99,7 @@ class UseWalletSdk : Ability { val handler = BasicMediatorHandler(mediatorDid, mercury, store) val seed = apollo.createRandomSeed().seed - val sdk = PrismAgent( + val sdk = EdgeAgent( apollo, castor, pluto, @@ -146,7 +147,7 @@ class UseWalletSdk : Ability { } data class SdkContext( - val sdk: PrismAgent, + val sdk: EdgeAgent, val credentialOfferStack: MutableList = Collections.synchronizedList(mutableListOf()), val proofRequestStack: MutableList = Collections.synchronizedList(mutableListOf()), val issuedCredentialStack: MutableList = Collections.synchronizedList(mutableListOf()) 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/walletsdk/configuration/Environment.kt similarity index 87% 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/walletsdk/configuration/Environment.kt index c068405a4..7596b76b4 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/walletsdk/configuration/Environment.kt @@ -1,23 +1,22 @@ -package io.iohk.atala.prism.configuration +package org.hyperledger.identus.walletsdk.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.walletsdk.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.walletsdk.models.AnoncredSchema +import org.hyperledger.identus.walletsdk.models.JwtSchema +import org.hyperledger.identus.walletsdk.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 @@ -72,12 +71,12 @@ object Environment { private fun getSdkVersion(): String { val file = File("build.gradle.kts") val input = file.readText() - val regex = Regex("prism-sdk:(.*)(?=\")") + val regex = Regex("edge-agent-sdk:(.*)(?=\")") return regex.find(input)!!.groups[1]!!.value } /** - * 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/walletsdk/configuration/HooksSetup.kt similarity index 88% 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/walletsdk/configuration/HooksSetup.kt index 462cb0e65..419916b5f 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/walletsdk/configuration/HooksSetup.kt @@ -1,9 +1,9 @@ -package io.iohk.atala.prism.configuration +package org.hyperledger.identus.walletsdk.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.walletsdk.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/walletsdk/models/AnoncredSchema.kt similarity index 87% 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/walletsdk/models/AnoncredSchema.kt index 3a6fe259a..d0c91c3ff 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/walletsdk/models/AnoncredSchema.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.models +package org.hyperledger.identus.walletsdk.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/walletsdk/models/JwtSchema.kt similarity index 89% 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/walletsdk/models/JwtSchema.kt index 32e077cf1..2b05269f9 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/walletsdk/models/JwtSchema.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.models +package org.hyperledger.identus.walletsdk.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/walletsdk/models/JwtSchemaProperty.kt similarity index 73% 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/walletsdk/models/JwtSchemaProperty.kt index 818147316..83ff5bafa 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/walletsdk/models/JwtSchemaProperty.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.models +package org.hyperledger.identus.walletsdk.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/walletsdk/steps/CloudAgentSteps.kt similarity index 94% 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/walletsdk/steps/CloudAgentSteps.kt index db706587a..8bb6290c2 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/walletsdk/steps/CloudAgentSteps.kt @@ -1,10 +1,10 @@ -package io.iohk.atala.prism.steps +package org.hyperledger.identus.walletsdk.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.walletsdk.workflow.CloudAgentWorkflow +import org.hyperledger.identus.walletsdk.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/walletsdk/steps/EdgeAgentSteps.kt similarity index 92% 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/walletsdk/steps/EdgeAgentSteps.kt index 790197c1d..97752e4f8 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/walletsdk/steps/EdgeAgentSteps.kt @@ -1,11 +1,11 @@ -package io.iohk.atala.prism.steps +package org.hyperledger.identus.walletsdk.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.walletsdk.abilities.UseWalletSdk +import org.hyperledger.identus.walletsdk.workflow.CloudAgentWorkflow +import org.hyperledger.identus.walletsdk.workflow.EdgeAgentWorkflow import net.serenitybdd.screenplay.Actor import net.serenitybdd.screenplay.actors.OnStage import javax.inject.Inject @@ -119,6 +119,11 @@ class EdgeAgentSteps { edgeAgentWorkflow.processIssuedCredential(edgeAgent, numberOfCredentials) } + @Then("{actor} should have {} credentials") + fun `Edge Agent should have N credential`(actor: Actor, numberOfCredentials: Int) { +// edgeAgentWorkflow.creden + } + @After fun stopAgent() { OnStage.theActor("Edge Agent").attemptsTo( 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/walletsdk/utils/Notes.kt similarity index 94% 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/walletsdk/utils/Notes.kt index 8cfd04e6a..1be111f71 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/walletsdk/utils/Notes.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.utils +package org.hyperledger.identus.walletsdk.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/walletsdk/utils/Utils.kt similarity index 91% 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/walletsdk/utils/Utils.kt index 92a89f426..71aa109dc 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/walletsdk/utils/Utils.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.utils +package org.hyperledger.identus.walletsdk.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/walletsdk/workflow/CloudAgentWorkflow.kt similarity index 97% 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/walletsdk/workflow/CloudAgentWorkflow.kt index 25aaa188a..b4af6ff68 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/walletsdk/workflow/CloudAgentWorkflow.kt @@ -1,4 +1,4 @@ -package io.iohk.atala.prism.workflow +package org.hyperledger.identus.walletsdk.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.walletsdk.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.walletsdk.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/walletsdk/workflow/EdgeAgentWorkflow.kt similarity index 86% 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/walletsdk/workflow/EdgeAgentWorkflow.kt index 61af40d80..5fe2a522d 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/walletsdk/workflow/EdgeAgentWorkflow.kt @@ -1,17 +1,17 @@ -package io.iohk.atala.prism.workflow +package org.hyperledger.identus.walletsdk.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 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 -import io.iohk.atala.prism.walletsdk.prismagent.protocols.outOfBand.OutOfBandInvitation -import io.iohk.atala.prism.walletsdk.prismagent.protocols.proofOfPresentation.RequestPresentation +import org.hyperledger.identus.walletsdk.abilities.UseWalletSdk import kotlinx.coroutines.flow.first import net.serenitybdd.screenplay.Actor import org.hamcrest.CoreMatchers.equalTo +import org.hyperledger.identus.walletsdk.domain.models.CastorError +import org.hyperledger.identus.walletsdk.edgeagent.protocols.issueCredential.IssueCredential +import org.hyperledger.identus.walletsdk.edgeagent.protocols.issueCredential.OfferCredential +import org.hyperledger.identus.walletsdk.edgeagent.protocols.outOfBand.OutOfBandInvitation +import org.hyperledger.identus.walletsdk.edgeagent.protocols.proofOfPresentation.RequestPresentation class EdgeAgentWorkflow { private val logger = Logger.get() 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= 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 '