1 files changed, 29 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/MailVerifierTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/MailVerifierTest.java
index 77145be4197..4fbf39f8d8b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/MailVerifierTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/MailVerifierTest.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller;
 
 import com.yahoo.config.provision.SystemName;
@@ -9,15 +9,15 @@ import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
+import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
+import com.yahoo.vespa.hosted.controller.tenant.TenantContact;
 import com.yahoo.vespa.hosted.controller.tenant.TenantContacts;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.net.URI;
 import java.time.Duration;
 import java.util.List;
 
-import static com.yahoo.yolean.Exceptions.uncheck;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -30,7 +30,7 @@ class MailVerifierTest {
 
     private final ControllerTester tester = new ControllerTester(SystemName.Public);
     private final MockMailer mailer = tester.serviceRegistry().mailer();
-    private final MailVerifier mailVerifier = new MailVerifier(URI.create("https://dashboard.uri.example.com"), tester.controller().tenants(), mailer, tester.curator(), tester.clock());
+    private final MailVerifier mailVerifier = new MailVerifier(tester.serviceRegistry().consoleUrls(), tester.controller().tenants(), mailer, tester.curator(), tester.clock());
 
     private static final TenantName tenantName = TenantName.from("scoober");
     private static final String mail = "unverified@bar.com";
@@ -100,4 +100,29 @@ class MailVerifierTest {
         assertTrue(tester.curator().getPendingMailVerification(resentVerification.get().getVerificationCode()).isPresent());
     }
 
+    @Test
+    public void test_billing_mail_verification() {
+        var billingMail = "billing@foo.bar";
+        tester.controller().tenants().lockOrThrow(tenantName, LockedTenant.Cloud.class, lockedTenant -> {
+            var tenantBilling = TenantBilling.empty().withContact(TenantContact.empty().withEmail(new Email(billingMail, false)));
+            lockedTenant = lockedTenant.withInfo(lockedTenant.get().info().withBilling(tenantBilling));
+            tester.controller().tenants().store(lockedTenant);
+        });
+        mailVerifier.sendMailVerification(tenantName, billingMail, PendingMailVerification.MailType.BILLING);
+
+        // Assert written verification data
+        var writtenMailVerification = tester.curator().listPendingMailVerifications().get(0);
+        assertEquals(PendingMailVerification.MailType.BILLING, writtenMailVerification.getMailType());
+        assertEquals(tenantName, writtenMailVerification.getTenantName());
+        assertEquals(tester.clock().instant().plus(Duration.ofDays(7)), writtenMailVerification.getVerificationDeadline());
+        assertEquals(billingMail, writtenMailVerification.getMailAddress());
+
+        // Assert mail is verified
+        mailVerifier.verifyMail(writtenMailVerification.getVerificationCode());
+        assertTrue(tester.curator().listPendingMailVerifications().isEmpty());
+        var tenant = tester.controller().tenants().require(tenantName, CloudTenant.class);
+        var expectedBillingContact = TenantContact.empty().withEmail(new Email(billingMail, true));
+        assertEquals(expectedBillingContact, tenant.info().billingContact().contact());
+    }
+
 }