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/01/17 22:28:15 UTC
svn commit: r735337 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test:
mock/MockManager.java unittests/dependent/DependentComponentTest.java
unittests/xml/XMLTest.java unittests/xml/definition/XMLDefinitionTest.java
Author: gerdogdu
Date: Sat Jan 17 13:28:14 2009
New Revision: 735337
URL: http://svn.apache.org/viewvc?rev=735337&view=rev
Log:
Updating old tests for adapting latest spec.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=735337&r1=735336&r2=735337&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Sat Jan 17 13:28:14 2009
@@ -18,10 +18,12 @@
import java.util.List;
import java.util.Set;
+import javax.webbeans.InjectionPoint;
import javax.webbeans.Observer;
import javax.webbeans.TypeLiteral;
import javax.webbeans.manager.Bean;
import javax.webbeans.manager.Context;
+import javax.webbeans.manager.CreationalContext;
import javax.webbeans.manager.Decorator;
import javax.webbeans.manager.InterceptionType;
import javax.webbeans.manager.Interceptor;
@@ -114,6 +116,16 @@
return manager.getContext(scopeType);
}
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> context)
+ {
+ return manager.getInstanceToInject(injectionPoint, context);
+ }
+
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint)
+ {
+ return manager.getInstanceToInject(injectionPoint);
+ }
+
public <T> T getInstance(Bean<T> bean)
{
return manager.getInstance(bean);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java?rev=735337&r1=735336&r2=735337&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java Sat Jan 17 13:28:14 2009
@@ -85,7 +85,7 @@
AbstractComponent<DependentA> componentA = defineSimpleWebBean(DependentA.class);
AbstractComponent<DependentB> componentB = defineSimpleWebBean(DependentB.class);
- DependentA dependentA = componentA.create();
+ DependentA dependentA = componentA.create(null);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java?rev=735337&r1=735336&r2=735337&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java Sat Jan 17 13:28:14 2009
@@ -68,7 +68,6 @@
}
catch (Throwable e1)
{
- e1.printStackTrace();
e = e1;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java?rev=735337&r1=735336&r2=735337&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java Sat Jan 17 13:28:14 2009
@@ -51,7 +51,7 @@
Assert.assertEquals("definition1", compDef.getName());
- Object instance = compDef.create();
+ Object instance = compDef.create(null);
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof Definition1);
@@ -64,7 +64,7 @@
XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition2.xml");
- Object instance = compDef.create();
+ Object instance = compDef.create(null);
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof Definition2);
@@ -84,7 +84,7 @@
Assert.assertEquals("asyncCreditCardPaymentProcessor", compDef.getName());
- Object instance = compDef.create();
+ Object instance = compDef.create(null);
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof MockAsynchronousCreditCardPaymentProcessor);
@@ -108,7 +108,7 @@
// an unnamed bean must not have a name
Assert.assertNull(compDef.getName());
- Object instance = compDef.create();
+ Object instance = compDef.create(null);
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof TstBeanUnnamed);
}
@@ -120,7 +120,7 @@
AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor1.xml", TstBeanConstructor.class);
- Object instance = compDef.create();
+ Object instance = compDef.create(null);
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof TstBeanConstructor);
@@ -138,7 +138,7 @@
AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml", TstBeanConstructor.class);
- Object instance = compDef.create();
+ Object instance = compDef.create(null);
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof TstBeanConstructor);