making required changes

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtilTest.java

@@ -55,9 +55,8 @@ public class APIPublisherUtilTest extends BaseAPIPublisherTest {
     }
 
     @Test(description = "test buildAPIConfig method and ensures an APIConfig is created")
-    private void buildApiConfigAsNonAdmin() throws UserStoreException, RegistryException {
-        try {
-            startTenantFlowAsNonAdmin();
+    private void buildApiConfigAsNonAdminUser() throws UserStoreException, RegistryException {
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername("test");
         setUserRealm();
         ServletContext servletContext = new MockServletContext();
         APIResourceConfiguration apiDef = new APIResourceConfiguration();
@@ -65,14 +64,11 @@ public class APIPublisherUtilTest extends BaseAPIPublisherTest {
         apiDef.setResources(resources);
         APIConfig apiConfig = buildApiConfig(servletContext, apiDef);
         Assert.assertNotNull(apiConfig, "API configuration is null.");
-        } finally {
-            PrivilegedCarbonContext.endTenantFlow();
-        }
     }
 
     @Test(description = "test buildAPIConfig method as SuperTenant and ensures" +
             " an APIConfig is created")
-    private void buildApiConfigAdminUser() throws UserStoreException {
+    private void buildApiConfigAsAdminUser() throws UserStoreException {
         ServletContext servletContext = new MockServletContext();
         APIResourceConfiguration apiDef = new APIResourceConfiguration();
         List<APIResource> resources = new ArrayList<>();
@@ -117,10 +113,4 @@ public class APIPublisherUtilTest extends BaseAPIPublisherTest {
         UserRealm userRealm = new InMemoryRealmService().getUserRealm(configuration);
         PrivilegedCarbonContext.getThreadLocalCarbonContext().setUserRealm(userRealm);
     }
-
-    private void startTenantFlowAsNonAdmin() {
-        PrivilegedCarbonContext.startTenantFlow();
-        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID, true);
-        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername("test");
-    }
 }