From 8046a925254ad9b8de7b7c2831103c9171131141 Mon Sep 17 00:00:00 2001
From: Savindu Dimal <dimalsavindu@gmail.com>
Date: Thu, 30 Jan 2025 21:59:45 +0530
Subject: [PATCH] Fix unit test failures

---
 .../src/main/java/org/wso2/carbon/apimgt/api/model/API.java   | 2 +-
 .../src/test/java/APIMappingUtilTest.java                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
index 9997a8a91f6e..bc2d8acc6173 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
@@ -769,7 +769,7 @@ public void removeAllPolicies() {
     }
 
     public Set<OrganizationTiers> getAvailableTiersForOrganizations() {
-        return Collections.unmodifiableSet(availableTiersForOrganizations);
+        return availableTiersForOrganizations;
     }
 
     public void setAvailableTiersForOrganizations(Set<OrganizationTiers> availableTiersForOrganizations) {
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/test/java/APIMappingUtilTest.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/test/java/APIMappingUtilTest.java
index a249ab3ba57a..4bc2affe0974 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/test/java/APIMappingUtilTest.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/test/java/APIMappingUtilTest.java
@@ -30,6 +30,7 @@
 import org.wso2.carbon.apimgt.impl.APIManagerConfiguration;
 import org.wso2.carbon.apimgt.impl.APIManagerConfigurationService;
 import org.wso2.carbon.apimgt.impl.APIManagerConfigurationServiceImpl;
+import org.wso2.carbon.apimgt.impl.dto.OrgAccessControl;
 import org.wso2.carbon.apimgt.impl.internal.ServiceReferenceHolder;
 import org.wso2.carbon.apimgt.rest.api.publisher.v1.common.mappings.APIMappingUtil;
 import org.wso2.carbon.apimgt.rest.api.publisher.v1.dto.APIDTO;
@@ -74,6 +75,7 @@ public void setup() {
         apidto.setOperations(operationList);
         apidto.setLifeCycleStatus(APIConstants.CREATED);
         config = Mockito.mock(APIManagerConfiguration.class);
+        OrgAccessControl orgAccessControl = Mockito.mock(OrgAccessControl.class);
         APIManagerConfigurationService apiManagerConfigurationService = new APIManagerConfigurationServiceImpl(config);
         ServiceReferenceHolder.getInstance().setAPIManagerConfigurationService(apiManagerConfigurationService);
         APIManagerConfiguration config = ServiceReferenceHolder.getInstance().getAPIManagerConfigurationService()
@@ -84,6 +86,8 @@ public void setup() {
                 .thenReturn(ALLOW_METHOD);
         Mockito.when(config.getFirstProperty(APIConstants.CORS_CONFIGURATION_ACCESS_CTL_ALLOW_ORIGIN))
                 .thenReturn(ALLOW_ORIGIN);
+        Mockito.when(config.getOrgAccessControl()).thenReturn(orgAccessControl);
+        Mockito.when(orgAccessControl.isEnabled()).thenReturn(false);
     }
 
     @Test