Author: struberg
Date: Sun Apr 1 10:51:56 2012
New Revision: 1308071
URL: http://svn.apache.org/viewvc?rev=1308071&view=rev
Log:
OWB-658 cleanup Alternative tests
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer1.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer2.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/DefaultBeanProducer.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/IProducedBean.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/ProducedBean.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer1.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer1.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer1.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer1.java
Sun Apr 1 10:51:56 2012
@@ -21,12 +21,15 @@ package org.apache.webbeans.newtests.con
import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Produces;
+
@Alternative
-public class AlternativeBeanProducer1 {
+public class AlternativeBeanProducer1
+{
- public @Produces
- @QualifierProducerBased
- IProducedBean generateBean1() {
- return new ProducedBean("alternative1", this);
- }
+ public @Produces
+ @QualifierProducerBased
+ IProducedBean generateBean1()
+ {
+ return new ProducedBean("alternative1", this);
+ }
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer2.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer2.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer2.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer2.java
Sun Apr 1 10:51:56 2012
@@ -22,18 +22,15 @@ import javax.enterprise.inject.Alternati
import javax.enterprise.inject.Produces;
@Alternative
-public class AlternativeBeanProducer2 {
-
- public @Produces
- @Alternative
- @QualifierProducerBased
- IProducedBean generateBean2() {
- return new ProducedBean("alternative2", this);
- }
-/*
- public void dumpBean2(@Disposes @QualifierProducerBased IProducedBean
bean) {
- System.out.println(bean + " is dumped in
dumpBean2().");
- }
-*/
+public class AlternativeBeanProducer2
+{
+
+ public @Produces
+ @Alternative
+ @QualifierProducerBased
+ IProducedBean generateBean2()
+ {
+ return new ProducedBean("alternative2", this);
+ }
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/DefaultBeanProducer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/DefaultBeanProducer.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/DefaultBeanProducer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/DefaultBeanProducer.java
Sun Apr 1 10:51:56 2012
@@ -22,16 +22,18 @@ import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
-public class DefaultBeanProducer {
-
- public @Produces @QualifierProducerBased IProducedBean
- generateBean() {
- return new ProducedBean("default", this);
- }
-
- public void dumpBean(
- @Disposes @QualifierProducerBased IProducedBean
bean) {
- System.out.println(bean + " is dumped in dumpBean().");
- }
+public class DefaultBeanProducer
+{
+ public static boolean gotDumped = false;
+ @Produces @QualifierProducerBased
+ public IProducedBean generateBean()
+ {
+ return new ProducedBean("default", this);
+ }
+
+ public void dumpBean(@Disposes @QualifierProducerBased IProducedBean bean)
+ {
+ gotDumped = true;
+ }
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/IProducedBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/IProducedBean.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/IProducedBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/IProducedBean.java
Sun Apr 1 10:51:56 2012
@@ -19,10 +19,13 @@
package org.apache.webbeans.newtests.concepts.alternatives.common;
-public interface IProducedBean {
-
- public String getID();
+public interface IProducedBean
+{
+
+ public String getID();
+
+ public String getProducerID();
+
+ public String getProducerType();
- public String getProducerID();
-
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/ProducedBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/ProducedBean.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/ProducedBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/ProducedBean.java
Sun Apr 1 10:51:56 2012
@@ -18,23 +18,29 @@
*/
package org.apache.webbeans.newtests.concepts.alternatives.common;
-public class ProducedBean implements IProducedBean {
-
- String str;
-
- Object producer;
-
- public ProducedBean(String s, Object producer) {
- str = s;
- this.producer = producer;
- }
-
- public String getID() {
-
- return str + "," + getProducerID() + "," + this;
- }
-
- public String getProducerID() {
- return producer.toString();
- }
+public class ProducedBean implements IProducedBean
+{
+ String str;
+ Object producer;
+
+ public ProducedBean(String s, Object producer)
+ {
+ str = s;
+ this.producer = producer;
+ }
+
+ public String getID()
+ {
+ return str + "," + getProducerID() + "," + this;
+ }
+
+ public String getProducerID()
+ {
+ return producer.toString();
+ }
+
+ public String getProducerType()
+ {
+ return str;
+ }
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java
Sun Apr 1 10:51:56 2012
@@ -21,10 +21,6 @@ package org.apache.webbeans.newtests.con
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.util.AnnotationLiteral;
import junit.framework.Assert;
@@ -44,6 +40,8 @@ public class Alternative1Test extends A
{
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DefaultBeanProducer.class);
+
+ // available but not enabled in beans.xml
beanClasses.add(AlternativeBeanProducer1.class);
startContainer(beanClasses, null);
@@ -53,17 +51,11 @@ public class Alternative1Test extends A
{
};
- Set beans = getBeanManager().getBeans(IProducedBean.class, anns);
- System.out.print("Size of the bean set is " + beans.size());
- Bean<IProducedBean> bean =
(Bean<IProducedBean>)beans.iterator().next();
- CreationalContext<IProducedBean> cc =
getBeanManager().createCreationalContext(bean);
- IProducedBean model = (IProducedBean)
getBeanManager().getReference(bean, IProducedBean.class, cc);
- System.out.println(model.getID());
-
+ IProducedBean model = getInstance(IProducedBean.class, anns);
+ Assert.assertNotNull(model);
+ Assert.assertEquals("default", model.getProducerType());
+
shutDownContainer();
- Assert.assertTrue(Boolean.TRUE);
-
-
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java?rev=1308071&r1=1308070&r2=1308071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java
Sun Apr 1 10:51:56 2012
@@ -56,12 +56,10 @@ public class Alternative2Test extends A
};
Set beans = getBeanManager().getBeans(IProducedBean.class, anns);
- System.out.println("Size of the bean set is " + beans.size());
Bean<IProducedBean> bean =
(Bean<IProducedBean>)beans.iterator().next();
CreationalContext<IProducedBean> cc =
getBeanManager().createCreationalContext(bean);
IProducedBean producedBean = (IProducedBean)
getBeanManager().getReference(bean, IProducedBean.class, cc);
- System.out.println(producedBean.getID());
-
+
shutDownContainer();
Assert.assertTrue(Boolean.TRUE);
