Fix unit test failures

SavinduDimal · Jan 30, 2025 · 8046a92 · 8046a92
1 parent 7ef005e
commit 8046a92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java b/...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/...org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/test/java/APIMappingUtilTest.java b/...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