[webbeans-commits] Webbeans SVN: r1573 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/lookup/byname and 6 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Feb 18 11:52:33 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-18 11:52:33 -0500 (Wed, 18 Feb 2009)
New Revision: 1573
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
Log:
Switch tests to use beans.xml
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -3,15 +3,14 @@
import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches;
import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
import javax.context.RequestScoped;
import javax.inject.AnnotationLiteral;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -20,6 +19,7 @@
*
*/
@Artifact
+ at BeansXml("beans.xml")
public class RealizationTest extends AbstractDeclarativeTest
{
@@ -30,16 +30,6 @@
{
};
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
- deploymentTypes.addAll(getStandardDeploymentTypes());
- deploymentTypes.add(AnotherDeploymentType.class);
- deploymentTypes.add(FarmAnimalDeploymentType.class);
- return deploymentTypes;
- }
-
@Test
@SpecAssertion(section = "4.4", id = "unknown")
public void testRealizedBeanWithProducerMethodHasSameScope()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,11 +1,9 @@
package org.jboss.jsr299.tck.unit.lookup.byname;
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -14,17 +12,10 @@
*
*/
@Artifact
+ at BeansXml("beans.xml")
public class ResolutionByNameTest extends AbstractDeclarativeTest
{
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes();
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
-
/**
* The getInstanceByName() method must:
*
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-interface Animal
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,24 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.BindingType;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at BindingType
- at interface Chunky
-{
-
- boolean realChunky();
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -4,10 +4,8 @@
import javax.inject.Production;
@Production
- at Whitefish
- at Chunky(realChunky=true)
@Named("whitefish")
-class Cod implements ScottishFish
+class Cod
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -33,7 +33,7 @@
public class DuplicateNameResolutionTest extends AbstractDeclarativeTest
{
/**
- * � Otherwise, if resolveByName() returned more than one Web Bean, throw an
+ * Otherwise, if resolveByName() returned more than one Web Bean, throw an
* AmbiguousDependencyException.
*
* @throws Exception
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-
-interface ScottishFish extends Animal
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -4,9 +4,8 @@
import javax.inject.Production;
@Production
- at Whitefish
@Named("whitefish")
-class Sole implements ScottishFish
+class Sole
{
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.BindingType;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at BindingType
- at interface Whitefish
-{
-
-}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml 2009-02-18 16:52:33 UTC (rev 1573)
@@ -0,0 +1,9 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.realization">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ <test:FarmAnimalDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml 2009-02-18 16:52:33 UTC (rev 1573)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.byname">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the weld-commits
mailing list