Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B143996C for ; Sun, 1 Apr 2012 16:17:51 +0000 (UTC) Received: (qmail 26869 invoked by uid 500); 1 Apr 2012 16:17:51 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 26847 invoked by uid 500); 1 Apr 2012 16:17:51 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 26839 invoked by uid 99); 1 Apr 2012 16:17:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 16:17:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 16:17:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0D0BC238899C for ; Sun, 1 Apr 2012 16:17:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1308146 - /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeProducerMethodTest.java Date: Sun, 01 Apr 2012 16:17:27 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120401161728.0D0BC238899C@eris.apache.org> 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 beanXmls = new ArrayList(); + beanXmls.add(getXmlPath(PACKAGE_NAME, "AlternativeOnClassAndProducerMethod")); Collection> beanClasses = new ArrayList>(); - 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(); }