Skip to content

Commit 7135fdf

Browse files
sbeashwarytheesoft
sbeashwar
authored and
ytheesoft
committed
fix: migrate conformance tests to UCP SDK v0.3.0
SDK v0.3.0 renamed and restructured all model modules: - UcpDiscoveryProfile deleted; use BusinessSchema from ucp.schemas.ucp - *_resp modules renamed to base names (fulfillment_resp -> checkout) - *_req modules renamed to *_request with matching class names - Payment models moved to top-level payment.py - Fulfillment models restructured with new required fields - Service discovery uses flat transport model with ReverseDomainName keys Test fixes: - All 13 test files updated for new import paths and class names - FulfillmentMethodCreateRequest: pass line_item_ids=[] (optional on create per spec, but SDK marks required) - Fulfillment response access converted from typed attributes to dict subscript (extra="allow" models) - Payment instrument construction standardized via get_valid_payment_payload() - Protocol test version assertions updated for 2026-01-23 Result: 57/59 pass (2 simulation_secret config mismatches, not SDK issues)
1 parent 39c6726 commit 7135fdf

13 files changed

Lines changed: 269 additions & 290 deletions

‎ap2_test.py‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
from absl.testing import absltest
1818
import integration_test_utils
19-
from ucp_sdk.models.schemas.shopping import fulfillment_resp as checkout
20-
from ucp_sdk.models.schemas.shopping.ap2_mandate import Ap2CompleteRequest
19+
from ucp_sdk.models.schemas.shopping import checkout
20+
from ucp_sdk.models.schemas.shopping.ap2_mandate import Ap2WithCheckoutMandate
2121
from ucp_sdk.models.schemas.shopping.ap2_mandate import CheckoutMandate
22-
from ucp_sdk.models.schemas.shopping.payment_resp import (
23-
PaymentResponse as Payment,
22+
from ucp_sdk.models.schemas.shopping.payment import (
23+
Payment,
2424
)
2525
from ucp_sdk.models.schemas.shopping.types import card_payment_instrument
2626
from ucp_sdk.models.schemas.shopping.types import payment_instrument
27-
from ucp_sdk.models.schemas.shopping.types import token_credential_resp
27+
from ucp_sdk.models.schemas.shopping.types import token_credential as token_credential_resp
2828

2929

3030
# Rebuild models to resolve forward references
31-
checkout.Checkout.model_rebuild(_types_namespace={"PaymentResponse": Payment})
31+
checkout.Checkout.model_rebuild(_types_namespace={"Payment": Payment})
3232

3333

3434
class Ap2MandateTest(integration_test_utils.IntegrationTestBase):
@@ -48,32 +48,16 @@ def test_ap2_mandate_completion(self) -> None:
4848
response_json = self.create_checkout_session()
4949
checkout_id = checkout.Checkout(**response_json).id
5050

51-
credential = token_credential_resp.TokenCredentialResponse(
52-
type="token", token="success_token"
53-
)
54-
instr = payment_instrument.PaymentInstrument(
55-
root=card_payment_instrument.CardPaymentInstrument(
56-
id="instr_1",
57-
brand="visa",
58-
last_digits="4242",
59-
handler_id="mock_payment_handler",
60-
handler_name="mock_payment_handler",
61-
type="card",
62-
credential=credential,
63-
)
64-
)
65-
payment_data = instr.root.model_dump(mode="json", exclude_none=True)
66-
6751
# SD-JWT+kb pattern:
6852
# ^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*\.[A-Za-z0-9_-]+(~[A-Za-z0-9_-]+)*$
6953
mandate = CheckoutMandate(root="header.payload.signature~kb_signature")
70-
ap2_data = Ap2CompleteRequest(checkout_mandate=mandate)
54+
ap2_data = Ap2WithCheckoutMandate(checkout_mandate=mandate)
7155

72-
payment_payload = {
73-
"payment_data": payment_data,
74-
"risk_signals": {},
75-
"ap2": ap2_data.model_dump(mode="json", exclude_none=True),
76-
}
56+
# Use the standard valid payment payload and add AP2 data
57+
payment_payload = integration_test_utils.get_valid_payment_payload()
58+
payment_payload["ap2"] = ap2_data.model_dump(
59+
mode="json", exclude_none=True
60+
)
7761

7862
response = self.client.post(
7963
self.get_shopping_url(f"/checkout-sessions/{checkout_id}/complete"),

‎binding_test.py‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
from absl.testing import absltest
1818
import integration_test_utils
19-
from ucp_sdk.models.schemas.shopping import fulfillment_resp as checkout
20-
from ucp_sdk.models.schemas.shopping.payment_resp import (
21-
PaymentResponse as Payment,
19+
from ucp_sdk.models.schemas.shopping import checkout
20+
from ucp_sdk.models.schemas.shopping.payment import (
21+
Payment,
2222
)
2323
from ucp_sdk.models.schemas.shopping.types import binding
2424
from ucp_sdk.models.schemas.shopping.types import card_payment_instrument
2525
from ucp_sdk.models.schemas.shopping.types import payment_identity
2626
from ucp_sdk.models.schemas.shopping.types import payment_instrument
27-
from ucp_sdk.models.schemas.shopping.types import token_credential_resp
27+
from ucp_sdk.models.schemas.shopping.types import token_credential as token_credential_resp
2828

2929

3030
# Rebuild models to resolve forward references
31-
checkout.Checkout.model_rebuild(_types_namespace={"PaymentResponse": Payment})
31+
checkout.Checkout.model_rebuild(_types_namespace={"Payment": Payment})
3232

3333

3434
class TokenBindingTest(integration_test_utils.IntegrationTestBase):
@@ -48,31 +48,11 @@ def test_token_binding_completion(self) -> None:
4848
response_json = self.create_checkout_session()
4949
checkout_id = checkout.Checkout(**response_json).id
5050

51-
identity = payment_identity.PaymentIdentity(
52-
access_token="user_access_token"
53-
)
54-
token_binding = binding.Binding(checkout_id=checkout_id, identity=identity)
55-
56-
# TokenCredentialResponse allows extra fields
57-
credential = token_credential_resp.TokenCredentialResponse(
58-
type="stripe_token", token="success_token", binding=token_binding
59-
)
60-
61-
instr = payment_instrument.PaymentInstrument(
62-
root=card_payment_instrument.CardPaymentInstrument(
63-
id="instr_1",
64-
brand="visa",
65-
last_digits="4242",
66-
handler_id="mock_payment_handler",
67-
handler_name="mock_payment_handler",
68-
type="card",
69-
credential=credential,
70-
)
71-
)
72-
payment_data = instr.root.model_dump(mode="json", exclude_none=True)
73-
payment_payload = {
74-
"payment_data": payment_data,
75-
"risk_signals": {},
51+
# Use the standard valid payment payload and add binding data
52+
payment_payload = integration_test_utils.get_valid_payment_payload()
53+
payment_payload["payment_data"]["credential"]["binding"] = {
54+
"checkout_id": checkout_id,
55+
"identity": {"access_token": "user_access_token"},
7656
}
7757

7858
response = self.client.post(

‎business_logic_test.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@
1616

1717
from absl.testing import absltest
1818
import integration_test_utils
19-
from ucp_sdk.models.schemas.shopping import buyer_consent_resp as buyer_consent
20-
from ucp_sdk.models.schemas.shopping import checkout_update_req
21-
from ucp_sdk.models.schemas.shopping import discount_resp as discount
22-
from ucp_sdk.models.schemas.shopping import fulfillment_resp as checkout
23-
from ucp_sdk.models.schemas.shopping import payment_update_req
24-
from ucp_sdk.models.schemas.shopping.payment_resp import (
25-
PaymentResponse as Payment,
19+
from ucp_sdk.models.schemas.shopping import buyer_consent
20+
from ucp_sdk.models.schemas.shopping import checkout_update_request as checkout_update_req
21+
from ucp_sdk.models.schemas.shopping import discount
22+
from ucp_sdk.models.schemas.shopping import checkout
23+
from ucp_sdk.models.schemas.shopping import payment_update_request as payment_update_req
24+
from ucp_sdk.models.schemas.shopping.payment import (
25+
Payment,
2626
)
2727
from ucp_sdk.models.schemas.shopping.types import buyer
28-
from ucp_sdk.models.schemas.shopping.types import item_update_req
29-
from ucp_sdk.models.schemas.shopping.types import line_item_update_req
28+
from ucp_sdk.models.schemas.shopping.types import buyer_update_request
29+
from ucp_sdk.models.schemas.shopping.types import item_update_request as item_update_req
30+
from ucp_sdk.models.schemas.shopping.types import line_item_update_request as line_item_update_req
3031

3132
# Rebuild models to resolve forward references
32-
checkout.Checkout.model_rebuild(_types_namespace={"PaymentResponse": Payment})
33+
checkout.Checkout.model_rebuild(_types_namespace={"Payment": Payment})
3334

3435

3536
class BusinessLogicTest(integration_test_utils.IntegrationTestBase):
@@ -515,7 +516,7 @@ def test_buyer_info_persistence(self):
515516
currency=checkout_obj.currency,
516517
line_items=[line_item_update],
517518
payment=payment_update,
518-
buyer=buyer.Buyer(
519+
buyer=buyer_update_request.BuyerUpdateRequest(
519520
email="test@example.com",
520521
first_name="Test",
521522
last_name="User",

‎card_credential_test.py‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
from absl.testing import absltest
1818
import integration_test_utils
19-
from ucp_sdk.models.schemas.shopping import fulfillment_resp as checkout
20-
from ucp_sdk.models.schemas.shopping.payment_resp import (
21-
PaymentResponse as Payment,
19+
from ucp_sdk.models.schemas.shopping import checkout
20+
from ucp_sdk.models.schemas.shopping.payment import (
21+
Payment,
2222
)
2323
from ucp_sdk.models.schemas.shopping.types import card_credential
2424
from ucp_sdk.models.schemas.shopping.types import card_payment_instrument
2525

2626

2727
# Rebuild models to resolve forward references
28-
checkout.Checkout.model_rebuild(_types_namespace={"PaymentResponse": Payment})
28+
checkout.Checkout.model_rebuild(_types_namespace={"Payment": Payment})
2929

3030

3131
class CardCredentialTest(integration_test_utils.IntegrationTestBase):
@@ -54,20 +54,12 @@ def test_card_credential_payment(self) -> None:
5454
cvc="123",
5555
name="John Doe",
5656
)
57-
instr = card_payment_instrument.CardPaymentInstrument(
58-
id="instr_card",
59-
handler_id="mock_payment_handler",
60-
handler_name="mock_payment_handler",
61-
type="card",
62-
brand="Visa",
63-
last_digits="1111",
64-
credential=credential,
57+
58+
# Use the standard valid payment payload and override credential
59+
payment_payload = integration_test_utils.get_valid_payment_payload()
60+
payment_payload["payment_data"]["credential"] = credential.model_dump(
61+
mode="json", exclude_none=True
6562
)
66-
payment_data = instr.model_dump(mode="json", exclude_none=True)
67-
payment_payload = {
68-
"payment_data": payment_data,
69-
"risk_signals": {},
70-
}
7163

7264
response = self.client.post(
7365
self.get_shopping_url(f"/checkout-sessions/{checkout_id}/complete"),

‎checkout_lifecycle_test.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616

1717
from absl.testing import absltest
1818
import integration_test_utils
19-
from ucp_sdk.models.schemas.shopping import checkout_update_req
20-
from ucp_sdk.models.schemas.shopping import fulfillment_resp as checkout
21-
from ucp_sdk.models.schemas.shopping import payment_update_req
22-
from ucp_sdk.models.schemas.shopping.payment_resp import (
23-
PaymentResponse as Payment,
19+
from ucp_sdk.models.schemas.shopping import checkout_update_request as checkout_update_req
20+
from ucp_sdk.models.schemas.shopping import checkout
21+
from ucp_sdk.models.schemas.shopping import payment_update_request as payment_update_req
22+
from ucp_sdk.models.schemas.shopping.payment import (
23+
Payment,
2424
)
25-
from ucp_sdk.models.schemas.shopping.types import item_update_req
26-
from ucp_sdk.models.schemas.shopping.types import line_item_update_req
25+
from ucp_sdk.models.schemas.shopping.types import item_update_request as item_update_req
26+
from ucp_sdk.models.schemas.shopping.types import line_item_update_request as line_item_update_req
2727

2828
# Rebuild models to resolve forward references
29-
checkout.Checkout.model_rebuild(_types_namespace={"PaymentResponse": Payment})
29+
checkout.Checkout.model_rebuild(_types_namespace={"Payment": Payment})
3030

3131

3232
class CheckoutLifecycleTest(integration_test_utils.IntegrationTestBase):

0 commit comments

Comments
 (0)