Repository: tomee Updated Branches: refs/heads/master 51632452a -> ca650ef85
fixing ScopesRuleTest Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ca650ef8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ca650ef8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ca650ef8 Branch: refs/heads/master Commit: ca650ef85c9945c5de022cc21ac3680e2b5696d5 Parents: 5163245 Author: rmannibucau <[email protected]> Authored: Fri Dec 16 19:07:31 2016 +0100 Committer: rmannibucau <[email protected]> Committed: Fri Dec 16 19:07:31 2016 +0100 ---------------------------------------------------------------------- .../apache/openejb/junit/ScopesRuleTest.java | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ca650ef8/container/openejb-core/src/test/java/org/apache/openejb/junit/ScopesRuleTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/junit/ScopesRuleTest.java b/container/openejb-core/src/test/java/org/apache/openejb/junit/ScopesRuleTest.java index 8669970..a7e0038 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/junit/ScopesRuleTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/junit/ScopesRuleTest.java @@ -20,9 +20,13 @@ import org.apache.openejb.testing.ContainerProperties; import org.apache.webbeans.config.WebBeansContext; import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; -import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; import static org.junit.Assert.assertTrue; @@ -30,10 +34,10 @@ import static org.junit.Assert.assertTrue; @ContainerProperties.Property(name = "openejb.testing.start-cdi-contexts", value = "false") }) @org.apache.openejb.testing.Classes(cdi = true, innerClassesAsBean = true) -@RunWith(ApplicationComposer.class) public class ScopesRuleTest { @Rule - public final ScopesRule rule = new ScopesRule(); + public final TestRule rule = RuleChain.outerRule(new ApplicationComposerRule(this)) + .around(new ScopesRule()); public static class Foo { public void touch() { @@ -41,9 +45,17 @@ public class ScopesRuleTest { } } + @Inject + private BeanManager beanManager; + + @Test(expected = ContextNotActiveException.class) + public void scopeDoesNotExist() { + beanManager.getContext(SessionScoped.class); + } + @Test - @CdiScopes(RequestScoped.class) + @CdiScopes(SessionScoped.class) public void scopeExists() { - assertTrue(WebBeansContext.currentInstance().getContextsService().getCurrentContext(RequestScoped.class).isActive()); + assertTrue(WebBeansContext.currentInstance().getContextsService().getCurrentContext(SessionScoped.class).isActive()); } }
