On Wed, Dec 12, 2012 at 8:19 PM, Pradeep Fernando <prad...@wso2.com> wrote:
> Hi Dileepa, > > can you please commit the same fix to [1] > > [1] https://svn.wso2.org/repos/wso2/scratch/c5/core/ > > Done. > thanks, > --Pradeep > > > On Wed, Dec 12, 2012 at 1:33 PM, <dile...@wso2.com> wrote: > >> Author: dileepa >> Date: Wed Dec 12 13:33:03 2012 >> New Revision: 151291 >> URL: http://wso2.org/svn/browse/wso2?view=rev&revision=151291 >> >> Log: >> fixing test failures by starting super-tenant flow for >> PersistenceUtilsTest and PersistenceManagerTest >> >> Modified: >> >> >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceManagerTest.java >> >> >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceUtilsTest.java >> >> Modified: >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceManagerTest.java >> URL: >> http://wso2.org/svn/browse/wso2/carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceManagerTest.java?rev=151291&r1=151290&r2=151291&view=diff >> >> ============================================================================== >> --- >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceManagerTest.java >> (original) >> +++ >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceManagerTest.java >> Wed Dec 12 13:33:03 2012 >> @@ -40,6 +40,7 @@ >> import >> org.wso2.carbon.registry.core.internal.RegistryCoreServiceComponent; >> import >> org.wso2.carbon.registry.core.jdbc.InMemoryEmbeddedRegistryService; >> import org.wso2.carbon.utils.WSO2Constants; >> +import org.wso2.carbon.utils.multitenancy.MultitenantConstants; >> >> import javax.xml.namespace.QName; >> import java.io.ByteArrayInputStream; >> @@ -60,11 +61,14 @@ >> >> public void setUp() { >> super.setUp(); >> - >> + //initializing super-tenant flow for this test >> + PrivilegedCarbonContext.startTenantFlow(); >> + >> PrivilegedCarbonContext.getCurrentContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); >> + PrivilegedCarbonContext.getCurrentContext().getTenantDomain(true); >> if (embeddedRegistryService != null) { >> return; >> } >> - >> + >> try { >> InputStream regConfigStream = >> Thread.currentThread().getContextClassLoader() >> .getResourceAsStream("registry.xml"); >> @@ -105,6 +109,7 @@ >> >> public void tearDown() throws Exception { >> super.tearDown(); >> + PrivilegedCarbonContext.endTenantFlow(); >> } >> >> public void testNewServiceGroupAddition() throws Exception { >> >> Modified: >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceUtilsTest.java >> URL: >> http://wso2.org/svn/browse/wso2/carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceUtilsTest.java?rev=151291&r1=151290&r2=151291&view=diff >> >> ============================================================================== >> --- >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceUtilsTest.java >> (original) >> +++ >> carbon/kernel/branches/4.0.0/core/org.wso2.carbon.core/4.0.5/src/test/java/org/wso2/carbon/core/test/persistence/PersistenceUtilsTest.java >> Wed Dec 12 13:33:03 2012 >> @@ -38,6 +38,7 @@ >> import org.wso2.carbon.registry.core.jdbc.EmbeddedRegistryService; >> import >> org.wso2.carbon.registry.core.jdbc.InMemoryEmbeddedRegistryService; >> import org.wso2.carbon.utils.WSO2Constants; >> +import org.wso2.carbon.utils.multitenancy.MultitenantConstants; >> >> import java.io.File; >> import java.io.InputStream; >> @@ -54,12 +55,15 @@ >> >> public void setUp() { >> super.setUp(); >> - >> + //initializing super-tenant flow for this test >> + PrivilegedCarbonContext.startTenantFlow(); >> + >> PrivilegedCarbonContext.getCurrentContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); >> + PrivilegedCarbonContext.getCurrentContext().getTenantDomain(true); >> if (embeddedRegistryService != null) { >> return; >> } >> >> - try { >> + try { >> InputStream regConfigStream = >> Thread.currentThread().getContextClassLoader() >> .getResourceAsStream("registry.xml"); >> embeddedRegistryService = new >> InMemoryEmbeddedRegistryService(regConfigStream); >> @@ -93,6 +97,7 @@ >> >> public void tearDown() throws Exception { >> super.tearDown(); >> + PrivilegedCarbonContext.endTenantFlow(); >> } >> >> // public void testGetResourcePath() throws Exception { >> _______________________________________________ >> Commits mailing list >> comm...@wso2.org >> http://wso2.org/cgi-bin/mailman/listinfo/commits >> > > > > -- > *Pradeep Fernando* > Member, Management Committee - Platform & Cloud Technologies > Senior Software Engineer;WSO2 Inc.; http://wso2.com > > blog: http://pradeepfernando.blogspot.com > m: +94776603662 > -- Dileepa Jayakody, Software Engineer, WSO2 Inc. Lean . Enterprise . Middleware Mobile : +94777-857616
_______________________________________________ Dev mailing list Dev@wso2.org http://wso2.org/cgi-bin/mailman/listinfo/dev
