diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-10-30 16:55:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-30 16:55:23 +0100 |
commit | 6143829e6383f66a09b3292716ddfaff37d66ab2 (patch) | |
tree | e9cb7be64d956ac074abef31da93c571367060e5 /controller-server/src/test/java | |
parent | caa21cf51b78a5426e8a137d7376eea76f59f07d (diff) | |
parent | 6a3584d8b799bc815ec339aa2038dccc8a415f1a (diff) |
Merge pull request #29158 from vespa-engine/bjorncs/taxid-country
Bjorncs/taxid country
Diffstat (limited to 'controller-server/src/test/java')
3 files changed, 8 insertions, 2 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java index cfc3320b083..f2fc43933df 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java @@ -238,7 +238,7 @@ public class TenantSerializerTest { .withAddress("Central Station") .withRegion("Irish Sea")) .withPurchaseOrder(new PurchaseOrder("PO42")) - .withTaxId(new TaxId("no_vat", "123456789MVA")) + .withTaxId(new TaxId("NO", "no_vat", "123456789MVA")) .withInvoiceEmail(new Email("billing@mycomp.any", false)) ); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java index 1ad88675169..f8ae7c8ea50 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java @@ -107,6 +107,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { "phone":"" }, "taxId": { + "country": "", "type": "", "code": "" }, @@ -125,7 +126,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { "email":"foo@example", "phone":"phone" }, - "taxId":{"type": "no_vat", "code": "123456789MVA"}, + "taxId":{"country": "NO", "type": "no_vat", "code": "123456789MVA"}, "purchaseOrder":"PO9001", "invoiceEmail":"billing@mycomp.any", "address": { @@ -151,6 +152,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { "phone":"phone" }, "taxId": { + "country": "NO", "type": "no_vat", "code": "123456789MVA" }, @@ -238,6 +240,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { "email":"","emailVerified":false, "phone":"", "taxId": { + "country": "", "type": "", "code": "" }, @@ -272,6 +275,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { "emailVerified":false, "phone":"phone", "taxId": { + "country": "", "type": "", "code": "" }, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/accepted-countries.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/accepted-countries.json index 2714de1e64d..5247b84a900 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/accepted-countries.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/accepted-countries.json @@ -3,6 +3,7 @@ { "code": "NO", "name": "Norway", + "taxIdMandatory": true, "taxTypes": [ { "id": "no_vat", @@ -15,6 +16,7 @@ { "code": "CA", "name": "Canada", + "taxIdMandatory": true, "taxTypes": [ { "id": "ca_gst_hst", |