Author: hoang_to Date: 2011-07-05 04:53:46 -0400 (Tue, 05 Jul 2011) New Revision: 6835 Added: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java Log: Add AbstractWebResourceTest to fix the failures in TestSkinService Added: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java (rev 0) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-07-05 08:53:46 UTC (rev 6835) @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; + +/** + * @author <a href=&quot;hoang281283(a)gmail.com&quot;&gt;Minh Hoang TO</a> + * @date 7/5/11 + */ +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") +}) +public abstract class AbstractWebResourceTest extends AbstractKernelTest +{ +} Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-07-05 07:28:03 UTC (rev 6834) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-07-05 08:53:46 UTC (rev 6835) @@ -39,13 +39,7 @@ * @author <a href=&quot;hoang281283(a)gmail.com&quot;&gt;Minh Hoang TO</a> * @date 6/29/11 */ -@ConfiguredBy( - { - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") , - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml") - } -) -public class TestSkinService extends AbstractKernelTest +public class TestSkinService extends AbstractWebResourceTest { private PortalContainer portalContainer; Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-07-05 07:28:03 UTC (rev 6834) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-07-05 08:53:46 UTC (rev 6835) @@ -29,6 +29,7 @@ import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.Parameter; import org.exoplatform.container.xml.ValueParam; +import org.exoplatform.portal.resource.AbstractWebResourceTest; import org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService; @@ -50,8 +51,7 @@ * @version $Revision$ */ -@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml")}) -public class TestResourceCompressorService extends AbstractKernelTest +public class TestResourceCompressorService extends AbstractWebResourceTest { public void testInitializing() {