[webbeans-commits] Webbeans SVN: r3093 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery and 6 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Jul 20 00:25:42 EDT 2009
Author: shane.bryzak at jboss.com
Date: 2009-07-20 00:25:41 -0400 (Mon, 20 Jul 2009)
New Revision: 3093
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
matched observer tests with assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@IntegrationTest
@Artifact
@@ -34,14 +34,14 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "dba")
+ @SpecAssertion(section = "4.1", id = "hhh")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
assert getBeans(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);
}
@Test
- @SpecAssertion(section = "4.1", id = "dda")
+ @SpecAssertion(section = "4.1", id = "hhi")
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
{
assert getBeans(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -22,7 +22,7 @@
// TODO make this an integration test using Extension
@Test
@SpecAssertions({
- @SpecAssertion(section = "10.5.2", id = "e"),
+ @SpecAssertion(section = "10.4.2", id = "e"),
@SpecAssertion(section = "11.5.2", id = "a")
})
public void testDeploymentFailsBeforeNotifyingObserversAfterBeanDiscovery()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -29,7 +29,7 @@
* Tests an observer method that is also a disposes method
* for something else.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -38,7 +38,7 @@
public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertion(section = "10.5.2", id = "f")
+ @SpecAssertion(section = "10.4.2", id = "f")
public void testObserverMethodWithDisposesParamFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -29,7 +29,7 @@
* Tests an observer method that is also annotated as an
* initializer method.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -38,7 +38,7 @@
public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertion(section = "10.5.2", id = "e")
+ @SpecAssertion(section = "10.4.2", id = "e")
public void testObserverMethodAnnotatedInitializerFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -17,7 +17,6 @@
package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DefinitionError;
@@ -28,7 +27,7 @@
/**
* Tests an observer method which is also annotated as a producer method.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -37,7 +36,7 @@
public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertion(section = "10.5.2", id = "d")
+ @SpecAssertion(section = "10.4.2", id = "d")
public void testObserverMethodAnnotatedProducesFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -30,7 +30,7 @@
* Test an observer method on an EJB that is neither a business method nor a
* static method of the class.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
* @author David Allen
*/
@@ -40,7 +40,8 @@
public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "10.5", id = "d"), @SpecAssertion(section = "10.5.2", id = "g") })
+ @SpecAssertions( { @SpecAssertion(section = "10.4", id = "d"),
+ @SpecAssertion(section = "10.4.2", id = "g") })
public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-07-20 04:25:41 UTC (rev 3093)
@@ -9,14 +9,15 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "10.5.1", id = "a"), @SpecAssertion(section = "10.5.2", id = "b") })
+ @SpecAssertions( { @SpecAssertion(section = "10.4.1", id = "a"),
+ @SpecAssertion(section = "10.4.2", id = "b") })
public void testObserverMethodMustHaveOnlyOneEventParameter()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 03:56:29 UTC (rev 3092)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 04:25:41 UTC (rev 3093)
@@ -1415,8 +1415,12 @@
</assertion>
<assertion id="hhh">
- <text>A scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
+ <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
</assertion>
+
+ <assertion id="hhi">
+ <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
+ </assertion>
<assertion id="i" testable="false">
<text>For annotations defined by the bean specification, all built-in _scope types_ are declared |@Inherited|</text>
More information about the weld-commits
mailing list