1 files changed, 11 insertions, 11 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatterTest.java
index 164df0a27f5..875487144d9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatterTest.java
@@ -1,3 +1,4 @@
+// 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.notification;
 
 import com.yahoo.config.provision.ApplicationId;
@@ -5,16 +6,16 @@ import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
+import com.yahoo.vespa.hosted.controller.api.integration.ConsoleUrls;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
-import com.yahoo.vespa.hosted.controller.integration.ZoneRegistryMock;
 import org.junit.jupiter.api.Test;
 
+import java.net.URI;
 import java.time.Instant;
 import java.util.List;
 
@@ -30,9 +31,8 @@ public class NotificationFormatterTest {
     private final ApplicationId applicationId = ApplicationId.from(tenant, application, instance);
     private final DeploymentId deploymentId = new DeploymentId(applicationId, ZoneId.defaultId());
     private final ClusterSpec.Id cluster = new ClusterSpec.Id("content");
-    private final ZoneRegistryMock zoneRegistry = new ZoneRegistryMock(SystemName.Public);
 
-    private final NotificationFormatter formatter = new NotificationFormatter(zoneRegistry);
+    private final NotificationFormatter formatter = new NotificationFormatter(new ConsoleUrls(URI.create("https://console.tld")));
 
     @Test
     void applicationPackage() {
@@ -40,7 +40,7 @@ public class NotificationFormatterTest {
         var content = formatter.format(notification);
         assertEquals("Application package", content.prettyType());
         assertEquals("Application package for myapp.beta has 2 warnings", content.messagePrefix());
-        assertEquals("https://dashboard.tld/scoober.myapp.beta", content.uri().toString());
+        assertEquals("https://console.tld/tenant/scoober/application/myapp/prod/instance/beta", content.uri());
     }
 
     @Test
@@ -50,7 +50,7 @@ public class NotificationFormatterTest {
         var content = formatter.format(notification);
         assertEquals("Deployment", content.prettyType());
         assertEquals("production-default #1001 for myapp.beta has a warning", content.messagePrefix());
-        assertEquals("https://dashboard.tld/scoober.myapp.beta/production-default/1001", content.uri().toString());
+        assertEquals("https://console.tld/tenant/scoober/application/myapp/prod/instance/beta/job/production-default/run/1001", content.uri());
     }
 
     @Test
@@ -60,7 +60,7 @@ public class NotificationFormatterTest {
         var content = formatter.format(notification);
         assertEquals("Deployment", content.prettyType());
         assertEquals("production-default #1001 for myapp.beta has failed", content.messagePrefix());
-        assertEquals("https://dashboard.tld/scoober.myapp.beta/production-default/1001", content.uri().toString());
+        assertEquals("https://console.tld/tenant/scoober/application/myapp/prod/instance/beta/job/production-default/run/1001", content.uri());
     }
 
     @Test
@@ -69,7 +69,7 @@ public class NotificationFormatterTest {
         var content = formatter.format(notification);
         assertEquals("Test package", content.prettyType());
         assertEquals("There is a problem with tests for myapp", content.messagePrefix());
-        assertEquals("https://dashboard.tld/scoober/myapp", content.uri().toString());
+        assertEquals("https://console.tld/tenant/scoober/application/myapp/prod/instance", content.uri());
     }
 
     @Test
@@ -78,7 +78,7 @@ public class NotificationFormatterTest {
         var content = formatter.format(notification);
         assertEquals("Reindex", content.prettyType());
         assertEquals("Cluster content in prod.default for myapp.beta is reindexing", content.messagePrefix());
-        assertEquals("https://dashboard.tld/scoober.myapp.beta?beta.prod.default=clusters%2Ccontent%3Dstatus", content.uri().toString());
+        assertEquals("https://console.tld/tenant/scoober/application/myapp/prod/instance/beta?beta.prod.default=clusters%2Ccontent%3Dreindexing", content.uri());
     }
 
     @Test
@@ -87,6 +87,6 @@ public class NotificationFormatterTest {
         var content = formatter.format(notification);
         assertEquals("Nearly feed blocked", content.prettyType());
         assertEquals("Cluster content in prod.default for myapp.beta is nearly feed blocked", content.messagePrefix());
-        assertEquals("https://dashboard.tld/scoober.myapp.beta?beta.prod.default=clusters%2Ccontent", content.uri().toString());
+        assertEquals("https://console.tld/tenant/scoober/application/myapp/prod/instance/beta?beta.prod.default=clusters%2Ccontent", content.uri());
     }
-}
\ No newline at end of file
+}