[webbeans-commits] Webbeans SVN: r2681 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: activities/child and 5 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon May 11 15:28:07 EDT 2009
Author: dallen6
Date: 2009-05-11 15:28:07 -0400 (Mon, 11 May 2009)
New Revision: 2681
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/BeanWithInjection.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/MyBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/bean/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java
Log:
Additional tests and assertion assignments
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/BeanWithInjection.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/BeanWithInjection.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/BeanWithInjection.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.activities.child;
+
+class BeanWithInjection
+{
+ @SpecialBindingType
+ protected MyBean myBean;
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/BeanWithInjection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/MyBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/MyBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/MyBean.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.activities.child;
+
+ at SpecialBindingType
+class MyBean
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/MyBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -0,0 +1,123 @@
+package org.jboss.jsr299.tck.tests.activities.child;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.context.CreationalContext;
+import javax.context.Dependent;
+import javax.inject.AnnotationLiteral;
+import javax.inject.DeploymentException;
+import javax.inject.Production;
+import javax.inject.manager.Bean;
+import javax.inject.manager.InjectionPoint;
+import javax.inject.manager.Manager;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.CurrentLiteral;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class SameBeanTypeInChildActivityTest extends AbstractJSR299Test
+{
+ private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+
+ static
+ {
+ DEFAULT_BINDINGS.add(new CurrentLiteral());
+ }
+
+ private Bean<?> createDummyBean(Manager manager)
+ {
+ final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
+ final Set<Type> types = new HashSet<Type>();
+ final Set<Annotation> bindings = new HashSet<Annotation>();
+ bindings.add(new AnnotationLiteral<SpecialBindingType>() {});
+ types.add(Object.class);
+ final Bean<?> bean = new Bean<MyBean>(manager)
+ {
+
+ @Override
+ public Set<Annotation> getBindings()
+ {
+ return bindings;
+ }
+
+ @Override
+ public Class<? extends Annotation> getDeploymentType()
+ {
+ return Production.class;
+ }
+
+ @Override
+ public Set<? extends InjectionPoint> getInjectionPoints()
+ {
+ return injectionPoints;
+ }
+
+ @Override
+ public String getName()
+ {
+ return null;
+ }
+
+ @Override
+ public Class<? extends Annotation> getScopeType()
+ {
+ return Dependent.class;
+ }
+
+ @Override
+ public Set<Type> getTypes()
+ {
+ return types;
+ }
+
+ @Override
+ public boolean isNullable()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isSerializable()
+ {
+ return false;
+ }
+
+ public MyBean create(CreationalContext<MyBean> creationalContext)
+ {
+ return null;
+ }
+
+ public void destroy(MyBean instance)
+ {
+
+ }
+
+ };
+ return bean;
+ }
+
+ @Test(groups = { "ri-broken" }, expectedExceptions = { DeploymentException.class })
+ @SpecAssertion(section="11.6", id="t")
+ public void testSameBeanTypeInChildAsParentInjection()
+ {
+ Manager childActivity = getCurrentManager().createActivity();
+ Bean<?> anotherMyBean = createDummyBean(childActivity);
+ childActivity.addBean(anotherMyBean);
+ }
+
+ @Test(groups = { "ri-broken" }, expectedExceptions = { DeploymentException.class })
+ @SpecAssertion(section="11.6", id="u")
+ public void testSameBeanTypeInChildAsIndirectParentInjection()
+ {
+ Manager childActivity = getCurrentManager().createActivity();
+ Manager grandChildActivity = childActivity.createActivity();
+ Bean<?> anotherMyBean = createDummyBean(grandChildActivity);
+ grandChildActivity.addBean(anotherMyBean);
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.activities.child;
+
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+ at Retention(RUNTIME)
+ at Target({TYPE, METHOD, FIELD, PARAMETER})
+ at BindingType
+ at interface SpecialBindingType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-05-11 19:16:40 UTC (rev 2680)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -65,13 +65,13 @@
assert interceptor instanceof AnotherTestInterceptor : "Incorrect return type";
}
- @Test(groups = { "ri-broken", "xml" })
+ @Test(groups = { "xml" })
@SpecAssertions({
@SpecAssertion(section="9.4", id="e")
})
public void testBindingAnnotationOverridenByXML()
{
- assert getCurrentManager().getInstanceByType(BeanWithBindingAnnotation.class, new AnnotationLiteral<TestBindingType>(){}) != null;
+ assert getCurrentManager().getInstanceByType(BeanWithBindingAnnotation.class, new AnnotationLiteral<AnotherTestBindingType>(){}) != null;
}
@Test(groups = { "ri-broken", "xml" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-05-11 19:16:40 UTC (rev 2680)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -23,14 +23,15 @@
@Test
@SpecAssertions({
@SpecAssertion(section="9.12", id="a"),
- @SpecAssertion(section="9.12.1", id="a")
+ @SpecAssertion(section="9.12.1", id="a"),
+ @SpecAssertion(section="11.2", id = "a")
})
public void testDeploymentDeclaration()
{
Manager manager = getCurrentManager();
Set<Bean<Order>> beans = manager.resolveByType(Order.class);
- assert beans.size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
- assert beans.iterator().next().getDeploymentType().equals(TestDeploymentType.class) : "Deployment type of bean '" + Order.class + "' is not '" + TestDeploymentType.class + "'";
+ assert !beans.isEmpty() : "There are no registered beans of type '" + Order.class + "'";
+ assert beans.iterator().next().getDeploymentType().equals(TestDeploymentType.class) : "Deployment type of bean '" + Order.class.getName() + "' is not '" + TestDeploymentType.class.getName() + "'";
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-05-11 19:16:40 UTC (rev 2680)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -14,7 +14,7 @@
@Artifact
@Resources({
- @Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
+ @Resource(source="foo/schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
})
@Classes({
Order.class,
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java 2009-05-11 19:16:40 UTC (rev 2680)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java 2009-05-11 19:28:07 UTC (rev 2681)
@@ -51,7 +51,9 @@
@SpecAssertion(section = "6.9", id = "i"),
@SpecAssertion(section = "3.6", id = "d"),
@SpecAssertion(section = "3.6.1", id = "d"),
- @SpecAssertion(section = "3.6.1", id = "i")
+ @SpecAssertion(section = "3.6.1", id = "i"),
+ @SpecAssertion(section = "11.2", id = "e"),
+ @SpecAssertion(section = "11.2", id = "g")
})
public void testXMLDeclarationOfEjb()
{
More information about the weld-commits
mailing list