You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/03/07 02:00:50 UTC
svn commit: r751156 - in
/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck:
ManagersImpl.java StandaloneContainersImpl.java mock/TCKManager.java
Author: gerdogdu
Date: Sat Mar 7 01:00:49 2009
New Revision: 751156
URL: http://svn.apache.org/viewvc?rev=751156&view=rev
Log:
Updating for TCK tests.
Modified:
incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java
incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/mock/TCKManager.java
Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java?rev=751156&r1=751155&r2=751156&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java Sat Mar 7 01:00:49 2009
@@ -30,6 +30,7 @@
public List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
+
return DeploymentTypeManager.getInstance().getEnabledDeploymentTypes();
}
Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=751156&r1=751155&r2=751156&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java Sat Mar 7 01:00:49 2009
@@ -18,6 +18,7 @@
import javax.inject.Production;
+import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.deployment.DeploymentTypeManager;
import org.apache.webbeans.lifecycle.WebBeansLifeCycle;
import org.apache.webbeans.spi.ServiceLoader;
@@ -42,31 +43,47 @@
public void deploy(Iterable<Class<?>> classes) throws DeploymentException
{
- Iterator<Class<?>> it = classes.iterator();
- while(it.hasNext())
+ try
{
- discovery.addBeanClass(it.next());
+ Iterator<Class<?>> it = classes.iterator();
+ while(it.hasNext())
+ {
+ discovery.addBeanClass(it.next());
+ }
+
+ this.lifeCycle.applicationStarted(servletContextEvent);
+
+ }catch(Exception e)
+ {
+ throw new DeploymentException(e);
}
- this.lifeCycle.applicationStarted(servletContextEvent);
}
public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXmls) throws DeploymentException
{
- Iterator<Class<?>> it = classes.iterator();
- while(it.hasNext())
+ try
{
- discovery.addBeanClass(it.next());
+ Iterator<Class<?>> it = classes.iterator();
+ while(it.hasNext())
+ {
+ discovery.addBeanClass(it.next());
+ }
+
+ Iterator<URL> itUrl = beansXmls.iterator();
+ while(itUrl.hasNext())
+ {
+ discovery.addBeanXml(itUrl.next());
+ }
+
+ this.lifeCycle.applicationStarted(servletContextEvent);
}
-
- Iterator<URL> itUrl = beansXmls.iterator();
- while(itUrl.hasNext())
+ catch(Exception e)
{
- discovery.addBeanXml(itUrl.next());
+ throw new DeploymentException(e);
}
- this.lifeCycle.applicationStarted(servletContextEvent);
}
@@ -75,12 +92,15 @@
this.discovery = (TCKMetaDataDiscoveryImpl)ServiceLoader.getService(MetaDataDiscoveryService.class);
this.lifeCycle = new WebBeansLifeCycle();
this.servletContextEvent = new MockServletContextEvent();
- DeploymentTypeManager.getInstance().addNewDeploymentType(Production.class, 1);
+ //Could we put this!!!!!
+ //DeploymentTypeManager.getInstance().addNewDeploymentType(Production.class, 1);
+
}
public void undeploy()
{
TCKManager.getInstance().clear();
+ WebBeansFinder.clearInstances();
}
}
Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/mock/TCKManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/mock/TCKManager.java?rev=751156&r1=751155&r2=751156&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/mock/TCKManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/mock/TCKManager.java Sat Mar 7 01:00:49 2009
@@ -18,6 +18,7 @@
import java.io.InputStream;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
import java.util.List;
import java.util.Set;
@@ -121,13 +122,13 @@
return this.manager.getInstanceByType(type, bindingTypes);
}
- public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<T> context)
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> context)
{
return this.manager.getInstanceToInject(injectionPoint, context);
}
- public Object getInstanceToInject(InjectionPoint injectionPoint)
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint)
{
return this.manager.getInstanceToInject(injectionPoint);
@@ -169,7 +170,7 @@
return this.manager.resolveByType(apiType, bindingTypes);
}
- public List<Decorator> resolveDecorators(Set<Class<?>> types, Annotation... bindingTypes)
+ public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindingTypes)
{
return this.manager.resolveDecorators(types, bindingTypes);
@@ -196,4 +197,16 @@
{
this.manager.setXMLConfigurator(xmlConfigurator);
}
+
+ public Manager createActivity()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Manager setCurrent(Class<? extends Annotation> scopeType)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}