Skip to content

Commit 8bf9a69

Browse files
shaangill025shaangill025
committed
test fix and sonar check cleanup
Signed-off-by: Shaanjot Gill <gill.shaanjots@gmail.com>
1 parent f5a74e7 commit 8bf9a69

3 files changed

Lines changed: 30 additions & 24 deletions

File tree

‎aries_cloudagent/core/tests/test_protocol_registry.py‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ def test_message_type_query(self):
4545
assert matches == ()
4646

4747
def test_create_msg_types_for_minor_version(self):
48+
MSG_PATH = "aries_cloudagent.protocols.introduction.v0_1.messages"
4849
test_typesets = (
4950
{
50-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/1.0/fake-forward-invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.forward_invitation.ForwardInvitation",
51-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/1.0/fake-invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation.Invitation",
52-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/1.0/fake-invitation-request": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation_request.InvitationRequest",
53-
"https://didcom.org/introduction-service/1.0/fake-forward-invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.forward_invitation.ForwardInvitation",
54-
"https://didcom.org/introduction-service/1.0/fake-invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation.Invitation",
55-
"https://didcom.org/introduction-service/1.0/fake-invitation-request": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation_request.InvitationRequest",
51+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/1.0/fake-forward-invitation": f"{MSG_PATH}.forward_invitation.ForwardInvitation",
52+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/1.0/fake-invitation": f"{MSG_PATH}.invitation.Invitation",
53+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/1.0/fake-invitation-request": f"{MSG_PATH}.invitation_request.InvitationRequest",
54+
"https://didcom.org/introduction-service/1.0/fake-forward-invitation": f"{MSG_PATH}.forward_invitation.ForwardInvitation",
55+
"https://didcom.org/introduction-service/1.0/fake-invitation": f"{MSG_PATH}.invitation.Invitation",
56+
"https://didcom.org/introduction-service/1.0/fake-invitation-request": f"{MSG_PATH}.invitation_request.InvitationRequest",
5657
},
5758
)
5859
test_version_def = {
@@ -83,14 +84,15 @@ def test_create_msg_types_for_minor_version(self):
8384
)
8485

8586
def test_introduction_create_msg_types_for_minor_version(self):
87+
MSG_PATH = "aries_cloudagent.protocols.introduction.v0_1.messages"
8688
test_typesets = (
8789
{
88-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/0.1/invitation-request": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation_request.InvitationRequest",
89-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/0.1/invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation.Invitation",
90-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/0.1/forward-invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation_messages.forward_invitation.ForwardInvitation",
91-
"https://didcom.org/introduction-service/0.1/invitation-request": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation_request.InvitationRequest",
92-
"https://didcom.org/introduction-service/0.1/invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.invitation.Invitation",
93-
"https://didcom.org/introduction-service/0.1/forward-invitation": "aries_cloudagent.protocols.introduction.v0_1.messages.forward_invitation.ForwardInvitation",
90+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/0.1/invitation-request": f"{MSG_PATH}.invitation_request.InvitationRequest",
91+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/0.1/invitation": f"{MSG_PATH}.invitation.Invitation",
92+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/introduction-service/0.1/forward-invitation": f"{MSG_PATH}.invitation_messages.forward_invitation.ForwardInvitation",
93+
"https://didcom.org/introduction-service/0.1/invitation-request": f"{MSG_PATH}.invitation_request.InvitationRequest",
94+
"https://didcom.org/introduction-service/0.1/invitation": f"{MSG_PATH}.invitation.Invitation",
95+
"https://didcom.org/introduction-service/0.1/forward-invitation": f"{MSG_PATH}.forward_invitation.ForwardInvitation",
9496
},
9597
)
9698
test_version_def = {
@@ -128,16 +130,17 @@ def test_introduction_create_msg_types_for_minor_version(self):
128130
)
129131

