You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/04/01 18:17:27 UTC
svn commit: r1308146 -
/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java
Author: struberg
Date: Sun Apr 1 16:17:27 2012
New Revision: 1308146
URL: http://svn.apache.org/viewvc?rev=1308146&view=rev
Log:
OWB-658 this test only makes sense if the Alternative is enabled in beans.xml!
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java?rev=1308146&r1=1308145&r2=1308146&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java Sun Apr 1 16:17:27 2012
@@ -29,6 +29,7 @@ import org.apache.webbeans.newtests.Abst
import org.apache.webbeans.newtests.concepts.alternatives.common.AlternativeOnClassAndProducerMethodBean;
import org.apache.webbeans.newtests.concepts.alternatives.common.AlternativeOnClassOnlyBean;
import org.apache.webbeans.newtests.concepts.alternatives.common.DefaultBeanProducer;
+import org.apache.webbeans.newtests.concepts.alternatives.common.DefaultBeanProducerWithoutDisposes;
import org.apache.webbeans.newtests.concepts.alternatives.common.IProducedBean;
import org.apache.webbeans.newtests.concepts.alternatives.common.QualifierProducerBased;
import org.junit.Test;
@@ -92,9 +93,11 @@ public class AlternativeProducerMethodTe
public void testAlternativeOnClassAndProducerMethodBean()
{
Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "AlternativeOnClassAndProducerMethod"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
- beanClasses.add(DefaultBeanProducer.class);
+ beanClasses.add(IProducedBean.class);
+ beanClasses.add(DefaultBeanProducerWithoutDisposes.class);
// available but not enabled in beans.xml
beanClasses.add(AlternativeOnClassAndProducerMethodBean.class);
@@ -108,7 +111,7 @@ public class AlternativeProducerMethodTe
IProducedBean producedBean = getInstance(IProducedBean.class, anns);
Assert.assertNotNull(producedBean);
- Assert.assertEquals("default", producedBean.getProducerType());
+ Assert.assertEquals("AlternativeOnClassAndProducerMethodBean", producedBean.getProducerType());
shutDownContainer();
}