[webbeans-commits] Webbeans SVN: r1001 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans/context and 5 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-15 20:24:10 -0500 (Thu, 15 Jan 2009) New Revision: 1001 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockApplicationContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockDependentContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockRequestContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockSessionContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java Modified: ri/trunk/webbeans-ri/pom.xml ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContextsImpl.java ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties ri/trunk/webbeans-ri/src/test/resources/log4j.xml Log: Add ContainersImpl, fix a nasty problem where mock contexts weren't being reset Modified: ri/trunk/webbeans-ri/pom.xml =================================================================== --- ri/trunk/webbeans-ri/pom.xml 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/pom.xml 2009-01-16 01:24:10 UTC (rev 1001) @@ -159,7 +159,7 @@ </executions> <configuration> <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>index</outputName> + <outputName>test-report</outputName> </configuration> </plugin> </plugins> Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -31,7 +31,7 @@ public class DependentContext extends AbstractContext { - public static final DependentContext INSTANCE = new DependentContext(); + public static DependentContext INSTANCE = new DependentContext(); private ThreadLocal<AtomicInteger> reentrantActiveCount; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -5,7 +5,6 @@ import javax.webbeans.manager.Context; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.context.AbstractBeanMapContext; import org.jboss.webbeans.context.RequestContext; import org.jboss.webbeans.test.beans.FishFarmOffice; import org.testng.annotations.Test; @@ -24,9 +23,7 @@ @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="8.6") public void testGetContextWithNoActiveContextsFails() { - Context requestContext = new RequestContext() {}; - ((AbstractBeanMapContext)requestContext).setActive(false); - manager.addContext(requestContext); + RequestContext.INSTANCE.setActive(false); manager.getContext(RequestScoped.class); } @@ -51,11 +48,7 @@ @Test(groups={"manager"}) @SpecAssertion(section="8.6") public void testGetContextReturnsActiveContext() { - Context requestContext = new RequestContext() {}; - manager.addContext(requestContext); - Context testContext = manager.getContext(RequestScoped.class); - assert testContext == requestContext; - + manager.getContext(RequestScoped.class); } @Test(groups={"stub", "manager", "ejb3"}) @SpecAssertion(section="5.8") Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockApplicationContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockApplicationContext.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockApplicationContext.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.mock; + +import org.jboss.webbeans.context.ApplicationContext; +import org.jboss.webbeans.context.beanmap.SimpleBeanMap; + +public class MockApplicationContext extends ApplicationContext +{ + + public MockApplicationContext() + { + super(); + ApplicationContext.INSTANCE = this; + setBeanMap(new SimpleBeanMap()); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockApplicationContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -18,11 +18,6 @@ import org.jboss.webbeans.bootstrap.WebBeansBootstrap; import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.context.ApplicationContext; -import org.jboss.webbeans.context.DependentContext; -import org.jboss.webbeans.context.RequestContext; -import org.jboss.webbeans.context.SessionContext; -import org.jboss.webbeans.context.beanmap.SimpleBeanMap; import org.jboss.webbeans.ejb.spi.EjbResolver; import org.jboss.webbeans.resource.AbstractNaming; import org.jboss.webbeans.resources.spi.Naming; @@ -173,16 +168,17 @@ this.mockNaming = new MockNaming(); initManager(mockNaming, MOCK_EJB_RESOLVER, resourceLoader); registerStandardBeans(); - - // Set up the mock contexts - getManager().addContext(RequestContext.INSTANCE); - SessionContext.INSTANCE.setBeanMap(new SimpleBeanMap()); - getManager().addContext(SessionContext.INSTANCE); - ApplicationContext.INSTANCE.setBeanMap(new SimpleBeanMap()); - getManager().addContext(ApplicationContext.INSTANCE); - getManager().addContext(DependentContext.INSTANCE); + setupContexts(); } + protected void setupContexts() + { + getManager().addContext(new MockRequestContext()); + getManager().addContext(new MockSessionContext()); + getManager().addContext(new MockApplicationContext()); + getManager().addContext(new MockDependentContext()); + } + protected void registerStandardBeans() { getManager().setBeans(createStandardBeans()); Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockDependentContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockDependentContext.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockDependentContext.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.mock; + +import org.jboss.webbeans.context.DependentContext; + +public class MockDependentContext extends DependentContext +{ + + public MockDependentContext() + { + super(); + DependentContext.INSTANCE = this; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockDependentContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockRequestContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockRequestContext.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockRequestContext.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.mock; + +import org.jboss.webbeans.context.RequestContext; + +public class MockRequestContext extends RequestContext +{ + + public MockRequestContext() + { + super(); + RequestContext.INSTANCE = this; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockRequestContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockSessionContext.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockSessionContext.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockSessionContext.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.mock; + +import org.jboss.webbeans.context.SessionContext; +import org.jboss.webbeans.context.beanmap.SimpleBeanMap; + +public class MockSessionContext extends SessionContext +{ + + public MockSessionContext() + { + super(); + SessionContext.INSTANCE = this; + setBeanMap(new SimpleBeanMap()); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockSessionContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.test.tck; + +import javax.webbeans.manager.Manager; + +import org.jboss.webbeans.tck.api.Containers; +import org.jboss.webbeans.test.mock.MockBootstrap; +import org.jboss.webbeans.test.mock.MockWebBeanDiscovery; + +public class ContainersImpl implements Containers +{ + + public Manager deploy(Class<?>... classes) + { + MockBootstrap bootstrap = new MockBootstrap(); + bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes)); + bootstrap.boot(); + return bootstrap.getManager(); + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContextsImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContextsImpl.java 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContextsImpl.java 2009-01-16 01:24:10 UTC (rev 1001) @@ -10,7 +10,7 @@ public RequestContext getRequestContext() { - throw new UnsupportedOperationException("Not yet implemented"); + return RequestContext.INSTANCE; } public void setActive(AbstractContext context) Modified: ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/src/test/resources/META-INF/web-beans-tck.properties 2009-01-16 01:24:10 UTC (rev 1001) @@ -1,3 +1,4 @@ org.jboss.webbeans.tck.api.Managers=org.jboss.webbeans.test.tck.ManagersImpl org.jboss.webbeans.tck.api.Beans=org.jboss.webbeans.test.tck.BeansImpl -org.jboss.webbeans.tck.api.Contexts=org.jboss.webbeans.test.tck.ContextsImpl \ No newline at end of file +org.jboss.webbeans.tck.api.Contexts=org.jboss.webbeans.test.tck.ContextsImpl +org.jboss.webbeans.tck.api.Containers=org.jboss.webbeans.test.tck.ContainersImpl \ No newline at end of file Modified: ri/trunk/webbeans-ri/src/test/resources/log4j.xml =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-01-16 01:22:43 UTC (rev 1000) +++ ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-01-16 01:24:10 UTC (rev 1001) @@ -13,7 +13,7 @@ <!-- ############### Embedded EJB3 ################# --> <category name="org.jboss"> - <priority value="WARN"/> + <priority value="ERROR"/> </category> <category name="com.arjuna"> <priority value="ERROR"/>