diff --git a/verity/src/test/scala/com/evernym/verity/http/base/open/WalletBackupAndRecoverySpec.scala b/verity/src/test/scala/com/evernym/verity/http/base/open/WalletBackupAndRecoverySpec.scala index 7058715da..c19bc80bb 100644 --- a/verity/src/test/scala/com/evernym/verity/http/base/open/WalletBackupAndRecoverySpec.scala +++ b/verity/src/test/scala/com/evernym/verity/http/base/open/WalletBackupAndRecoverySpec.scala @@ -11,7 +11,7 @@ import com.evernym.verity.testkit.agentmsg import com.evernym.verity.testkit.agentmsg.AgentMsgPackagingContext import com.evernym.verity.util.Base64Util import com.evernym.verity.actor.wallet.PackedMsg -import com.evernym.verity.integration.legacy.{CloudAgentDetail, WalletBackupSpecUtil} +import com.evernym.verity.integration.features.legacy.{CloudAgentDetail, WalletBackupSpecUtil} import com.evernym.verity.testkit.mock.agent.MockEdgeAgent diff --git a/verity/src/test/scala/com/evernym/verity/integration/README.md b/verity/src/test/scala/com/evernym/verity/integration/README.md index 9d96303b3..f325e94a6 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/README.md +++ b/verity/src/test/scala/com/evernym/verity/integration/README.md @@ -1,15 +1,16 @@ -This package contains integration test which spins up verity platform (with http server) +This package contains integration tests which spins up verity platform (with http server) and tests the complete flow (including agent actors and protocol actors). Notes: * The 'LocalVerity' used in these specs uses: - * leveldb for + * `leveldb` for * event journal - * segment storage (mock for S3) - * local storage for snapshot store - * file based wallet storage - * 'in-memory' mocked ledger - * mock url shortener (it returns the same long url) + * segment storage + * `local storage` snapshot store + * `file based` wallet storage + * `in-memory` mocked ledger service + * mocked url shortener (it returns the same long url) + * mocked endorser service
@@ -32,4 +33,3 @@ To be aware of: * To avoid those, we are using _PersistencePluginProxy_ to share the leveldb journal/snapshot storage across multiple nodes. * At this point, we don't know any known issues around it which may create issues in writing tests against it in the future. * there are few global singleton objects which may/will cause some issues sooner or later. - diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/AskTimeoutSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/AskTimeoutSpec.scala similarity index 95% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/AskTimeoutSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/AskTimeoutSpec.scala index 3419f0761..470a0d1aa 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/AskTimeoutSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/AskTimeoutSpec.scala @@ -1,9 +1,9 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.features import com.evernym.verity.actor.AgentCreated import com.evernym.verity.actor.testkit.CommonSpecUtil -import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider +import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.agentprovisioning.v_0_7.AgentProvisioningMsgFamily.CreateEdgeAgent diff --git a/verity/src/test/scala/com/evernym/verity/integration/features/README.md b/verity/src/test/scala/com/evernym/verity/integration/features/README.md new file mode 100644 index 000000000..44427e0cb --- /dev/null +++ b/verity/src/test/scala/com/evernym/verity/integration/features/README.md @@ -0,0 +1 @@ +Specs which tests features/functionalities which may involve no protocol or multiple protocols. \ No newline at end of file diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/DataRetentionBaseSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/DataRetentionBaseSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/DataRetentionBaseSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/DataRetentionBaseSpec.scala index 5ed941e90..13386dab3 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/DataRetentionBaseSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/DataRetentionBaseSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention +package com.evernym.verity.integration.features.data_retention import akka.actor.ActorSystem import com.evernym.verity.actor.testkit.TestAppConfig diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/BasicMessageSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/BasicMessageSpec.scala similarity index 96% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/BasicMessageSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/BasicMessageSpec.scala index a146725eb..fdb3202ac 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/BasicMessageSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/BasicMessageSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention.expire_after_days +package com.evernym.verity.integration.features.data_retention.expire_after_days import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail @@ -6,7 +6,7 @@ import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} import com.evernym.verity.integration.base.verity_provider.VerityEnv -import com.evernym.verity.integration.with_basic_sdk.data_retention.DataRetentionBaseSpec +import com.evernym.verity.integration.features.data_retention.DataRetentionBaseSpec import com.evernym.verity.protocol.protocols.basicMessage.v_1_0.Ctl.SendMessage import com.evernym.verity.protocol.protocols.basicMessage.v_1_0.Msg.Message import com.evernym.verity.protocol.protocols.relationship.v_1_0.Signal.Invitation diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/PresentProofSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/PresentProofSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/PresentProofSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/PresentProofSpec.scala index 214234e68..0576b5404 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/PresentProofSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/PresentProofSpec.scala @@ -1,10 +1,10 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention.expire_after_days +package com.evernym.verity.integration.features.data_retention.expire_after_days import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider, VerifierSdk} import com.evernym.verity.integration.base.verity_provider.VerityEnv -import com.evernym.verity.integration.with_basic_sdk.data_retention.DataRetentionBaseSpec +import com.evernym.verity.integration.features.data_retention.DataRetentionBaseSpec import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Ctl.{Issue, Offer} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Msg.{IssueCred, OfferCred} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Sig.{AcceptRequest, Sent} diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/QuestionAnswerSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/QuestionAnswerSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/QuestionAnswerSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/QuestionAnswerSpec.scala index 056d309f5..2fbd49e01 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_days/QuestionAnswerSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_days/QuestionAnswerSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention.expire_after_days +package com.evernym.verity.integration.features.data_retention.expire_after_days import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail @@ -6,7 +6,7 @@ import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} import com.evernym.verity.integration.base.verity_provider.VerityEnv -import com.evernym.verity.integration.with_basic_sdk.data_retention.DataRetentionBaseSpec +import com.evernym.verity.integration.features.data_retention.DataRetentionBaseSpec import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Ctl.AskQuestion import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Msg.{Answer, Question} import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Signal.AnswerGiven diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/BasicMessageSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/BasicMessageSpec.scala similarity index 95% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/BasicMessageSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/BasicMessageSpec.scala index 01f5c0a43..8ecd32652 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/BasicMessageSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/BasicMessageSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention.expire_after_ternminal_state +package com.evernym.verity.integration.features.data_retention.expire_after_ternminal_state import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail @@ -6,7 +6,7 @@ import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} import com.evernym.verity.integration.base.verity_provider.VerityEnv -import com.evernym.verity.integration.with_basic_sdk.data_retention.DataRetentionBaseSpec +import com.evernym.verity.integration.features.data_retention.DataRetentionBaseSpec import com.evernym.verity.protocol.protocols.basicMessage.v_1_0.Ctl.SendMessage import com.evernym.verity.protocol.protocols.basicMessage.v_1_0.Msg.Message import com.evernym.verity.protocol.protocols.relationship.v_1_0.Signal.Invitation diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/PresentProofSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/PresentProofSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/PresentProofSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/PresentProofSpec.scala index 30ff3f2e1..fb97203df 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/PresentProofSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/PresentProofSpec.scala @@ -1,10 +1,10 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention.expire_after_ternminal_state +package com.evernym.verity.integration.features.data_retention.expire_after_ternminal_state import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider, VerifierSdk} import com.evernym.verity.integration.base.verity_provider.VerityEnv -import com.evernym.verity.integration.with_basic_sdk.data_retention.DataRetentionBaseSpec +import com.evernym.verity.integration.features.data_retention.DataRetentionBaseSpec import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Ctl.{Issue, Offer} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Msg.{IssueCred, OfferCred} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Sig.{AcceptRequest, Sent} diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/QuestionAnswerSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/QuestionAnswerSpec.scala similarity index 96% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/QuestionAnswerSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/QuestionAnswerSpec.scala index a6261aad5..d2e18c7cb 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/data_retention/expire_after_ternminal_state/QuestionAnswerSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/data_retention/expire_after_ternminal_state/QuestionAnswerSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.data_retention.expire_after_ternminal_state +package com.evernym.verity.integration.features.data_retention.expire_after_ternminal_state import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail @@ -6,7 +6,7 @@ import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} import com.evernym.verity.integration.base.verity_provider.VerityEnv -import com.evernym.verity.integration.with_basic_sdk.data_retention.DataRetentionBaseSpec +import com.evernym.verity.integration.features.data_retention.DataRetentionBaseSpec import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Ctl.AskQuestion import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Msg.{Answer, Question} import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Signal.AnswerGiven diff --git a/verity/src/test/scala/com/evernym/verity/integration/endorsement/IssuerSetupEndorsementSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/endorsement/IssuerSetupEndorsementSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/endorsement/IssuerSetupEndorsementSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/endorsement/IssuerSetupEndorsementSpec.scala index eb4c1f4d3..cc2ea4a58 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/endorsement/IssuerSetupEndorsementSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/endorsement/IssuerSetupEndorsementSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.endorsement +package com.evernym.verity.integration.features.endorsement import com.evernym.verity.actor.PublicIdentityStored import com.evernym.verity.agentmsg.msgfamily.ConfigDetail diff --git a/verity/src/test/scala/com/evernym/verity/integration/endorsement/WriteCredDefEndorsementSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/endorsement/WriteCredDefEndorsementSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/endorsement/WriteCredDefEndorsementSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/endorsement/WriteCredDefEndorsementSpec.scala index ccea235db..ec5ad2093 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/endorsement/WriteCredDefEndorsementSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/endorsement/WriteCredDefEndorsementSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.endorsement +package com.evernym.verity.integration.features.endorsement import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.integration.base.sdk_provider.{IssuerSdk, SdkProvider} diff --git a/verity/src/test/scala/com/evernym/verity/integration/endorsement/WriteSchemaEndorsementSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/endorsement/WriteSchemaEndorsementSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/endorsement/WriteSchemaEndorsementSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/endorsement/WriteSchemaEndorsementSpec.scala index 8f314b289..47c3765bc 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/endorsement/WriteSchemaEndorsementSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/endorsement/WriteSchemaEndorsementSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.endorsement +package com.evernym.verity.integration.features.endorsement import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.integration.base.endorser_svc_provider.MockEndorserUtil.{activeEndorserDid, INDY_LEDGER_PREFIX} diff --git a/verity/src/test/scala/com/evernym/verity/integration/legacy/WalletBackupActorSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/legacy/WalletBackupActorSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/legacy/WalletBackupActorSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/legacy/WalletBackupActorSpec.scala index 2c142f098..a06d154bb 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/legacy/WalletBackupActorSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/legacy/WalletBackupActorSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.legacy +package com.evernym.verity.integration.features.legacy import akka.actor.ActorSystem import com.evernym.verity.actor._ diff --git a/verity/src/test/scala/com/evernym/verity/integration/msg_delivery_retries/WebhookRetrySpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/msg_delivery_retries/WebhookRetrySpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/msg_delivery_retries/WebhookRetrySpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/msg_delivery_retries/WebhookRetrySpec.scala index f06d8e11f..ca101f04a 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/msg_delivery_retries/WebhookRetrySpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/msg_delivery_retries/WebhookRetrySpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.msg_delivery_retries +package com.evernym.verity.integration.features.msg_delivery_retries import akka.http.scaladsl.model.StatusCodes.{Accepted, InternalServerError, OK} import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} diff --git a/verity/src/test/scala/com/evernym/verity/integration/multi_node_cluster/AllClusterNodeRestartSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/multi_node_cluster/AllClusterNodeRestartSpec.scala similarity index 96% rename from verity/src/test/scala/com/evernym/verity/integration/multi_node_cluster/AllClusterNodeRestartSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/multi_node_cluster/AllClusterNodeRestartSpec.scala index b60e06e09..bbd53b0a4 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/multi_node_cluster/AllClusterNodeRestartSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/multi_node_cluster/AllClusterNodeRestartSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.multi_node_cluster +package com.evernym.verity.integration.features.multi_node_cluster import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider diff --git a/verity/src/test/scala/com/evernym/verity/integration/multi_node_cluster/BasicMultiNodeClusterSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/multi_node_cluster/BasicMultiNodeClusterSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/multi_node_cluster/BasicMultiNodeClusterSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/multi_node_cluster/BasicMultiNodeClusterSpec.scala index 3c4fa8420..4d8f428ff 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/multi_node_cluster/BasicMultiNodeClusterSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/multi_node_cluster/BasicMultiNodeClusterSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.multi_node_cluster +package com.evernym.verity.integration.features.multi_node_cluster import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider diff --git a/verity/src/test/scala/com/evernym/verity/integration/non_multi_ledger/with_issuer_setup_v0_6/PresentationFlowSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/non_multi_ledger/with_issuer_setup_v0_6/PresentationFlowSpec.scala similarity index 96% rename from verity/src/test/scala/com/evernym/verity/integration/non_multi_ledger/with_issuer_setup_v0_6/PresentationFlowSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/non_multi_ledger/with_issuer_setup_v0_6/PresentationFlowSpec.scala index 35d6e3030..80d1ddabb 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/non_multi_ledger/with_issuer_setup_v0_6/PresentationFlowSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/non_multi_ledger/with_issuer_setup_v0_6/PresentationFlowSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.non_multi_ledger.with_issuer_setup_v0_6 +package com.evernym.verity.integration.features.non_multi_ledger.with_issuer_setup_v0_6 import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.endorser_svc_provider.MockEndorserServiceProvider @@ -17,6 +17,7 @@ import com.evernym.verity.protocol.protocols.presentproof.v_1_0.Sig.Presentation import com.evernym.verity.protocol.protocols.presentproof.v_1_0.VerificationResults.ProofValidated import com.evernym.verity.protocol.protocols.writeCredentialDefinition.{v_0_6 => writeCredDef0_6} import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} +import com.evernym.verity.vdr.DID_PREFIX import com.typesafe.config.{Config, ConfigFactory} import scala.concurrent.duration._ @@ -60,8 +61,11 @@ class PresentationFlowSpec Await.result(endorserSvcProvider.publishEndorserActivatedEvent(activeEndorserDid, INDY_LEDGER_PREFIX), 5.seconds) pubIdentifier = setupIssuer_v0_6(issuerSDK) + pubIdentifier.did.startsWith(DID_PREFIX) shouldBe false schemaId = writeSchema_v0_6(issuerSDK, writeSchema0_6.Write("name", "1.0", Seq("name", "age"))) + schemaId.startsWith(DID_PREFIX) shouldBe false credDefId = writeCredDef_v0_6(issuerSDK, writeCredDef0_6.Write("name", schemaId, None, None)) + credDefId.startsWith(DID_PREFIX) shouldBe false establishConnection(issuerHolderConn, issuerSDK, holderSDK) establishConnection(verifierHolderConn, verifierSDK, holderSDK) diff --git a/verity/src/test/scala/com/evernym/verity/integration/non_multi_ledger/with_issuer_setup_v0_7/PresentationFlowSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/non_multi_ledger/with_issuer_setup_v0_7/PresentationFlowSpec.scala similarity index 96% rename from verity/src/test/scala/com/evernym/verity/integration/non_multi_ledger/with_issuer_setup_v0_7/PresentationFlowSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/non_multi_ledger/with_issuer_setup_v0_7/PresentationFlowSpec.scala index bf2012e3b..631e095a1 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/non_multi_ledger/with_issuer_setup_v0_7/PresentationFlowSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/non_multi_ledger/with_issuer_setup_v0_7/PresentationFlowSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.non_multi_ledger.with_issuer_setup_v0_7 +package com.evernym.verity.integration.features.non_multi_ledger.with_issuer_setup_v0_7 import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.endorser_svc_provider.MockEndorserServiceProvider @@ -17,6 +17,7 @@ import com.evernym.verity.protocol.protocols.presentproof.v_1_0.Sig.Presentation import com.evernym.verity.protocol.protocols.presentproof.v_1_0.VerificationResults.ProofValidated import com.evernym.verity.protocol.protocols.writeCredentialDefinition.{v_0_6 => writeCredDef0_6} import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} +import com.evernym.verity.vdr.DID_PREFIX import com.typesafe.config.{Config, ConfigFactory} import scala.concurrent.duration._ @@ -59,8 +60,11 @@ class PresentationFlowSpec Await.result(endorserSvcProvider.publishEndorserActivatedEvent(activeEndorserDid, INDY_LEDGER_PREFIX), 5.seconds) pubIdentifier = setupIssuer_v0_7(issuerSDK, INDY_LEDGER_PREFIX) + pubIdentifier.did.startsWith(DID_PREFIX) shouldBe true schemaId = writeSchema_v0_6(issuerSDK, writeSchema0_6.Write("name", "1.0", Seq("name", "age"))) + schemaId.startsWith(DID_PREFIX) shouldBe true credDefId = writeCredDef_v0_6(issuerSDK, writeCredDef0_6.Write("name", schemaId, None, None)) + credDefId.startsWith(DID_PREFIX) shouldBe true establishConnection(issuerHolderConn, issuerSDK, holderSDK) establishConnection(verifierHolderConn, verifierSDK, holderSDK) diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/README.md b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/README.md similarity index 100% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/README.md rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/README.md diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseAttachmentSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseAttachmentSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseAttachmentSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseAttachmentSpec.scala index 0b43da43e..1fddb8049 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseAttachmentSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseAttachmentSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.out_of_band.with_attachment.cred_offer +package com.evernym.verity.integration.features.out_of_band.with_attachment.cred_offer import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.did.didcomm.v1.messages.ProblemDescription diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseConnectionSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseConnectionSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseConnectionSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseConnectionSpec.scala index 2e5f46951..54af25258 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseConnectionSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseConnectionSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.out_of_band.with_attachment.cred_offer +package com.evernym.verity.integration.features.out_of_band.with_attachment.cred_offer import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseInvitationSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseInvitationSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseInvitationSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseInvitationSpec.scala index 98c19acee..e9c5d78e6 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/with_attachment/cred_offer/ReuseInvitationSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/with_attachment/cred_offer/ReuseInvitationSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.out_of_band.with_attachment.cred_offer +package com.evernym.verity.integration.features.out_of_band.with_attachment.cred_offer import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/README.md b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/README.md similarity index 100% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/README.md rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/README.md diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/ReuseConnectionSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/ReuseConnectionSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/ReuseConnectionSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/ReuseConnectionSpec.scala index 194e23fb3..53606f53d 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/ReuseConnectionSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/ReuseConnectionSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.out_of_band.without_attachment +package com.evernym.verity.integration.features.out_of_band.without_attachment import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/ReuseInvitationSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/ReuseInvitationSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/ReuseInvitationSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/ReuseInvitationSpec.scala index 8ced1e709..c5c0175ff 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/out_of_band/without_attachment/ReuseInvitationSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/out_of_band/without_attachment/ReuseInvitationSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk.out_of_band.without_attachment +package com.evernym.verity.integration.features.out_of_band.without_attachment import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} diff --git a/verity/src/test/scala/com/evernym/verity/integration/outbox/with_rest_api/oauth/v1/RestIssuerSdkSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_rest_api/oauth/v1/RestIssuerSdkSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/outbox/with_rest_api/oauth/v1/RestIssuerSdkSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_rest_api/oauth/v1/RestIssuerSdkSpec.scala index 5feb29c84..341ac97ee 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/outbox/with_rest_api/oauth/v1/RestIssuerSdkSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_rest_api/oauth/v1/RestIssuerSdkSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.outbox.with_rest_api.oauth.v1 +package com.evernym.verity.integration.features.outbox.with_rest_api.oauth.v1 import akka.http.scaladsl.model.StatusCodes.Accepted import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} diff --git a/verity/src/test/scala/com/evernym/verity/integration/outbox/with_rest_api/oauth/v2/RestIssuerSdkSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_rest_api/oauth/v2/RestIssuerSdkSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/outbox/with_rest_api/oauth/v2/RestIssuerSdkSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_rest_api/oauth/v2/RestIssuerSdkSpec.scala index a5bd1f963..6b2283e5f 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/outbox/with_rest_api/oauth/v2/RestIssuerSdkSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_rest_api/oauth/v2/RestIssuerSdkSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.outbox.with_rest_api.oauth.v2 +package com.evernym.verity.integration.features.outbox.with_rest_api.oauth.v2 import akka.http.scaladsl.model.StatusCodes.Accepted import com.evernym.verity.agentmsg.msgfamily.configs.ComMethodAuthentication diff --git a/verity/src/test/scala/com/evernym/verity/integration/outbox/with_sdk/oauth/QuestionAnswerSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_sdk/oauth/QuestionAnswerSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/outbox/with_sdk/oauth/QuestionAnswerSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_sdk/oauth/QuestionAnswerSpec.scala index 76ed0dfe7..012114761 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/outbox/with_sdk/oauth/QuestionAnswerSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/outbox/with_sdk/oauth/QuestionAnswerSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.outbox.with_sdk.oauth +package com.evernym.verity.integration.features.outbox.with_sdk.oauth import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithAgentSenderNameSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithAgentSenderNameSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithAgentSenderNameSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithAgentSenderNameSpec.scala index 051ad9509..4c552b2aa 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithAgentSenderNameSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithAgentSenderNameSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity1 +package com.evernym.verity.integration.features.push_notification.verity1 import com.evernym.verity.actor.ConnectionStatusUpdated import com.evernym.verity.actor.agent.MsgPackFormat.MPF_MSG_PACK diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithNoSenderNameSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithNoSenderNameSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithNoSenderNameSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithNoSenderNameSpec.scala index 901063757..783d8a629 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithNoSenderNameSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithNoSenderNameSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity1 +package com.evernym.verity.integration.features.push_notification.verity1 import com.evernym.verity.actor.ConnectionStatusUpdated import com.evernym.verity.actor.agent.MsgPackFormat.MPF_MSG_PACK diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithOverriddenSenderNameSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithOverriddenSenderNameSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithOverriddenSenderNameSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithOverriddenSenderNameSpec.scala index 1bfe2b7ae..fa4534f53 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/PushNotifWithOverriddenSenderNameSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/PushNotifWithOverriddenSenderNameSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity1 +package com.evernym.verity.integration.features.push_notification.verity1 import com.evernym.verity.actor.ConnectionStatusUpdated import com.evernym.verity.actor.agent.MsgPackFormat.MPF_MSG_PACK diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/VariousPushNotifsSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/VariousPushNotifsSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/VariousPushNotifsSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/VariousPushNotifsSpec.scala index c61297c32..8e9cbb2cb 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/VariousPushNotifsSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/VariousPushNotifsSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity1 +package com.evernym.verity.integration.features.push_notification.verity1 import com.evernym.verity.actor.ConnectionStatusUpdated import com.evernym.verity.actor.agent.MsgPackFormat.MPF_MSG_PACK diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/package.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/package.scala similarity index 80% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/package.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/package.scala index 8fbb42d1a..559b7065c 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity1/package.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity1/package.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification +package com.evernym.verity.integration.features.push_notification package object verity1 { case class AskQuestion(text: String, detail: Option[String], valid_responses: Vector[String], signature_required: Boolean) diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithAgentSenderNameSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithAgentSenderNameSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithAgentSenderNameSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithAgentSenderNameSpec.scala index 6c13f581b..cde7364c2 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithAgentSenderNameSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithAgentSenderNameSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity2 +package com.evernym.verity.integration.features.push_notification.verity2 import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.{ComMethod, UpdateComMethodReqMsg, UpdateConfigReqMsg} diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithNoSenderNameSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithNoSenderNameSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithNoSenderNameSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithNoSenderNameSpec.scala index 53ab581ad..706f1025f 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithNoSenderNameSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithNoSenderNameSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity2 +package com.evernym.verity.integration.features.push_notification.verity2 import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.{ComMethod, UpdateComMethodReqMsg, UpdateConfigReqMsg} diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithPairwiseSenderNameSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithPairwiseSenderNameSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithPairwiseSenderNameSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithPairwiseSenderNameSpec.scala index 4d6b56e81..c1604132b 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/PushNotifWithPairwiseSenderNameSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/PushNotifWithPairwiseSenderNameSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity2 +package com.evernym.verity.integration.features.push_notification.verity2 import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.{ComMethod, UpdateComMethodReqMsg, UpdateConfigReqMsg} diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/SponsorPushNotifsSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/SponsorPushNotifsSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/SponsorPushNotifsSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/SponsorPushNotifsSpec.scala index 597c27904..f2fcdeadf 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/SponsorPushNotifsSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/SponsorPushNotifsSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity2 +package com.evernym.verity.integration.features.push_notification.verity2 import akka.actor.ActorSystem import com.evernym.verity.actor.testkit.actor.ActorSystemVanilla diff --git a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/VariousPushNotifsSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/VariousPushNotifsSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/VariousPushNotifsSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/VariousPushNotifsSpec.scala index aaa85b69c..cd58a4ef9 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/push_notification/verity2/VariousPushNotifsSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/push_notification/verity2/VariousPushNotifsSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.push_notification.verity2 +package com.evernym.verity.integration.features.push_notification.verity2 import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.{ComMethod, UpdateComMethodReqMsg, UpdateConfigReqMsg} diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_rest_api/IncorrectPayloadSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/rest_api/IncorrectPayloadSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_rest_api/IncorrectPayloadSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/rest_api/IncorrectPayloadSpec.scala index 37aff69ca..ad8cd74e5 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_rest_api/IncorrectPayloadSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/rest_api/IncorrectPayloadSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_rest_api +package com.evernym.verity.integration.features.rest_api import akka.http.scaladsl.model.StatusCodes.BadRequest import com.evernym.verity.http.route_handlers.open.models.RestErrorResponse diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_rest_api/RestIssuerSdkSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/rest_api/RestIssuerSdkSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/with_rest_api/RestIssuerSdkSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/rest_api/RestIssuerSdkSpec.scala index d08fb97fb..0fb7f4f9c 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_rest_api/RestIssuerSdkSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/rest_api/RestIssuerSdkSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_rest_api +package com.evernym.verity.integration.features.rest_api import akka.http.scaladsl.model.StatusCodes.Accepted import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} diff --git a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/ConnectionMigrationSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/ConnectionMigrationSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/ConnectionMigrationSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/ConnectionMigrationSpec.scala index 24ab340d1..7efef5623 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/ConnectionMigrationSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/ConnectionMigrationSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.v1tov2migration +package com.evernym.verity.integration.features.v1tov2migration import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit diff --git a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetPairwiseDidDocSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetPairwiseDidDocSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetPairwiseDidDocSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetPairwiseDidDocSpec.scala index f311b52c1..c3befab84 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetPairwiseDidDocSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetPairwiseDidDocSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.v1tov2migration +package com.evernym.verity.integration.features.v1tov2migration import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit diff --git a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetPairwiseRoutingDIDsSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetPairwiseRoutingDIDsSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetPairwiseRoutingDIDsSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetPairwiseRoutingDIDsSpec.scala index b17744f8c..2abce4d06 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetPairwiseRoutingDIDsSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetPairwiseRoutingDIDsSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.v1tov2migration +package com.evernym.verity.integration.features.v1tov2migration import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit diff --git a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetUpgradeInfoSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetUpgradeInfoSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetUpgradeInfoSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetUpgradeInfoSpec.scala index 94c226722..2890dec61 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetUpgradeInfoSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetUpgradeInfoSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.v1tov2migration +package com.evernym.verity.integration.features.v1tov2migration import akka.http.scaladsl.model.HttpMethods import akka.http.scaladsl.model.StatusCodes.OK diff --git a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetWalletDetailSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetWalletDetailSpec.scala similarity index 95% rename from verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetWalletDetailSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetWalletDetailSpec.scala index de6d79c5b..d877f2ec7 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/GetWalletDetailSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/GetWalletDetailSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.v1tov2migration +package com.evernym.verity.integration.features.v1tov2migration import com.evernym.verity.actor.agent.user.GetWalletMigrationDetailResp import com.evernym.verity.integration.base.sdk_provider.SdkProvider diff --git a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/RoutingMigrationSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/RoutingMigrationSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/RoutingMigrationSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/RoutingMigrationSpec.scala index 9437df232..5381c9b0e 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/v1tov2migration/RoutingMigrationSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/v1tov2migration/RoutingMigrationSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.v1tov2migration +package com.evernym.verity.integration.features.v1tov2migration import akka.http.scaladsl.model.HttpMethods import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ComMethodUpdateSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/features/webhook/ComMethodUpdateSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ComMethodUpdateSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/features/webhook/ComMethodUpdateSpec.scala index 23bf2c477..4302e63a7 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ComMethodUpdateSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/features/webhook/ComMethodUpdateSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.features.webhook import com.evernym.verity.agentmsg.msgfamily.configs.{ComMethod, ComMethodAuthentication, UpdateComMethodReqMsg} import com.evernym.verity.constants.Constants.COM_METHOD_TYPE_HTTP_ENDPOINT diff --git a/verity/src/test/scala/com/evernym/verity/integration/protocols/README.md b/verity/src/test/scala/com/evernym/verity/integration/protocols/README.md new file mode 100644 index 000000000..d197e8216 --- /dev/null +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/README.md @@ -0,0 +1 @@ +Specs which tests specific protocol. \ No newline at end of file diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/BasicAgentProvisioningSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/agent_provisioning/v0_7/BasicAgentProvisioningSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/BasicAgentProvisioningSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/agent_provisioning/v0_7/BasicAgentProvisioningSpec.scala index 165eb0190..4cfa0cea5 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/BasicAgentProvisioningSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/agent_provisioning/v0_7/BasicAgentProvisioningSpec.scala @@ -1,9 +1,9 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.agent_provisioning.v0_7 import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} +import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import scala.concurrent.Await diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/TokenizedAgentProvisioningSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/agent_provisioning/v0_7/TokenizedAgentProvisioningSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/TokenizedAgentProvisioningSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/agent_provisioning/v0_7/TokenizedAgentProvisioningSpec.scala index 493d3326e..a56295b68 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/TokenizedAgentProvisioningSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/agent_provisioning/v0_7/TokenizedAgentProvisioningSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.agent_provisioning.v0_7 import akka.actor.ActorSystem import com.evernym.verity.actor.testkit.actor.ActorSystemVanilla diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/BasicMessageSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/basic_message/v1_0/BasicMessageSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/BasicMessageSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/basic_message/v1_0/BasicMessageSpec.scala index 3e9fce614..0283b5798 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/BasicMessageSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/basic_message/v1_0/BasicMessageSpec.scala @@ -1,10 +1,10 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.basic_message.v1_0 -import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} +import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} +import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.basicMessage.v_1_0.Ctl.SendMessage import com.evernym.verity.protocol.protocols.basicMessage.v_1_0.Msg.Message import com.evernym.verity.protocol.protocols.relationship.v_1_0.Signal.Invitation diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/IssueCredOfferFailureSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential/v1_0/IssueCredOfferFailureSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/IssueCredOfferFailureSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential/v1_0/IssueCredOfferFailureSpec.scala index 391cf17ab..b2394e7bf 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/IssueCredOfferFailureSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential/v1_0/IssueCredOfferFailureSpec.scala @@ -1,13 +1,13 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.issue_credential.v1_0 import akka.http.scaladsl.model.StatusCodes.BadRequest -import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} +import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.engine.ThreadId import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Ctl.Offer import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Msg.{OfferCred, ProblemReport} -import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} import com.evernym.verity.protocol.protocols.writeCredentialDefinition.{v_0_6 => writeCredDef0_6} +import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} import com.evernym.verity.testkit.util.HttpUtil import org.json.JSONObject diff --git a/verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential_v1_0/IssueCredRejectionSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential/v1_0/IssueCredRejectionSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential_v1_0/IssueCredRejectionSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential/v1_0/IssueCredRejectionSpec.scala index 3be237776..214f9e8d7 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential_v1_0/IssueCredRejectionSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/issue_credential/v1_0/IssueCredRejectionSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.protocols.issue_credential_v1_0 +package com.evernym.verity.integration.protocols.issue_credential.v1_0 import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.did.didcomm.v1.messages.ProblemDescription @@ -16,7 +16,7 @@ import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_ import com.evernym.verity.util.Base64Util import org.json.JSONObject -import scala.concurrent.{Await, ExecutionContext} +import scala.concurrent.Await class IssueCredRejectionSpec diff --git a/verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/BackwardCompatibilitySpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/v0_6/BackwardCompatibilitySpec.scala similarity index 94% rename from verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/BackwardCompatibilitySpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/v0_6/BackwardCompatibilitySpec.scala index 4e42c2822..ec57a943b 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/BackwardCompatibilitySpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/v0_6/BackwardCompatibilitySpec.scala @@ -1,14 +1,13 @@ -package com.evernym.verity.integration.protocols.issuer_setup +package com.evernym.verity.integration.protocols.issuer_setup.v0_6 import com.evernym.verity.actor.PublicIdentityStored import com.evernym.verity.actor.wallet.{CreateDID, NewKeyCreated} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider +import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.engine.asyncapi.wallet.WalletAccess.KEY_ED25519 -import com.evernym.verity.protocol.protocols.issuersetup.{v_0_6 => issuerSetup_v0_6} -import com.evernym.verity.protocol.protocols.issuersetup.{v_0_7 => issuerSetup_v0_7} +import com.evernym.verity.protocol.protocols.issuersetup.{v_0_6 => issuerSetup_v0_6, v_0_7 => issuerSetup_v0_7} //confirms that issuer setup 0.6 is backward compatible with legacy events diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/IssuerSetupSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/v0_6/IssuerSetupSpec.scala similarity index 97% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/IssuerSetupSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/v0_6/IssuerSetupSpec.scala index 1a21ed3eb..c0c9f121d 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/IssuerSetupSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/issuer_setup/v0_6/IssuerSetupSpec.scala @@ -1,12 +1,13 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.issuer_setup.v0_6 import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider +import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.issuersetup.v_0_6._ -import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} import com.evernym.verity.protocol.protocols.writeCredentialDefinition.{v_0_6 => writeCredDef0_6} +import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} + import scala.concurrent.duration._ import scala.language.postfixOps diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/PresentProofSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/present_proof/v1_0/PresentProofSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/PresentProofSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/present_proof/v1_0/PresentProofSpec.scala index 0468435bf..0d5a8a0e3 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/PresentProofSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/present_proof/v1_0/PresentProofSpec.scala @@ -1,8 +1,8 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.present_proof.v1_0 -import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} -import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider, VerifierSdk} import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} +import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider, VerifierSdk} +import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Ctl.{Issue, Offer} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Msg.{IssueCred, OfferCred} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Sig.{AcceptRequest, Sent} @@ -11,9 +11,8 @@ import com.evernym.verity.protocol.protocols.presentproof.v_1_0.Msg.RequestPrese import com.evernym.verity.protocol.protocols.presentproof.v_1_0.ProofAttribute import com.evernym.verity.protocol.protocols.presentproof.v_1_0.Sig.PresentationResult import com.evernym.verity.protocol.protocols.presentproof.v_1_0.VerificationResults.ProofValidated -import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} import com.evernym.verity.protocol.protocols.writeCredentialDefinition.{v_0_6 => writeCredDef0_6} - +import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} import scala.concurrent.Await diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/QuestionAnswerSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/question_answer/v1_0/QuestionAnswerSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/QuestionAnswerSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/question_answer/v1_0/QuestionAnswerSpec.scala index 13331623e..0adf9c1a5 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/QuestionAnswerSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/question_answer/v1_0/QuestionAnswerSpec.scala @@ -1,11 +1,11 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.question_answer.v1_0 -import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} +import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} import com.evernym.verity.integration.base.verity_provider.VerityEnv +import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Ctl.AskQuestion import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Msg.{Answer, Question} import com.evernym.verity.protocol.protocols.questionAnswer.v_1_0.Signal.AnswerGiven diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ConnectionAcceptanceSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/ConnectionAcceptanceSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ConnectionAcceptanceSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/ConnectionAcceptanceSpec.scala index 8138f1e64..04b531fd5 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ConnectionAcceptanceSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/ConnectionAcceptanceSpec.scala @@ -1,12 +1,11 @@ -package com.evernym.verity.integration.with_basic_sdk - +package com.evernym.verity.integration.protocols.relationship.v1_0 import akka.http.scaladsl.model.StatusCodes.Unauthorized import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} -import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} +import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} +import com.evernym.verity.integration.base.{CAS, VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.relationship.v_1_0.Signal.Invitation import scala.concurrent.Await diff --git a/verity/src/test/scala/com/evernym/verity/integration/relationship/InvitationSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/InvitationSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/relationship/InvitationSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/InvitationSpec.scala index c671b22b4..0c6daa396 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/relationship/InvitationSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/InvitationSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.relationship +package com.evernym.verity.integration.protocols.relationship.v1_0 import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.agentmsg.msgfamily.ConfigDetail @@ -8,16 +8,16 @@ import com.evernym.verity.integration.base.sdk_provider.{IssuerSdk, SdkProvider, import com.evernym.verity.integration.base.verity_provider.VerityEnv import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Ctl.Offer -import com.evernym.verity.protocol.protocols.relationship.v_1_0.Signal.Invitation import com.evernym.verity.protocol.protocols.issueCredential.v_1_0.Sig.{Invitation => IssueCredInvitation} import com.evernym.verity.protocol.protocols.outofband.v_1_0.Msg.OutOfBandInvitation +import com.evernym.verity.protocol.protocols.relationship.v_1_0.Signal.Invitation import com.evernym.verity.protocol.protocols.writeCredentialDefinition.{v_0_6 => writeCredDef0_6} import com.evernym.verity.protocol.protocols.writeSchema.{v_0_6 => writeSchema0_6} import com.evernym.verity.util.Base64Util import org.json.JSONObject -import scala.concurrent.duration._ import scala.concurrent.Await +import scala.concurrent.duration._ class InvitationSpec diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/RelationshipFailureSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/RelationshipFailureSpec.scala similarity index 99% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/RelationshipFailureSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/RelationshipFailureSpec.scala index 1d453a2f0..c41976247 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/RelationshipFailureSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/RelationshipFailureSpec.scala @@ -1,19 +1,19 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.relationship.v1_0 import akka.http.scaladsl.model.HttpEntity import akka.http.scaladsl.model.StatusCodes.BadRequest -import com.evernym.verity.util2.Status.{INVALID_VALUE, MISSING_REQ_FIELD} import com.evernym.verity.agentmsg.DefaultMsgCodec import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} -import com.evernym.verity.integration.base.sdk_provider.{IssuerSdk, SdkProvider} import com.evernym.verity.did.DidStr import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.http.common.models.StatusDetailResp +import com.evernym.verity.integration.base.sdk_provider.{IssuerSdk, SdkProvider} import com.evernym.verity.integration.base.verity_provider.VerityEnv +import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.protocol.protocols.issuersetup.v_0_6.{CurrentPublicIdentifier, PublicIdentifier, PublicIdentifierCreated, Create => CreatePublicIdentifier} import com.evernym.verity.protocol.protocols.relationship.v_1_0.Ctl.{SMSConnectionInvitation, SMSOutOfBandInvitation} +import com.evernym.verity.util2.Status.{INVALID_VALUE, MISSING_REQ_FIELD} import java.nio.charset.Charset diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ReuseConnectionSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/ReuseConnectionSpec.scala similarity index 98% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ReuseConnectionSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/ReuseConnectionSpec.scala index ef7b7b23e..706262742 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/ReuseConnectionSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/relationship/v1_0/ReuseConnectionSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.relationship.v1_0 import com.evernym.verity.did.didcomm.v1.{Thread => MsgThread} import com.evernym.verity.integration.base.sdk_provider.{HolderSdk, IssuerSdk, SdkProvider} diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/WriteCredDefFailureSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/write_cred_def/v0_6/WriteCredDefFailureSpec.scala similarity index 96% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/WriteCredDefFailureSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/write_cred_def/v0_6/WriteCredDefFailureSpec.scala index 2eac14fea..b39ccbd41 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/WriteCredDefFailureSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/write_cred_def/v0_6/WriteCredDefFailureSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.write_cred_def.v0_6 import com.evernym.vdrtools.vdr.VdrParams.CacheOptions import com.evernym.vdrtools.vdr.VdrResults @@ -6,17 +6,17 @@ import com.evernym.vdrtools.vdr.VdrResults.PreparedTxnResult import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider import com.evernym.verity.integration.base.verity_provider.node.local.ServiceParam +import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.ledger.LedgerSvcException import com.evernym.verity.protocol.protocols.issuersetup.v_0_6._ -import com.evernym.verity.protocol.protocols.writeSchema.v_0_6.{StatusReport => WriteSchemaStatusReport, Write => WriteSchema} import com.evernym.verity.protocol.protocols.writeCredentialDefinition.v_0_6.{Write => WriteCredDef} +import com.evernym.verity.protocol.protocols.writeSchema.v_0_6.{StatusReport => WriteSchemaStatusReport, Write => WriteSchema} import com.evernym.verity.vdr.base.PayloadConstants.{CRED_DEF, TYPE} import com.evernym.verity.vdr.base.{INDY_SOVRIN_NAMESPACE, InMemLedger} import com.evernym.verity.vdr.service.VDRAdapterUtil -import com.evernym.verity.vdr.{FqCredDefId, FqDID, FqSchemaId, MockIndyLedger, MockLedgerRegistry, MockVdrTools, Namespace, TxnResult, TxnSpecificParams, VdrCredDef, VdrDid, VdrSchema} +import com.evernym.verity.vdr._ import scala.concurrent.Future diff --git a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/WriteSchemaFailureSpec.scala b/verity/src/test/scala/com/evernym/verity/integration/protocols/write_schema/v0_6/WriteSchemaFailureSpec.scala similarity index 91% rename from verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/WriteSchemaFailureSpec.scala rename to verity/src/test/scala/com/evernym/verity/integration/protocols/write_schema/v0_6/WriteSchemaFailureSpec.scala index 94f7aeb2e..abdca0ea8 100644 --- a/verity/src/test/scala/com/evernym/verity/integration/with_basic_sdk/WriteSchemaFailureSpec.scala +++ b/verity/src/test/scala/com/evernym/verity/integration/protocols/write_schema/v0_6/WriteSchemaFailureSpec.scala @@ -1,4 +1,4 @@ -package com.evernym.verity.integration.with_basic_sdk +package com.evernym.verity.integration.protocols.write_schema.v0_6 import com.evernym.vdrtools.vdr.VdrParams.CacheOptions import com.evernym.vdrtools.vdr.VdrResults @@ -6,14 +6,14 @@ import com.evernym.vdrtools.vdr.VdrResults.PreparedTxnResult import com.evernym.verity.agentmsg.msgcodec.jackson.JacksonMsgCodec import com.evernym.verity.agentmsg.msgfamily.ConfigDetail import com.evernym.verity.agentmsg.msgfamily.configs.UpdateConfigReqMsg -import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.integration.base.sdk_provider.SdkProvider import com.evernym.verity.integration.base.verity_provider.node.local.ServiceParam +import com.evernym.verity.integration.base.{VAS, VerityProviderBaseSpec} import com.evernym.verity.ledger.LedgerSvcException -import com.evernym.verity.protocol.protocols.issuersetup.v_0_6.{Create, CurrentPublicIdentifier, ProblemReport, PublicIdentifier, PublicIdentifierCreated} +import com.evernym.verity.protocol.protocols.issuersetup.v_0_6._ import com.evernym.verity.protocol.protocols.writeSchema.v_0_6.Write import com.evernym.verity.vdr.base.{INDY_SOVRIN_NAMESPACE, InMemLedger} -import com.evernym.verity.vdr.{FqCredDefId, FqDID, FqSchemaId, MockIndyLedger, MockLedgerRegistry, MockLedgerRegistryBuilder, MockVdrTools, Namespace, TxnResult, TxnSpecificParams, VdrCredDef, VdrDid, VdrSchema} +import com.evernym.verity.vdr._ import scala.concurrent.Future