[webbeans-commits] Webbeans SVN: r2318 - in ri/trunk/tests: src/main/java and 33 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Apr 6 10:36:06 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-04-06 10:36:06 -0400 (Mon, 06 Apr 2009)
New Revision: 2318
Added:
ri/trunk/tests/src/main/java/org/
ri/trunk/tests/src/main/java/org/jboss/
ri/trunk/tests/src/main/java/org/jboss/webbeans/
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java
ri/trunk/tests/src/main/resources/META-INF/
ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties
Removed:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/AbstractWebBeansTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/StandaloneContainersImpl.java
Modified:
ri/trunk/tests/
ri/trunk/tests/pom.xml
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplicationScopedTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/ProxyTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java
ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties
Log:
WBRI-216
Property changes on: ri/trunk/tests
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
.settings
target
temp-testng-customsuite.xml
test-output
+
.project
.classpath
.settings
target
temp-testng-customsuite.xml
test-output
bin
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/pom.xml 2009-04-06 14:36:06 UTC (rev 2318)
@@ -6,7 +6,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core-tests</artifactId>
+ <artifactId>webbeans-core-test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>Web Beans Core Tests</name>
<dependencies>
@@ -15,11 +15,15 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-spi</artifactId>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <scope>test</scope>
<classifier>jdk15</classifier>
<exclusions>
<exclusion>
@@ -32,7 +36,6 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
<artifactId>jboss-test-harness</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
@@ -44,16 +47,19 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.el</groupId>
<artifactId>el-ri</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
+ <scope>test</scope>
<optional>true</optional>
<exclusions>
<exclusion>
Copied: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java (from rev 2307, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/AbstractWebBeansTest.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -0,0 +1,140 @@
+package org.jboss.webbeans.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.annotation.Annotation;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Production;
+import javax.inject.Standard;
+
+import org.jboss.testharness.AbstractTest;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.context.DependentContext;
+import org.jboss.webbeans.util.EnumerationIterable;
+import org.testng.ITestContext;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+
+public abstract class AbstractWebBeansTest extends AbstractTest
+{
+
+ protected abstract static class RunInDependentContext
+ {
+
+ protected void setup()
+ {
+ DependentContext.INSTANCE.setActive(true);
+ }
+
+ protected void cleanup()
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
+
+ public final void run() throws Exception
+ {
+ try
+ {
+ setup();
+ execute();
+ }
+ finally
+ {
+ cleanup();
+ }
+ }
+
+ protected abstract void execute() throws Exception;
+
+ }
+
+ protected static final int BUILT_IN_BEANS = 3;
+
+ private ManagerImpl manager;
+
+ public static boolean visited = false;
+
+ @Override
+ @BeforeSuite
+ public void beforeSuite(ITestContext context) throws Exception
+ {
+ if (!isInContainer())
+ {
+ getCurrentConfiguration().setStandaloneContainers(new StandaloneContainersImpl());
+ getCurrentConfiguration().getExtraPackages().add(AbstractWebBeansTest.class.getPackage().getName());
+ }
+ super.beforeSuite(context);
+ }
+
+ @BeforeMethod
+ public void before() throws Exception
+ {
+ this.manager = CurrentManager.rootManager();
+ }
+
+ @AfterMethod
+ public void after() throws Exception
+ {
+ this.manager = null;
+ }
+
+
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ return getDefaultDeploymentTypes();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected final List<Class<? extends Annotation>> getDefaultDeploymentTypes()
+ {
+ return Arrays.asList(Standard.class, Production.class);
+ }
+
+ protected Iterable<URL> getResources(String name)
+ {
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+ else
+ {
+ name = getClass().getPackage().getName().replace(".", "/") + "/" + name;
+ }
+ try
+ {
+ return new EnumerationIterable<URL>(getClass().getClassLoader().getResources(name));
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Error loading resource from classloader" + name, e);
+ }
+ }
+
+ protected byte[] serialize(Object instance) throws IOException
+ {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bytes);
+ out.writeObject(instance);
+ return bytes.toByteArray();
+ }
+
+ protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
+ {
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
+ return in.readObject();
+ }
+
+ protected ManagerImpl getCurrentManager()
+ {
+ return manager;
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java (from rev 2307, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/StandaloneContainersImpl.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -0,0 +1,78 @@
+package org.jboss.webbeans.test;
+
+import java.net.URL;
+
+import org.jboss.testharness.api.DeploymentException;
+import org.jboss.testharness.spi.StandaloneContainers;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.mock.MockEELifecycle;
+import org.jboss.webbeans.mock.MockServletLifecycle;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
+
+public class StandaloneContainersImpl implements StandaloneContainers
+{
+
+ // TODO this is a hack ;-)
+ public static Class<? extends MockServletLifecycle> lifecycleClass = MockEELifecycle.class;
+
+ private MockServletLifecycle lifecycle;
+
+ public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException
+ {
+ try
+ {
+ this.lifecycle = lifecycleClass.newInstance();
+ }
+ catch (InstantiationException e1)
+ {
+ throw new DeploymentException("Error instantiating lifeycle", e1);
+ }
+ catch (IllegalAccessException e1)
+ {
+ throw new DeploymentException("Error instantiating lifeycle", e1);
+ }
+ lifecycle.initialize();
+ try
+ {
+ MockWebBeanDiscovery discovery = lifecycle.getWebBeanDiscovery();
+ discovery.setWebBeanClasses(classes);
+ if (beansXml != null)
+ {
+ discovery.setWebBeansXmlFiles(beansXml);
+ }
+ lifecycle.beginApplication();
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException("Error deploying beans", e);
+ }
+ lifecycle.beginSession();
+ lifecycle.beginRequest();
+ }
+
+ public void deploy(Iterable<Class<?>> classes) throws DeploymentException
+ {
+ deploy(classes, null);
+ }
+
+ public void cleanup()
+ {
+ // Np-op
+
+ }
+
+ public void setup()
+ {
+ // No-op
+ }
+
+ public void undeploy()
+ {
+ lifecycle.endRequest();
+ lifecycle.endSession();
+ lifecycle.endApplication();
+ CurrentManager.setRootManager(null);
+ lifecycle = null;
+ }
+
+}
Added: ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties (rev 0)
+++ ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties 2009-04-06 14:36:06 UTC (rev 2318)
@@ -0,0 +1,2 @@
+org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.StandaloneContainersImpl
+org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,7 +1,7 @@
package org.jboss.webbeans.test.examples;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -16,12 +16,12 @@
@Override
protected void execute() throws Exception
{
- Game game1 = manager.getInstanceByType(Game.class);
- Game game2 = manager.getInstanceByType(Game.class);
+ Game game1 = getCurrentManager().getInstanceByType(Game.class);
+ Game game2 = getCurrentManager().getInstanceByType(Game.class);
assert game1!=game2;
assert game1.getNumber()!=game2.getNumber();
- Generator gen1 = manager.getInstanceByType(Generator.class);
- Generator gen2 = manager.getInstanceByType(Generator.class);
+ Generator gen1 = getCurrentManager().getInstanceByType(Generator.class);
+ Generator gen2 = getCurrentManager().getInstanceByType(Generator.class);
assert gen1.getRandom()!=null;
assert gen1.getRandom()==gen2.getRandom();
}
@@ -38,7 +38,7 @@
@Override
protected void execute() throws Exception
{
- TextTranslator tt1 = manager.getInstanceByType(TextTranslator.class);
+ TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class);
try
{
tt1.translate("hello world");
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockExampleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockExampleTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockExampleTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -2,7 +2,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -20,7 +20,7 @@
@Override
protected void execute() throws Exception
{
- TextTranslator tt2 = manager.getInstanceByType(TextTranslator.class);
+ TextTranslator tt2 = getCurrentManager().getInstanceByType(TextTranslator.class);
assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") );
}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/AbstractWebBeansTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/AbstractWebBeansTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/AbstractWebBeansTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,135 +0,0 @@
-package org.jboss.webbeans.test.unit;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.annotation.Annotation;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Production;
-import javax.inject.Standard;
-
-import org.jboss.testharness.AbstractTest;
-import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.context.DependentContext;
-import org.jboss.webbeans.util.EnumerationIterable;
-import org.testng.ITestContext;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeSuite;
-
-public abstract class AbstractWebBeansTest extends AbstractTest
-{
-
- protected abstract static class RunInDependentContext
- {
-
- protected void setup()
- {
- DependentContext.INSTANCE.setActive(true);
- }
-
- protected void cleanup()
- {
- DependentContext.INSTANCE.setActive(false);
- }
-
- public final void run() throws Exception
- {
- try
- {
- setup();
- execute();
- }
- finally
- {
- cleanup();
- }
- }
-
- protected abstract void execute() throws Exception;
-
- }
-
- protected static final int BUILT_IN_BEANS = 3;
-
- protected ManagerImpl manager;
-
- public static boolean visited = false;
-
- @Override
- @BeforeSuite
- public void beforeSuite(ITestContext context) throws Exception
- {
- if (!isInContainer())
- {
- getCurrentConfiguration().setStandaloneContainers(new StandaloneContainersImpl());
- getCurrentConfiguration().getExtraPackages().add(AbstractWebBeansTest.class.getPackage().getName());
- }
- super.beforeSuite(context);
- }
-
- @BeforeMethod
- public void before() throws Exception
- {
- this.manager = CurrentManager.rootManager();
- }
-
- @AfterMethod
- public void after() throws Exception
- {
- manager = null;
- }
-
-
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- return getDefaultDeploymentTypes();
- }
-
- @SuppressWarnings("unchecked")
- protected final List<Class<? extends Annotation>> getDefaultDeploymentTypes()
- {
- return Arrays.asList(Standard.class, Production.class);
- }
-
- protected Iterable<URL> getResources(String name)
- {
- if (name.startsWith("/"))
- {
- name = name.substring(1);
- }
- else
- {
- name = getClass().getPackage().getName().replace(".", "/") + "/" + name;
- }
- try
- {
- return new EnumerationIterable<URL>(getClass().getClassLoader().getResources(name));
- }
- catch (IOException e)
- {
- throw new RuntimeException("Error loading resource from classloader" + name, e);
- }
- }
-
- protected byte[] serialize(Object instance) throws IOException
- {
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(bytes);
- out.writeObject(instance);
- return bytes.toByteArray();
- }
-
- protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
- {
- ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
- return in.readObject();
- }
-
-}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/StandaloneContainersImpl.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/StandaloneContainersImpl.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/StandaloneContainersImpl.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,78 +0,0 @@
-package org.jboss.webbeans.test.unit;
-
-import java.net.URL;
-
-import org.jboss.testharness.api.DeploymentException;
-import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.MockServletLifecycle;
-import org.jboss.webbeans.mock.MockWebBeanDiscovery;
-
-public class StandaloneContainersImpl implements StandaloneContainers
-{
-
- // TODO this is a hack ;-)
- public static Class<? extends MockServletLifecycle> lifecycleClass = MockEELifecycle.class;
-
- private MockServletLifecycle lifecycle;
-
- public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException
- {
- try
- {
- this.lifecycle = lifecycleClass.newInstance();
- }
- catch (InstantiationException e1)
- {
- throw new DeploymentException("Error instantiating lifeycle", e1);
- }
- catch (IllegalAccessException e1)
- {
- throw new DeploymentException("Error instantiating lifeycle", e1);
- }
- lifecycle.initialize();
- try
- {
- MockWebBeanDiscovery discovery = lifecycle.getWebBeanDiscovery();
- discovery.setWebBeanClasses(classes);
- if (beansXml != null)
- {
- discovery.setWebBeansXmlFiles(beansXml);
- }
- lifecycle.beginApplication();
- }
- catch (Exception e)
- {
- throw new DeploymentException("Error deploying beans", e);
- }
- lifecycle.beginSession();
- lifecycle.beginRequest();
- }
-
- public void deploy(Iterable<Class<?>> classes) throws DeploymentException
- {
- deploy(classes, null);
- }
-
- public void cleanup()
- {
- // Np-op
-
- }
-
- public void setup()
- {
- // No-op
- }
-
- public void undeploy()
- {
- lifecycle.endRequest();
- lifecycle.endSession();
- lifecycle.endApplication();
- CurrentManager.setRootManager(null);
- lifecycle = null;
- }
-
-}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -3,7 +3,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -8,7 +8,7 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.jboss.webbeans.WebBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -20,11 +20,11 @@
@Test
public void testDeploymentTypesLoadedFromBeansXml()
{
- assert manager.getEnabledDeploymentTypes().size() == 4;
- assert manager.getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert manager.getEnabledDeploymentTypes().get(1).equals(WebBean.class);
- assert manager.getEnabledDeploymentTypes().get(2).equals(Production.class);
- assert manager.getEnabledDeploymentTypes().get(3).equals(AnotherDeploymentType.class);
+ assert getCurrentManager().getEnabledDeploymentTypes().size() == 4;
+ assert getCurrentManager().getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert getCurrentManager().getEnabledDeploymentTypes().get(1).equals(WebBean.class);
+ assert getCurrentManager().getEnabledDeploymentTypes().get(2).equals(Production.class);
+ assert getCurrentManager().getEnabledDeploymentTypes().get(3).equals(AnotherDeploymentType.class);
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -11,7 +11,7 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -22,7 +22,7 @@
@Test(groups="bootstrap")
public void testMultipleEnterpriseBean()
{
- List<Bean<?>> beans = manager.getBeans();
+ List<Bean<?>> beans = getCurrentManager().getBeans();
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : beans)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -23,7 +23,7 @@
@Test(groups="bootstrap")
public void testMultipleEnterpriseAndSimpleBean()
{
- List<Bean<?>> beans = manager.getBeans();
+ List<Bean<?>> beans = getCurrentManager().getBeans();
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : beans)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -9,7 +9,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -19,7 +19,7 @@
@Test(groups="bootstrap")
public void testMultipleSimpleBean()
{
- List<Bean<?>> beans = manager.getBeans();
+ List<Bean<?>> beans = getCurrentManager().getBeans();
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : beans)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -10,7 +10,7 @@
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -21,7 +21,7 @@
@Test(groups="bootstrap")
public void testSingleEnterpriseBean()
{
- List<Bean<?>> beans = manager.getBeans();
+ List<Bean<?>> beans = getCurrentManager().getBeans();
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : beans)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -24,7 +24,7 @@
public void testProducerMethodBean()
{
//deployBeans(TarantulaProducer.class);
- List<Bean<?>> beans = manager.getBeans();
+ List<Bean<?>> beans = getCurrentManager().getBeans();
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : beans)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -8,7 +8,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -18,7 +18,7 @@
@Test(groups="bootstrap")
public void testSingleSimpleBean()
{
- List<Bean<?>> beans = manager.getBeans();
+ List<Bean<?>> beans = getCurrentManager().getBeans();
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : beans)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplicationScopedTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplicationScopedTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplicationScopedTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -3,7 +3,7 @@
import java.util.concurrent.CountDownLatch;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -22,7 +22,7 @@
{
try
{
- manager.getInstanceByType(ApplictionScopedObject.class).increment();
+ getCurrentManager().getInstanceByType(ApplictionScopedObject.class).increment();
}
finally
{
@@ -32,7 +32,7 @@
}).start();
}
latch.await();
- int value = manager.getInstanceByType(ApplictionScopedObject.class).getValue();
+ int value = getCurrentManager().getInstanceByType(ApplictionScopedObject.class).getValue();
System.out.println(value);
assert value == 10;
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -2,7 +2,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -5,7 +5,7 @@
import javax.inject.TypeLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -15,7 +15,7 @@
@Test
public void testStringList()
{
- List<String> str = manager.getInstanceByType(new TypeLiteral<List<String>>()
+ List<String> str = getCurrentManager().getInstanceByType(new TypeLiteral<List<String>>()
{
});
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-public class PassivatingContextTest extends org.jboss.webbeans.test.unit.AbstractWebBeansTest
+public class PassivatingContextTest extends org.jboss.webbeans.test.AbstractWebBeansTest
{
/**
@@ -20,7 +20,7 @@
@Test(groups = { "contexts", "passivation" })
public void testIsSessionScopePassivating()
{
- assert manager.getServices().get(MetaDataCache.class).getScopeModel(SessionScoped.class).isPassivating();
+ assert getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(SessionScoped.class).isPassivating();
}
/**
@@ -30,7 +30,7 @@
@Test(groups = { "contexts", "passivation" })
public void testIsConversationScopePassivating()
{
- assert manager.getServices().get(MetaDataCache.class).getScopeModel(ConversationScoped.class).isPassivating();
+ assert getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(ConversationScoped.class).isPassivating();
}
/**
@@ -40,7 +40,7 @@
@Test(groups = { "contexts", "passivation" })
public void testIsApplicationScopeNonPassivating()
{
- assert !manager.getServices().get(MetaDataCache.class).getScopeModel(ApplicationScoped.class).isPassivating();
+ assert !getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(ApplicationScoped.class).isPassivating();
}
/**
@@ -50,7 +50,7 @@
@Test(groups = { "contexts", "passivation" })
public void testIsRequestScopeNonPassivating()
{
- assert !manager.getServices().get(MetaDataCache.class).getScopeModel(RequestScoped.class).isPassivating();
+ assert !getCurrentManager().getServices().get(MetaDataCache.class).getScopeModel(RequestScoped.class).isPassivating();
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -4,7 +4,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.webbeans.mock.el.EL;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -7,7 +7,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.webbeans.metadata.StereotypeModel;
import org.jboss.webbeans.resources.ClassTransformer;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.bean.NewEnterpriseBean;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.literal.NewLiteral;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.jboss.webbeans.util.Proxies.TypeInfo;
import org.testng.annotations.Test;
@@ -28,13 +28,13 @@
public void initNewBean() {
- assert manager.resolveByType(WrappedEnterpriseBeanLocal.class).size() == 1;
- assert manager.resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean;
- wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) manager.resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next();
+ assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).size() == 1;
+ assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean;
+ wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next();
- assert manager.resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1;
- assert manager.resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewEnterpriseBean;
- newEnterpriseBean = (NewEnterpriseBean<WrappedEnterpriseBeanLocal>) manager.resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next();
+ assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1;
+ assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewEnterpriseBean;
+ newEnterpriseBean = (NewEnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next();
}
@@ -66,7 +66,7 @@
{
initNewBean();
Class<?> type = TypeInfo.ofTypes(newEnterpriseBean.getTypes()).getSuperClass();
- assert manager.resolveDisposalBeans(type, newEnterpriseBean.getBindings().toArray(new Annotation[0])).isEmpty();
+ assert getCurrentManager().resolveDisposalBeans(type, newEnterpriseBean.getBindings().toArray(new Annotation[0])).isEmpty();
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
import org.jboss.webbeans.resources.ClassTransformer;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -4,7 +4,7 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -9,7 +9,7 @@
import javax.inject.manager.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -19,7 +19,7 @@
@Test(groups="incontainer-broken")
public void testSerializeSessionBeanInterceptor() throws Exception
{
- Bean<?> foobean = manager.getNewEnterpriseBeanMap().get(Foo.class);
+ Bean<?> foobean = getCurrentManager().getNewEnterpriseBeanMap().get(Foo.class);
assert foobean != null;
MockSessionBeanInterceptor interceptor = new MockSessionBeanInterceptor();
interceptor.postConstruct(new MockInvocationContext());
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -4,7 +4,7 @@
import javax.inject.CreationException;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -22,7 +22,7 @@
{
try
{
- manager.getInstanceByType(Lorry_Broken.class);
+ getCurrentManager().getInstanceByType(Lorry_Broken.class);
}
catch (Exception e)
{
@@ -48,7 +48,7 @@
{
try
{
- manager.getInstanceByType(Ship.class, new AnnotationLiteral<Large>() {});
+ getCurrentManager().getInstanceByType(Ship.class, new AnnotationLiteral<Large>() {});
}
catch (Exception e)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -9,7 +9,7 @@
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.literal.NewLiteral;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -22,13 +22,13 @@
public void initNewBean() {
- assert manager.resolveByType(WrappedSimpleBean.class).size() == 1;
- assert manager.resolveByType(WrappedSimpleBean.class).iterator().next() instanceof SimpleBean;
- wrappedSimpleBean = (SimpleBean<WrappedSimpleBean>) manager.resolveByType(WrappedSimpleBean.class).iterator().next();
+ assert getCurrentManager().resolveByType(WrappedSimpleBean.class).size() == 1;
+ assert getCurrentManager().resolveByType(WrappedSimpleBean.class).iterator().next() instanceof SimpleBean;
+ wrappedSimpleBean = (SimpleBean<WrappedSimpleBean>) getCurrentManager().resolveByType(WrappedSimpleBean.class).iterator().next();
- assert manager.resolveByType(WrappedSimpleBean.class, NEW_LITERAL).size() == 1;
- assert manager.resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewSimpleBean;
- newSimpleBean = (NewSimpleBean<WrappedSimpleBean>) manager.resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next();
+ assert getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).size() == 1;
+ assert getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewSimpleBean;
+ newSimpleBean = (NewSimpleBean<WrappedSimpleBean>) getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next();
}
@Test(groups = { "new" })
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -6,7 +6,7 @@
import javax.inject.TypeLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -16,11 +16,11 @@
@Test
public void testParameterizedListInjection()
{
- assert manager.getInstanceByType(new TypeLiteral<List<String>>()
+ assert getCurrentManager().getInstanceByType(new TypeLiteral<List<String>>()
{
}).size() == 2;
- ParameterizedListInjection item = manager.getInstanceByType(ParameterizedListInjection.class);
+ ParameterizedListInjection item = getCurrentManager().getInstanceByType(ParameterizedListInjection.class);
assert item.getFieldInjection().size() == 2;
assert item.getValue().size() == 2;
assert item.getSetterInjection().size() == 2;
@@ -30,11 +30,11 @@
@Test
public void testParameterizedCollectionInjection()
{
- assert manager.getInstanceByType(new TypeLiteral<Collection<String>>()
+ assert getCurrentManager().getInstanceByType(new TypeLiteral<Collection<String>>()
{
}).size() == 2;
- ParameterizedCollectionInjection item = manager.getInstanceByType(ParameterizedCollectionInjection.class);
+ ParameterizedCollectionInjection item = getCurrentManager().getInstanceByType(ParameterizedCollectionInjection.class);
assert item.getFieldInjection().size() == 2;
assert item.getValue().size() == 2;
assert item.getSetterInjection().size() == 2;
@@ -44,9 +44,9 @@
@Test
public void testNoParameterizedCollectionInjection()
{
- assert manager.getInstanceByType(Collection.class).size() == 3;
+ assert getCurrentManager().getInstanceByType(Collection.class).size() == 3;
- NoParameterizedCollectionInjection item = manager.getInstanceByType(NoParameterizedCollectionInjection.class);
+ NoParameterizedCollectionInjection item = getCurrentManager().getInstanceByType(NoParameterizedCollectionInjection.class);
assert item.getFieldInjection().size() == 3;
assert item.getValue().size() == 3;
assert item.getSetterInjection().size() == 3;
@@ -56,9 +56,9 @@
@Test
public void testIntegerCollectionInjection()
{
- assert manager.getInstanceByType(new TypeLiteral<Collection<Integer>>(){}).size() == 4;
+ assert getCurrentManager().getInstanceByType(new TypeLiteral<Collection<Integer>>(){}).size() == 4;
- IntegerCollectionInjection item = manager.getInstanceByType(IntegerCollectionInjection.class);
+ IntegerCollectionInjection item = getCurrentManager().getInstanceByType(IntegerCollectionInjection.class);
assert item.getFieldInjection().size() == 4;
assert item.getValue().size() == 4;
assert item.getSetterInjection().size() == 4;
@@ -68,14 +68,14 @@
@Test
public void testInstanceList()
{
- ListInstance listInstance = manager.getInstanceByType(ListInstance.class);
+ ListInstance listInstance = getCurrentManager().getInstanceByType(ListInstance.class);
assert listInstance.get().size() == 3;
}
@Test
public void testTypeParameterInstance()
{
- ListStringInstance listInstance = manager.getInstanceByType(ListStringInstance.class);
+ ListStringInstance listInstance = getCurrentManager().getInstanceByType(ListStringInstance.class);
assert listInstance.get().size() == 2;
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,7 +1,7 @@
package org.jboss.webbeans.test.unit.implementation.producer.method;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -11,7 +11,7 @@
public void testInjectManagerProducer()
{
ManagerProducer.setInjectionPointInjected(false);
- manager.getInstanceByType(IntInjection.class);
+ getCurrentManager().getInstanceByType(IntInjection.class);
assert ManagerProducer.isInjectionPointInjected();
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,7 +1,7 @@
package org.jboss.webbeans.test.unit.implementation.producer.method;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -10,9 +10,9 @@
@Test
public void testNamedProducer()
{
- String[] iemon = (String[]) manager.getInstanceByName("iemon");
+ String[] iemon = (String[]) getCurrentManager().getInstanceByName("iemon");
assert iemon.length == 3;
- String[] itoen = (String[]) manager.getInstanceByName("itoen");
+ String[] itoen = (String[]) getCurrentManager().getInstanceByName("itoen");
assert itoen.length == 2;
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/ProxyTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/ProxyTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/ProxyTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,7 +1,7 @@
package org.jboss.webbeans.test.unit.implementation.proxy;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -11,7 +11,7 @@
@Test(description="WBRI-122")
public void testImplementationClassImplementsSerializable()
{
- manager.getInstanceByName("foo");
+ getCurrentManager().getInstanceByName("foo");
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -5,7 +5,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -25,7 +25,7 @@
@Override
protected void execute() throws Exception
{
- Object mouse = manager.getInstanceByType(MouseLocal.class);
+ Object mouse = getCurrentManager().getInstanceByType(MouseLocal.class);
assert mouse instanceof ProxyObject;
assert mouse instanceof MouseLocal;
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -7,7 +7,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.webbeans.literal.ObtainsLiteral;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -18,7 +18,7 @@
@Test
public void testLookupInstance() throws Exception
{
- assert manager.getInstanceByType(new TypeLiteral<Instance<List<?>>>(){}, new ObtainsLiteral()) == null;
+ assert getCurrentManager().getInstanceByType(new TypeLiteral<Instance<List<?>>>(){}, new ObtainsLiteral()) == null;
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,7 +1,7 @@
package org.jboss.webbeans.test.unit.lookup.circular;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -13,7 +13,7 @@
public void testCircularInjectionOnTwoNormalBeans() throws Exception
{
//deployBeans(Pig.class, Food.class);
- manager.getInstanceByType(Pig.class).getName();
+ getCurrentManager().getInstanceByType(Pig.class).getName();
assert Pig.success;
assert Food.success;
}
@@ -28,7 +28,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Car.class).getName();
+ getCurrentManager().getInstanceByType(Car.class).getName();
assert Petrol.success;
assert Car.success;
}
@@ -47,7 +47,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Petrol.class).getName();
+ getCurrentManager().getInstanceByType(Petrol.class).getName();
assert Petrol.success;
assert Car.success;
}
@@ -67,7 +67,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Foo.class).getName();
+ getCurrentManager().getInstanceByType(Foo.class).getName();
assert Foo.success;
assert Bar.success;
}
@@ -85,7 +85,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(DependentSelfConsumingDependentProducer.class).ping();
+ getCurrentManager().getInstanceByType(DependentSelfConsumingDependentProducer.class).ping();
}
}.run();
@@ -101,7 +101,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(NormalSelfConsumingNormalProducer.class).ping();
+ getCurrentManager().getInstanceByType(NormalSelfConsumingNormalProducer.class).ping();
}
}.run();
@@ -117,7 +117,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(DependentSelfConsumingNormalProducer.class).ping();
+ getCurrentManager().getInstanceByType(DependentSelfConsumingNormalProducer.class).ping();
}
}.run();
@@ -133,7 +133,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(NormalSelfConsumingDependentProducer.class).ping();
+ getCurrentManager().getInstanceByType(NormalSelfConsumingDependentProducer.class).ping();
}
}.run();
@@ -149,7 +149,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Violation.class).ping();
+ getCurrentManager().getInstanceByType(Violation.class).ping();
}
}.run();
@@ -165,7 +165,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Violation.class).ping();
+ getCurrentManager().getInstanceByType(Violation.class).ping();
}
}.run();
@@ -181,7 +181,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Fish.class);
+ getCurrentManager().getInstanceByType(Fish.class);
}
}.run();
@@ -197,7 +197,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Bird.class);
+ getCurrentManager().getInstanceByType(Bird.class);
}
}.run();
@@ -213,7 +213,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Planet.class);
+ getCurrentManager().getInstanceByType(Planet.class);
}
}.run();
@@ -229,7 +229,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(Farm.class);
+ getCurrentManager().getInstanceByType(Farm.class);
}
}.run();
@@ -245,7 +245,7 @@
@Override
protected void execute() throws Exception
{
- manager.getInstanceByType(House.class);
+ getCurrentManager().getInstanceByType(House.class);
}
}.run();
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -17,7 +17,7 @@
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.literal.CurrentLiteral;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
@@ -113,18 +113,18 @@
@Test
public void testRootManagerSerializability() throws Exception
{
- Integer rootManagerId = manager.getId();
- ManagerImpl deserializedRootManager = (ManagerImpl) deserialize(serialize(manager));
+ Integer rootManagerId = getCurrentManager().getId();
+ ManagerImpl deserializedRootManager = (ManagerImpl) deserialize(serialize(getCurrentManager()));
assert deserializedRootManager.getId().equals(rootManagerId);
- assert manager.resolveByType(Foo.class).size() == 1;
+ assert getCurrentManager().resolveByType(Foo.class).size() == 1;
assert deserializedRootManager.resolveByType(Foo.class).size() == 1;
- assert manager.resolveByType(Foo.class).iterator().next().equals(deserializedRootManager.resolveByType(Foo.class).iterator().next());
+ assert getCurrentManager().resolveByType(Foo.class).iterator().next().equals(deserializedRootManager.resolveByType(Foo.class).iterator().next());
}
@Test
public void testChildManagerSerializability() throws Exception
{
- ManagerImpl childManager = manager.createActivity();
+ ManagerImpl childManager = getCurrentManager().createActivity();
Bean<?> dummyBean = new DummyBean(childManager);
childManager.addBean(dummyBean);
Integer childManagerId = childManager.getId();
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -14,7 +14,7 @@
import org.jboss.webbeans.mock.MockResourceLoader;
import org.jboss.webbeans.mock.MockXmlEnvironment;
import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.jboss.webbeans.xml.XmlEnvironment;
import org.jboss.webbeans.xml.XmlParser;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-06 14:36:06 UTC (rev 2318)
@@ -25,7 +25,7 @@
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.mock.MockXmlEnvironment;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.jboss.webbeans.test.unit.xml.beans.Order;
import org.jboss.webbeans.test.unit.xml.beans.TestBean;
import org.jboss.webbeans.test.unit.xml.beans.TestDeploymentType;
Modified: ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties 2009-04-06 14:18:16 UTC (rev 2317)
+++ ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties 2009-04-06 14:36:06 UTC (rev 2318)
@@ -1,3 +1 @@
-org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.unit.StandaloneContainersImpl
-org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
-org.jboss.testharness.testPackage=org.jboss.webbeans.test
\ No newline at end of file
+org.jboss.testharness.testPackage=org.jboss.webbeans.test
More information about the weld-commits
mailing list