Author: dallen6
Date: 2009-05-22 16:17:39 -0400 (Fri, 22 May 2009)
New Revision: 2699
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java
Log:
More tests and corrected assertion assignments up to section 3.4.10
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -3,6 +3,7 @@
import java.lang.annotation.Annotation;
import javax.inject.AnnotationLiteral;
+import javax.inject.DefinitionException;
import javax.inject.manager.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
@@ -23,7 +24,9 @@
@SpecAssertion(section = "2.3.6", id = "c"),
@SpecAssertion(section = "3.4.6", id = "b"),
@SpecAssertion(section = "3.4.6", id = "c"),
- @SpecAssertion(section = "3.4.6", id = "e")
+ @SpecAssertion(section = "3.4.6", id = "e"),
+ @SpecAssertion(section = "3.4.7", id = "b"),
+ @SpecAssertion(section = "3.4.8", id = "a")
})
public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception
{
@@ -46,7 +49,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.6", id = "a")
+ @SpecAssertion(section = "3.4.6", id = "a"),
+ @SpecAssertion(section = "3.4.7", id = "d")
})
public void testDisposalMethodOnNonBean() throws Exception
{
@@ -65,4 +69,42 @@
assert !DisposalNonBean.isSpiderDestroyed();
}
+ /**
+ * In addition to the disposed parameter, a disposal method may declare
+ * additional parameters, which may also specify bindings. The container
+ * calls Manager.getInstanceToInject() to determine a value for each
+ * parameter of a disposal method and calls the disposal method with those
+ * parameter values
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.10", id = "a")
+ public void testDisposalMethodParametersGetInjected()
+ {
+ assert false;
+ }
+
+ /**
+ * When searching for disposal methods for a producer method, the container
+ * searches for disposal methods which are declared by an enabled bean, and
+ * for which the disposed parameter must resolve to the producer method,
+ * according to the typesafe resolution algorithm
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.11", id = "a")
+ public void testDisposalMethodTypeSafeResolution()
+ {
+ assert false;
+ }
+
+ /**
+ * If there are multiple disposal methods for a producer method, a
+ * DefinitionException is thrown by the container at deployment time
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions =
{ DefinitionException.class })
+ @SpecAssertion(section = "3.4.11", id = "b")
+ public void testMultipleDisposalMethodsFails()
+ {
+ assert false;
+ }
+
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -3,6 +3,7 @@
import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
@@ -20,7 +21,10 @@
public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.8", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.7", id = "a"),
+ @SpecAssertion(section = "3.4.8", id = "b")
+ })
public void testMultipleDisposeParameters()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -18,7 +18,7 @@
public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.8", id = "b")
+ @SpecAssertion(section = "3.4.8", id = "c")
public void testProducesUnallowed()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -20,7 +20,7 @@
public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.8", id = "c")
+ @SpecAssertion(section = "3.4.8", id = "d")
public void testInitializerUnallowed()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -20,7 +20,7 @@
public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.8", id = "d")
+ @SpecAssertion(section = "3.4.8", id = "e")
public void testObserverParameterUnallowed()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -20,7 +20,7 @@
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.7", id = "a")
+ @SpecAssertion(section = "3.4.7", id = "c")
public void testUnresolvedDisposalMethod()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-05-22
14:03:20 UTC (rev 2698)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-05-22
20:17:39 UTC (rev 2699)
@@ -3,6 +3,7 @@
import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
@@ -13,7 +14,10 @@
public class DisposalMethodOnSessionBean extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.4.6", id = "d")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.6", id = "d"),
+ @SpecAssertion(section = "3.4.8", id = "f")
+ })
public void testDisposalMethodNotBusinessOrStatic()
{
assert false;