From 48c3f349e4acd523708dbabd284697e620dce75b Mon Sep 17 00:00:00 2001
From: Ola Aunronning <olaa@yahooinc.com>
Date: Tue, 30 Aug 2022 16:12:23 +0200
Subject: Update tests

---
 .../restapi/billing/BillingApiHandlerTest.java     | 27 ----------------------
 .../restapi/billing/BillingApiHandlerV2Test.java   | 18 ++++-----------
 2 files changed, 5 insertions(+), 40 deletions(-)

(limited to 'controller-server')

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
@@ -84,24 +84,6 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
         tester.assertResponse(listPlansRequest, "{\"plans\":[{\"id\":\"trial\",\"name\":\"Free Trial - for testing purposes\"},{\"id\":\"paid\",\"name\":\"Paid Plan - for testing purposes\"},{\"id\":\"none\",\"name\":\"None Plan - for testing purposes\"}]}");
     }
 
-    @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();
@@ -196,15 +178,6 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
         tester.assertResponse(request, new File("billing-all-tenants.json"));
     }
 
-    @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();
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
@@ -73,25 +73,17 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest {
         tester.assertResponse(request, "{\"tenant\":\"tenant1\",\"plan\":{\"id\":\"trial\",\"name\":\"Free Trial - for testing purposes\"},\"collection\":\"AUTO\"}");
     }
 
-    @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, """
-- 
cgit v1.2.3