[webbeans-commits] Webbeans SVN: r1583 - in tck/trunk/impl/src/main: resources and 1 other directory.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Feb 18 18:44:50 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-02-18 18:44:50 -0500 (Wed, 18 Feb 2009)
New Revision: 1583
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
mapped scope definition tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-18 23:38:41 UTC (rev 1582)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-18 23:44:50 UTC (rev 1583)
@@ -19,7 +19,7 @@
public class ScopeDefinitionTest extends AbstractDeclarativeTest
{
- @Test @SpecAssertion(section="2.4", id = "unknown")
+ @Test @SpecAssertion(section="2.4", id = "c")
public void testScopeTypesAreExtensible()
{
Bean<Mullet> mullet = createSimpleBean(Mullet.class);
@@ -37,7 +37,7 @@
* TODO This is not really a testable assertion
*/
@Test(groups={"underInvestigation", "annotationDefinition"})
- @SpecAssertion(section="2.4.2", id = "unknown")
+ @SpecAssertion(section="2.4.2", id = "a")
public void testScopeTypeHasCorrectRetention()
{
assert false;
@@ -47,13 +47,13 @@
* TODO If a scope has no scope type annotation, then it is not a scope and cannot be tested
*/
@Test(groups={"underInvestigation", "annotationDefinition"})
- @SpecAssertion(section="2.4.2", id = "unknown")
+ @SpecAssertion(section="2.4.2", id = "b")
public void testScopeTypeDeclaresScopeTypeAnnotation()
{
assert false;
}
- @Test @SpecAssertion(section="2.4.3", id = "unknown")
+ @Test @SpecAssertion(section="2.4.3", id = "a")
public void testScopeDeclaredInJava()
{
Bean<SeaBass> trout = createSimpleBean(SeaBass.class);
@@ -61,13 +61,14 @@
}
@Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="2.4.3", id = "unknown")
+ @SpecAssertion(section="2.4.3", id = "b")
public void testTooManyScopesSpecifiedInJava()
{
createSimpleBean(BeanWithTooManyScopeTypes.class);
}
@Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"})
+ @SpecAssertion(section = "2.4.4", id = "b")
public void testTooManyScopesSpecifiedInXml()
{
//Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
@@ -78,7 +79,7 @@
}
@Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="2.4.4", id = "unknown")
+ @SpecAssertion(section="2.4.4", id = "a")
public void testScopeDeclaredInXml()
{
//Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
@@ -91,7 +92,7 @@
}
@Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="2.4.4", id = "unknown")
+ @SpecAssertion(section="2.4.4", id = "review")
public void testScopeMissingInXml()
{
//Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
@@ -103,7 +104,7 @@
}
@Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="2.4.4", id = "unknown")
+ @SpecAssertion(section="2.4.4", id = "review")
public void testScopeDeclaredInXmlOverridesJava()
{
//Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
@@ -114,7 +115,7 @@
assert false;
}
- @Test @SpecAssertion(section="2.4.5", id = "unknown")
+ @Test @SpecAssertion(section="2.4.5", id = "a")
public void testDefaultScope()
{
Bean<Order> order = createSimpleBean(Order.class);
@@ -123,8 +124,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "2.4.5", id = "unknown"),
- @SpecAssertion(section = "2.7.2", id = "unknown")
+ @SpecAssertion(section = "2.4.5", id = "e"),
+ @SpecAssertion(section = "2.7.2", id = "a")
})
public void testScopeSpecifiedAndStereotyped()
{
@@ -133,20 +134,20 @@
}
@Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="2.4.5", id = "unknown")
+ @SpecAssertion(section="2.4.5", id = "d")
public void testMutipleIncompatibleScopeStereotypes()
{
createSimpleBean(Scallop_Broken.class);
}
- @Test @SpecAssertion(section="2.4.5", id = "unknown")
+ @Test @SpecAssertion(section="2.4.5", id = "d")
public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified()
{
Bean<Pollock> pollock = createSimpleBean(Pollock.class);
assert pollock.getScopeType().equals(Dependent.class);
}
- @Test @SpecAssertion(section="2.4.5", id = "unknown")
+ @Test @SpecAssertion(section="2.4.5", id = "c")
public void testMutipleCompatibleScopeStereotypes()
{
Bean<Grayling> grayling = createSimpleBean(Grayling.class);
@@ -155,8 +156,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "2.7.2", id = "unknown"),
- @SpecAssertion(section = "4.1", id = "unknown")
+ @SpecAssertion(section = "2.7.2", id = "d"),
+ @SpecAssertion(section = "4.1", id = "h")
})
public void testWebBeanScopeTypeOverridesStereotype()
{
@@ -164,25 +165,25 @@
assert bean.getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="4.1", id = "unknown")
+ @Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
{
assert createSimpleBean(BorderCollie.class).getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="4.1", id = "unknown")
+ @Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeNotDeclaredInheritedIsNotInherited()
{
assert createSimpleBean(ShetlandPony.class).getScopeType().equals(Dependent.class);
}
- @Test @SpecAssertion(section="4.1", id = "unknown")
+ @Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited()
{
assert createSimpleBean(GoldenRetriever.class).getScopeType().equals(ApplicationScoped.class);
}
- @Test @SpecAssertion(section="4.1", id = "unknown")
+ @Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited()
{
assert createSimpleBean(GoldenLabrador.class).getScopeType().equals(Dependent.class);
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-18 23:38:41 UTC (rev 1582)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-18 23:44:50 UTC (rev 1583)
@@ -1997,7 +1997,7 @@
</assertion>
<assertion id="b">
- <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X is annotated with a scope type Z then Y inherits the annotation if and only if Z declares the @Inherited metaannotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
+ <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X is annotated with a scope type Z then Y inherits the annotation if and only if Z declares the @Inherited meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
</assertion>
<assertion id="c">
@@ -2013,7 +2013,7 @@
</assertion>
<assertion id="f">
- <text>For class X which is the bean class of a simple or session bean Y declared using XML, if X is annotated with a scope type Z then Y inherits the annotation if and only if Z declares the @Inherited metaannotation and Y does not explicitly declare a scope type using XML.</text>
+ <text>For class X which is the bean class of a simple or session bean Y declared using XML, if X is annotated with a scope type Z then Y inherits the annotation if and only if Z declares the @Inherited meta-annotation and Y does not explicitly declare a scope type using XML.</text>
</assertion>
<assertion id="g">
More information about the weld-commits
mailing list