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/08/30 16:53:42 UTC
svn commit: r809349 [2/2] - in
/incubator/openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/annotation/
main/java/org/apache/webbeans/config/
main/java/org/apache/webbeans/container/
main/resources/META-INF/openwebbeans/ test/java/org...
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Sun Aug 30 14:53:37 2009
@@ -57,11 +57,11 @@
card.placeOrder();
- Assert.assertTrue(ShoppingCard.CALLED);
+ Assert.assertTrue(ShoppingCard.getCALLED());
card.placeOrder2();
- Assert.assertFalse(ShoppingCard.CALLED);
+ Assert.assertFalse(ShoppingCard.getCALLED());
ContextFactory.destroySessionContext(new MockHttpSession());
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java Sun Aug 30 14:53:37 2009
@@ -20,7 +20,7 @@
import java.util.Set;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AnnotatedConstructor;
@@ -67,7 +67,7 @@
}
Assert.assertTrue(clazzesAnnots.contains(Named.class));
- Assert.assertTrue(clazzesAnnots.contains(Current.class));
+ Assert.assertTrue(clazzesAnnots.contains(Default.class));
Assert.assertTrue(clazzesAnnots.contains(Binding1.class));
Assert.assertTrue(clazzesAnnots.contains(Binding2.class));
Assert.assertTrue(clazzesAnnots.contains(Interceptor.class));
@@ -87,12 +87,12 @@
{
if(field.getJavaMember().getName().equals("payment"))
{
- Assert.assertTrue(field.isAnnotationPresent(Current.class));
+ Assert.assertTrue(field.isAnnotationPresent(Default.class));
Assert.assertEquals(IPayment.class, field.getBaseType());
}
else if(field.getJavaMember().getName().equals("book"))
{
- Assert.assertTrue(field.isAnnotationPresent(Current.class));
+ Assert.assertTrue(field.isAnnotationPresent(Default.class));
Assert.assertTrue(field.isAnnotationPresent(Binding2.class));
Assert.assertEquals(Book.class, field.getBaseType());
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java Sun Aug 30 14:53:37 2009
@@ -17,7 +17,7 @@
import java.util.List;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
@@ -69,7 +69,7 @@
Assert.assertNotNull(tc.getEraseComponent());
- Assert.assertEquals("GURKAN", TypeLiteralComponent.STR);
+ Assert.assertEquals("GURKAN", TypeLiteralComponent.getSTR());
ContextFactory.destroyRequestContext(null);
}
@@ -91,7 +91,7 @@
};
Annotation[] anns = new Annotation[1];
- anns[0] = new AnnotationLiteral<Current>()
+ anns[0] = new AnnotationLiteral<Default>()
{
};
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/definition1.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/definition1.xml?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/definition1.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/definition1.xml Sun Aug 30 14:53:37 2009
@@ -24,7 +24,7 @@
<myapp:Definition1>
<RequestScoped/>
- <Current/>
+ <Default/>
<Production/>
</myapp:Definition1>
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml Sun Aug 30 14:53:37 2009
@@ -24,7 +24,7 @@
<myapp:TstBeanUnnamed>
<RequestScoped/>
- <Current/>
+ <Default/>
<Production/>
</myapp:TstBeanUnnamed>