aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java28
1 files changed, 14 insertions, 14 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
index fcf8402d23c..5d5e310503d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
@@ -8,8 +8,8 @@ import com.yahoo.vespa.hosted.controller.api.role.Role;
import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerCloudTest;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.util.List;
@@ -31,7 +31,7 @@ public class ZoneApiTest extends ControllerContainerCloudTest {
private ContainerTester tester;
- @Before
+ @BeforeEach
public void before() {
tester = new ContainerTester(container, responseFiles);
tester.serviceRegistry().zoneRegistry()
@@ -40,30 +40,30 @@ public class ZoneApiTest extends ControllerContainerCloudTest {
}
@Test
- public void test_requests() {
+ void test_requests() {
// GET /zone/v1
tester.assertResponse(request("/zone/v1")
- .roles(everyone),
- new File("root.json"));
+ .roles(everyone),
+ new File("root.json"));
// GET /zone/v1/environment/prod
tester.assertResponse(request("/zone/v1/environment/prod")
- .roles(everyone),
- new File("prod.json"));
+ .roles(everyone),
+ new File("prod.json"));
// GET /zone/v1/environment/dev/default
tester.assertResponse(request("/zone/v1/environment/dev/default")
- .roles(everyone),
- new File("default-for-region.json"));
+ .roles(everyone),
+ new File("default-for-region.json"));
}
@Test
- public void test_invalid_requests() {
+ void test_invalid_requests() {
// GET /zone/v1/environment/prod/default: No default region
tester.assertResponse(request("/zone/v1/environment/prod/default")
- .roles(everyone),
- new File("no-default-region.json"),
- 400);
+ .roles(everyone),
+ new File("no-default-region.json"),
+ 400);
}
}