Update tests

2 files changed, 5 insertions, 40 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
index aa9cb57f541..73d4daf92da 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
@@ -85,24 +85,6 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
     }
 
     @Test
-    void setting_and_deleting_instrument() {
-        assertTrue(billingController.getDefaultInstrument(tenant).isEmpty());
-
-        var instrumentRequest = request("/billing/v1/tenant/tenant1/instrument", PATCH)
-                .data("{\"active\": \"id-1\"}")
-                .roles(tenantRole);
-
-        tester.assertResponse(instrumentRequest, "OK");
-        assertEquals("id-1", billingController.getDefaultInstrument(tenant).get().getId());
-
-        var deleteInstrumentRequest = request("/billing/v1/tenant/tenant1/instrument/id-1", DELETE)
-                .roles(tenantRole);
-
-        tester.assertResponse(deleteInstrumentRequest, "OK");
-        assertTrue(billingController.getDefaultInstrument(tenant).isEmpty());
-    }
-
-    @Test
     void response_list_bills() {
         var bill = createBill();
 
@@ -197,15 +179,6 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
     }
 
     @Test
-    void setting_plans() {
-        var planRequest = request("/billing/v1/tenant/tenant1/plan", PATCH)
-                .data("{\"plan\": \"new-plan\"}")
-                .roles(tenantRole);
-        tester.assertResponse(planRequest, "Plan: new-plan");
-        assertEquals("new-plan", billingController.getPlan(tenant).value());
-    }
-
-    @Test
     void csv_export() {
         var bill = createBill();
         billingController.addBill(tenant, bill, true);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java
index c62a9f1399f..857dcbac6fd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java
@@ -74,24 +74,16 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest {
     }
 
     @Test
-    void require_admin_for_update_plan() {
-        var request = request("/billing/v2/tenant/" + tenant.value(), Request.Method.PATCH)
-                .data("{\"plan\": \"paid\"}");
-
-        var forbidden = request.roles(tenantReader);
-        tester.assertResponse(forbidden, ACCESS_DENIED, 403);
-        var success = request.roles(tenantAdmin);
-        tester.assertResponse(success, """
-                {"tenant":"tenant1","plan":{"id":"paid","name":"Paid Plan - for testing purposes"},"collection":"AUTO"}""");
-    }
-
-    @Test
     void require_accountant_for_update_collection() {
         var request = request("/billing/v2/tenant/" + tenant.value(), Request.Method.PATCH)
                 .data("{\"collection\": \"INVOICE\"}");
 
         var forbidden = request.roles(tenantAdmin);
-        tester.assertResponse(forbidden, "{\"error-code\":\"FORBIDDEN\",\"message\":\"Only accountant can change billing method\"}", 403);
+        tester.assertResponse(forbidden, """
+                {
+                  "code" : 403,
+                  "message" : "Access denied"
+                }""", 403);
 
         var success = request.roles(financeAdmin);
         tester.assertResponse(success, """