svn commit: r1308084 - in /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives: common/ tests/

[st...@apache.org]

Author: struberg
Date: Sun Apr  1 11:33:43 2012
New Revision: 1308084

URL: http://svn.apache.org/viewvc?rev=1308084&view=rev
Log:
OWB-658 remove useless classes

Why did we ever introduce those 1:1 copied test classes?
I also cannot see anything useful for the original issue OWB-273

Removed:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer3.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer4.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative3Test.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative4Test.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative5Test.java
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/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=1308084&r1=1308083&r2=1308084&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 11:33:43 2012
@@ -22,13 +22,16 @@ import javax.enterprise.inject.Alternati
 import javax.enterprise.inject.Produces;
 
 
+/**
+ * This one has the @Alternative on the class and NOT on the producer method
+ */
 @Alternative
 public class AlternativeBeanProducer1
 {
 
-    public @Produces
+    @Produces
     @QualifierProducerBased
-    IProducedBean generateBean1()
+    public 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=1308084&r1=1308083&r2=1308084&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 11:33:43 2012
@@ -21,14 +21,18 @@ package org.apache.webbeans.newtests.con
 import javax.enterprise.inject.Alternative;
 import javax.enterprise.inject.Produces;
 
+/**
+ * This one has the @Alternative on the class
+ * AND also an @Alternative on the producer method
+ */
 @Alternative
 public class AlternativeBeanProducer2
 {
 
-    public @Produces
+    @Produces
     @Alternative
     @QualifierProducerBased
-    IProducedBean generateBean2()
+    public IProducedBean generateBean2()
     {
         return new ProducedBean("alternative2", this);
     }

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=1308084&r1=1308083&r2=1308084&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 11:33:43 2012
@@ -21,10 +21,7 @@ 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;