[webbeans-commits] Webbeans SVN: r3380 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/extensions/beanManager and 4 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Jul 31 05:19:47 EDT 2009
Author: dallen6
Date: 2009-07-31 05:19:46 -0400 (Fri, 31 Jul 2009)
New Revision: 3380
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/SimpleBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/HierarchyDiscovery.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ParameterizedTypeImpl.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Added more tests for Ch. 11
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.PassivationCapable;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ * Mostly tests for extensions specified in chapter 11 of the specification
+ * and not already tested elsewhere.
+ *
+ * @author David Allen
+ *
+ */
+ at Artifact
+ at SpecVersion("20090625")
+public class BeanManagerTest extends AbstractJSR299Test
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.7", id = "a")
+ //WBRI-328
+ public void testGetPassivationCapableBeanById()
+ {
+ Bean<?> bean = getCurrentManager().getBeans(Cat.class).iterator().next();
+ assert PassivationCapable.class.isAssignableFrom(bean.getClass());
+ Bean<?> passivatingBean = getCurrentManager().getPassivationCapableBean(CatBean.bean.getId());
+ assert bean == passivatingBean;
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.8", id = "a")
+ //WBRI-331
+ public void testAmbiguousDependencyResolved()
+ {
+ Set<Bean<?>> beans = new HashSet<Bean<?>>();
+ beans.addAll(getCurrentManager().getBeans(SimpleBean.class));
+ beans.addAll(getCurrentManager().getBeans(DerivedBean.class));
+ getCurrentManager().resolve(beans);
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cat.java (from rev 3364, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/Cat.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cat.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+class Cat
+{
+
+ @SuppressWarnings("unused")
+ private String name;
+
+ public Cat(String name)
+ {
+ this.name = name;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java (from rev 3364, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CatBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/CatBean.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,101 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.PassivationCapable;
+
+import org.jboss.jsr299.tck.literals.CurrentLiteral;
+
+class CatBean implements Bean<Cat>, PassivationCapable
+{
+ public static final CatBean bean = new CatBean();
+
+ @SuppressWarnings("serial")
+ public Set<Annotation> getBindings()
+ {
+ return new HashSet<Annotation>(){{ add(new CurrentLiteral());}};
+ }
+
+ public Class<? extends Annotation> getDeploymentType()
+ {
+ return null;
+ }
+
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ return new HashSet<InjectionPoint>();
+ }
+
+ public String getName()
+ {
+ return "cat";
+ }
+
+ public Set<Class<? extends Annotation>> getStereotypes() {
+ return new HashSet<Class<? extends Annotation>>();
+ }
+
+ public Class<? extends Annotation> getScopeType()
+ {
+ return Dependent.class;
+ }
+
+ @SuppressWarnings("serial")
+ public Set<Type> getTypes()
+ {
+ return new HashSet<Type>() {{ add(Cat.class); add(Object.class); }};
+ }
+
+ public boolean isNullable()
+ {
+ return false;
+ }
+
+ public boolean isSerializable()
+ {
+ return false;
+ }
+
+ public Class<?> getBeanClass()
+ {
+ return Cat.class;
+ }
+
+ public boolean isPolicy()
+ {
+ return false;
+ }
+
+ public Cat create(CreationalContext<Cat> creationalContext)
+ {
+ return new Cat("kitty");
+ }
+
+ public void destroy(Cat instance, CreationalContext<Cat> creationalContext)
+ {
+ creationalContext.release();
+ }
+
+ public static CatBean getBean()
+ {
+ return bean;
+ }
+
+ public void afterDiscovery(@Observes AfterBeanDiscovery event) {
+ event.addBean(bean);
+ }
+
+ public String getId()
+ {
+ return "org.jboss.jsr299.tck.tests.extensions.beanManager.CatBean";
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java (from rev 3364, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/DerivedBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+import javax.enterprise.inject.Specializes;
+
+ at Specializes @Tame
+class DerivedBean extends SimpleBean
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/SimpleBean.java (from rev 3364, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/SimpleBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/SimpleBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/SimpleBean.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+class SimpleBean
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java (from rev 3364, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/Tame.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Tame.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+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.enterprise.inject.BindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+ at interface Tame
+{
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-31 09:08:59 UTC (rev 3379)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -86,7 +86,10 @@
}
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.1.5", id = "aa")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.1.5", id = "aa"),
+ @SpecAssertion(section = "11.3.6", id = "a")
+ })
public void testSpecializedBeanExtendsManagedBean()
{
assert MountainLion.class.getAnnotation(Specializes.class) != null;
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/HierarchyDiscovery.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/HierarchyDiscovery.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/HierarchyDiscovery.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,157 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashSet;
+import java.util.Set;
+
+public class HierarchyDiscovery
+{
+ private final Type type;
+
+ private Set<Type> types;
+
+ public HierarchyDiscovery(Type type)
+ {
+ this.type = type;
+ }
+
+ protected void add(Type type)
+ {
+ types.add(type);
+ }
+
+ public Set<Type> getFlattenedTypes()
+ {
+ if (types == null)
+ {
+ this.types = new HashSet<Type>();
+ discoverTypes(type);
+ }
+ return types;
+ }
+
+ public Type getResolvedType()
+ {
+ return resolveType(type, type);
+ }
+
+ private void discoverTypes(Type type)
+ {
+ if (type != null)
+ {
+ add(type);
+ if (type instanceof Class)
+ {
+ discoverFromClass((Class<?>) type);
+ }
+ else if (type instanceof ParameterizedType)
+ {
+ Type rawType = ((ParameterizedType) type).getRawType();
+ if (rawType instanceof Class)
+ {
+ discoverFromClass((Class<?>) rawType);
+ }
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private void discoverFromClass(Class<?> clazz)
+ {
+ discoverTypes(resolveType(type, clazz.getGenericSuperclass()));
+ for (Type c : clazz.getGenericInterfaces())
+ {
+ discoverTypes(resolveType(type, c));
+ }
+ }
+
+ /**
+ * Gets the actual types by resolving TypeParameters.
+ *
+ * @param beanType
+ * @param type
+ * @return actual type
+ */
+ private Type resolveType(Type beanType, Type type)
+ {
+ if (type instanceof ParameterizedType)
+ {
+ if (beanType instanceof ParameterizedType)
+ {
+ return resolveParameterizedType((ParameterizedType) beanType, (ParameterizedType) type);
+ }
+ if (beanType instanceof Class)
+ {
+ return resolveType(((Class<?>) beanType).getGenericSuperclass(), type);
+ }
+ }
+
+ if (type instanceof TypeVariable)
+ {
+ if (beanType instanceof ParameterizedType)
+ {
+ return resolveTypeParameter((ParameterizedType) beanType, (TypeVariable<?>) type);
+ }
+ if (beanType instanceof Class)
+ {
+ return resolveType(((Class<?>) beanType).getGenericSuperclass(), type);
+ }
+ }
+ return type;
+ }
+
+ private Type resolveParameterizedType(ParameterizedType beanType, ParameterizedType parameterizedType)
+ {
+ Type rawType = parameterizedType.getRawType();
+ Type[] actualTypes = parameterizedType.getActualTypeArguments();
+
+ Type resolvedRawType = resolveType(beanType, rawType);
+ Type[] resolvedActualTypes = new Type[actualTypes.length];
+
+ for (int i = 0; i < actualTypes.length; i++)
+ {
+ resolvedActualTypes[i] = resolveType(beanType, actualTypes[i]);
+ }
+ // reconstruct ParameterizedType by types resolved TypeVariable.
+ return new ParameterizedTypeImpl(resolvedRawType, resolvedActualTypes, parameterizedType.getOwnerType());
+ }
+
+ private Type resolveTypeParameter(ParameterizedType beanType, TypeVariable<?> typeVariable)
+ {
+ // step1. raw type
+ Class<?> actualType = (Class<?>) beanType.getRawType();
+ TypeVariable<?>[] typeVariables = actualType.getTypeParameters();
+ Type[] actualTypes = beanType.getActualTypeArguments();
+ for (int i = 0; i < typeVariables.length; i++)
+ {
+ if (typeVariables[i].equals(typeVariable))
+ {
+ return resolveType(type, actualTypes[i]);
+ }
+ }
+
+ // step2. generic super class
+ Type genericSuperType = actualType.getGenericSuperclass();
+ Type type = resolveType(genericSuperType, typeVariable);
+ if (!(type instanceof TypeVariable<?>))
+ {
+ return type;
+ }
+
+ // step3. generic interfaces
+ for (Type interfaceType : actualType.getGenericInterfaces())
+ {
+ Type resolvedType = resolveType(interfaceType, typeVariable);
+ if (!(resolvedType instanceof TypeVariable<?>))
+ {
+ return resolvedType;
+ }
+ }
+
+ // don't resolve type variable
+ return typeVariable;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/HierarchyDiscovery.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-07-31 09:08:59 UTC (rev 3379)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -18,13 +18,15 @@
package org.jboss.jsr299.tck.tests.interceptors.definition;
import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
import javax.enterprise.inject.spi.Interceptor;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -47,7 +49,7 @@
public void testInterceptorsImplementInterceptorInterface()
{
boolean interfaceFound = false;
- for (Type type : getBeans(Interceptor1.class).iterator().next().getTypes())
+ for (Type type : getInterfacesImplemented(getBeans(Interceptor1.class).iterator().next().getClass()))
{
if (type.equals(Interceptor.class))
{
@@ -57,4 +59,11 @@
}
assert interfaceFound;
}
+
+ private Set<Type> getInterfacesImplemented(Class<?> clazz)
+ {
+ Set<Type> interfaces = new HashSet<Type>();
+ interfaces.addAll(new HierarchyDiscovery(clazz).getFlattenedTypes());
+ return interfaces;
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ParameterizedTypeImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ParameterizedTypeImpl.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ParameterizedTypeImpl.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class ParameterizedTypeImpl implements ParameterizedType
+{
+ private final Type[] actualTypeArguments;
+ private final Type rawType;
+ private final Type ownerType;
+
+ public ParameterizedTypeImpl(Type rawType, Type[] actualTypeArguments, Type ownerType)
+ {
+ this.actualTypeArguments = actualTypeArguments;
+ this.rawType = rawType;
+ this.ownerType = ownerType;
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return actualTypeArguments;
+ }
+
+ public Type getOwnerType()
+ {
+ return ownerType;
+ }
+
+ public Type getRawType()
+ {
+ return rawType;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return Arrays.hashCode(actualTypeArguments) ^ (ownerType == null ? 0 : ownerType.hashCode()) ^ (rawType == null ? 0 : rawType.hashCode());
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ else if (obj instanceof ParameterizedType)
+ {
+ ParameterizedType that = (ParameterizedType) obj;
+ Type thatOwnerType = that.getOwnerType();
+ Type thatRawType = that.getRawType();
+ return (ownerType == null ? thatOwnerType == null : ownerType.equals(thatOwnerType)) && (rawType == null ? thatRawType == null : rawType.equals(thatRawType)) && Arrays.equals(actualTypeArguments, that.getActualTypeArguments());
+ }
+ else
+ {
+ return false;
+ }
+
+ }
+
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(rawType);
+ if (actualTypeArguments.length > 0)
+ {
+ sb.append("<");
+ for (Type actualType : actualTypeArguments)
+ {
+ sb.append(actualType);
+ sb.append(",");
+ }
+ sb.delete(sb.length() - 1, sb.length());
+ sb.append(">");
+ }
+ return sb.toString();
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ParameterizedTypeImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-31 09:08:59 UTC (rev 3379)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-31 09:19:46 UTC (rev 3380)
@@ -16,9 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.byname;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -30,7 +31,11 @@
{
@Test(groups = { "resolution" , "ri-broken"})
- @SpecAssertion(section = "5.4.1", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.4.1", id = "c"),
+ @SpecAssertion(section = "11.3.5", id = "aa"),
+ @SpecAssertion(section = "11.3.5", id = "b")
+ })
// WBRI-306
public void testAmbiguousELNamesResolved() throws Exception
{
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-31 09:08:59 UTC (rev 3379)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-31 09:19:46 UTC (rev 3380)
@@ -4298,6 +4298,7 @@
<assertion id="e">
<text>Any operation of |BeanManager| may be called at any time during the execution of the application.</text>
+ <note>This does not appear to be testable</note>
</assertion>
</section>
More information about the weld-commits
mailing list