130132
def test_oob_create_msg_types_for_minor_version(self):
133+
MSG_PATH = "aries_cloudagent.protocols.out_of_band.v1_0.messages"
131134
test_typesets = (
132135
{
133-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/invitation": "aries_cloudagent.protocols.out_of_band.v1_0.messages.invitation.Invitation",
134-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/handshake-reuse": "aries_cloudagent.protocols.out_of_band.v1_0.messages.reuse.HandshakeReuse",
135-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/handshake-reuse-accepted": "aries_cloudagent.protocols.out_of_band.v1_0.messages.reuse_accept.HandshakeReuseAccept",
136-
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/problem_report": "aries_cloudagent.protocols.out_of_band.v1_0.messages.problem_report.OOBProblemReport",
137-
"https://didcom.org/out-of-band/1.1/invitation": "aries_cloudagent.protocols.out_of_band.v1_0.messages.invitation.Invitation",
138-
"https://didcom.org/out-of-band/1.1/handshake-reuse": "aries_cloudagent.protocols.out_of_band.v1_0.messages.reuse.HandshakeReuse",
139-
"https://didcom.org/out-of-band/1.1/handshake-reuse-accepted": "aries_cloudagent.protocols.out_of_band.v1_0.messages.reuse_accept.HandshakeReuseAccept",
140-
"https://didcom.org/out-of-band/1.1/problem_report": "aries_cloudagent.protocols.out_of_band.v1_0.messages.problem_report.OOBProblemReport",
136+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/invitation": f"{MSG_PATH}.invitation.Invitation",
137+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/handshake-reuse": f"{MSG_PATH}.reuse.HandshakeReuse",
138+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/handshake-reuse-accepted": f"{MSG_PATH}.reuse_accept.HandshakeReuseAccept",
139+
"did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/out-of-band/1.1/problem_report": f"{MSG_PATH}.problem_report.OOBProblemReport",
140+
"https://didcom.org/out-of-band/1.1/invitation": f"{MSG_PATH}.invitation.Invitation",
141+
"https://didcom.org/out-of-band/1.1/handshake-reuse": f"{MSG_PATH}.reuse.HandshakeReuse",
142+
"https://didcom.org/out-of-band/1.1/handshake-reuse-accepted": f"{MSG_PATH}.reuse_accept.HandshakeReuseAccept",
143+
"https://didcom.org/out-of-band/1.1/problem_report": f"{MSG_PATH}.problem_report.OOBProblemReport",
141144
},
142145
)
143146
test_version_def = {

‎aries_cloudagent/protocols/out_of_band/v1_0/tests/test_manager.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ class TestConfig:
103103
service_endpoint=test_endpoint,
104104
)
105105
NOW_8601 = datetime.utcnow().replace(tzinfo=timezone.utc).isoformat(" ", "seconds")
106+
TEST_INVI_MESSAGE_TYPE = "out-of-band/1.1/invitation"
106107
NOW_EPOCH = str_to_epoch(NOW_8601)
107108
CD_ID = "GMm4vMw8LLrLJjp81kRRLp:3:CL:12:tag"
108109
INDY_PROOF_REQ = json.loads(
@@ -389,7 +390,7 @@ async def test_create_invitation_handshake_succeeds(self):
389390
)
390391

391392
assert invi_rec.invitation._type == DIDCommPrefix.qualify_current(
392-
"out-of-band/1.1/invitation"
393+
self.TEST_INVI_MESSAGE_TYPE
393394
)
394395
assert not invi_rec.invitation.requests_attach
395396
assert (
@@ -476,7 +477,7 @@ async def test_create_invitation_mediation_overwrites_routing_and_endpoint(self)
476477
)
477478
assert isinstance(invite, InvitationRecord)
478479
assert invite.invitation._type == DIDCommPrefix.qualify_current(
479-
"out-of-band/1.1/invitation"
480+
self.TEST_INVI_MESSAGE_TYPE
480481
)
481482
assert invite.invitation.label == "test123"
482483
assert (
@@ -795,7 +796,7 @@ async def test_create_invitation_peer_did(self):
795796

796797
assert invi_rec._invitation.ser[
797798
"@type"
798-
] == DIDCommPrefix.qualify_current("out-of-band/1.1/invitation")
799+
] == DIDCommPrefix.qualify_current(self.TEST_INVI_MESSAGE_TYPE)
799800
assert not invi_rec._invitation.ser.get("requests~attach")
800801
assert invi_rec.invitation.label == "That guy"
801802
assert (

‎aries_cloudagent/protocols/out_of_band/v1_0/tests/test_routes.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ async def test_invitation_create(self):
5858
alias=None,
5959
mediation_id=None,
6060
accept=None,
61+
protocol_version=None,
6162
)
6263
mock_json_response.assert_called_once_with({"abc": "123"})
6364

@@ -86,7 +87,7 @@ async def test_invitation_create_with_accept(self):
8687
)
8788
)
8889

89-
result = await test_module.invitation_create(self.request)
90+
await test_module.invitation_create(self.request)
9091
mock_oob_mgr.return_value.create_invitation.assert_called_once_with(
9192
my_label=None,
9293
auto_accept=True,
@@ -98,6 +99,7 @@ async def test_invitation_create_with_accept(self):
9899
alias=None,
99100
mediation_id=None,
100101
accept=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
102+
protocol_version=None,
101103
)
102104
mock_json_response.assert_called_once_with({"abc": "123"})
103105

0 commit comments

Comments
 (0)