Author: dallen6 Date: 2009-05-22 10:03:20 -0400 (Fri, 22 May 2009) New Revision: 2698 Added: 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/DisposalNonBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/Apple.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java 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/producer/method/definition/Cherry.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java Log: Some disposal method tests for 3.4.6 Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java (from rev 2696, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java (rev 0) +++ 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) @@ -0,0 +1,68 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; +import javax.inject.manager.Bean; + +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.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class DisposalMethodDefinitionTest extends AbstractJSR299Test +{ + private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {}; + + @Test + @SpecAssertions({ + @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") + }) + public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception + { + SpiderProducer spiderProducer = getCurrentManager().getInstanceByType(SpiderProducer.class); + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Tarantula instance = getCurrentManager().getInstance(tarantula); + tarantula.destroy(instance); + } + + }.run(); + assert spiderProducer.isTameSpiderDestroyed(); + assert spiderProducer.isCurrentSpiderDestroyed(); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.4.6", id = "a") + }) + public void testDisposalMethodOnNonBean() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Tarantula instance = getCurrentManager().getInstance(tarantula); + tarantula.destroy(instance); + } + + }.run(); + assert !DisposalNonBean.isSpiderDestroyed(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java 2009-05-21 12:08:27 UTC (rev 2697) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -1,41 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; - -import java.lang.annotation.Annotation; - -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -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; - -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class DisposalMethodsByBindingTest extends AbstractJSR299Test -{ - private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {}; - - @Test - @SpecAssertion(section = "2.3.6", id = "c") - public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception - { - SpiderProducer spiderProducer = getCurrentManager().getInstanceByType(SpiderProducer.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); - Tarantula instance = getCurrentManager().getInstance(tarantula); - tarantula.destroy(instance); - } - - }.run(); - assert spiderProducer.isTameSpiderDestroyed(); - assert spiderProducer.isCurrentSpiderDestroyed(); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +import javax.inject.Disposes; + +class DisposalNonBean +{ + private static boolean spiderDestroyed = false; + + public DisposalNonBean(String someString) + { + + } + + public void destroyDeadliest(@Disposes @Deadliest Tarantula spider) + { + spiderDestroyed = true; + } + + public static boolean isSpiderDestroyed() + { + return spiderDestroyed; + } + + public static void setSpiderDestroyed(boolean spiderDestroyed) + { + DisposalNonBean.spiderDestroyed = spiderDestroyed; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-05-21 12:08:27 UTC (rev 2697) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -32,7 +32,7 @@ SpiderProducer.tameSpiderDestroyed = true; } - public void destroyCurrentSpider(@Disposes @Current Tarantula spider) + public static void destroyCurrentSpider(@Disposes @Current Tarantula spider) { SpiderProducer.currentSpiderDestroyed = true; } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/Apple.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/Apple.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/Apple.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; + +class Apple +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/Apple.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; + +import javax.ejb.Stateless; +import javax.inject.Produces; + +@Stateless +public class AppleTree implements AppleTreeLocal +{ + @Produces public Apple getApple() + { + return new Apple(); + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; + +import javax.ejb.Local; + +@Local +public interface AppleTreeLocal +{ +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ 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) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class DisposalMethodOnSessionBean extends AbstractJSR299Test +{ + @Test + @SpecAssertion(section = "3.4.6", id = "d") + public void testDisposalMethodNotBusinessOrStatic() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Cherry.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Cherry.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Cherry.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -0,0 +1,45 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; + +class Cherry +{ + private String type; + + public Cherry(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((type == null) ? 0 : type.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Cherry other = (Cherry) obj; + if (type == null) + { + if (other.type != null) + return false; + } + else if (!type.equals(other.type)) + return false; + return true; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Cherry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java (from rev 2696, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; + +import javax.inject.Disposes; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class NonBeanWithStaticProducerMethod +{ + public NonBeanWithStaticProducerMethod(String someString) + { + + } + + @Produces public static Cherry getCherry() + { + return new Cherry("Marischino"); + } + + public static void destroyString(@Disposes Cherry someCherry) + { + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-05-21 12:08:27 UTC (rev 2697) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -30,7 +30,10 @@ private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {}; @Test(groups = "producerMethod") - @SpecAssertion(section = "2.5.3", id = "g") + @SpecAssertions( { + @SpecAssertion(section = "2.5.3", id = "g"), + @SpecAssertion(section = "3.4.4", id = "a") + } ) public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; @@ -49,6 +52,15 @@ assert getCurrentManager().getInstanceByType(String.class).equals(BeanWithStaticProducerMethod.getString()); } + @Test(groups = { "producerMethod" }) + @SpecAssertions( { + @SpecAssertion(section = "3.4", id = "a") + } ) + public void testProducerOnNonBean() throws Exception + { + assert getCurrentManager().resolveByType(Cherry.class).isEmpty(); + } + @Test(groups = "producerMethod") @SpecAssertions( { @SpecAssertion(section = "6.7", id = "n") @@ -72,6 +84,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ @SpecAssertion(section = "3.4", id = "c"), + @SpecAssertion(section = "3.4.2", id = "a"), @SpecAssertion(section = "2.3.1", id = "a") }) public void testDefaultBindingType() throws Exception @@ -137,7 +150,10 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "be") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "be"), + @SpecAssertion(section = "3.4", id = "k") + }) public void testBindingType() throws Exception { assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; @@ -147,7 +163,10 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "ba") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "ba"), + @SpecAssertion(section = "3.4", id = "k") + }) public void testScopeType() throws Exception { assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java 2009-05-21 12:08:27 UTC (rev 2697) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java 2009-05-22 14:03:20 UTC (rev 2698) @@ -40,16 +40,6 @@ } /** - * A bean may declare multiple disposal methods - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.6", id = "e") - public void testBeanCanDeclareMultipleDisposalMethods() - { - assert false; - } - - /** * Each disposal method must have exactly one disposed parameter, of the same * type as the corresponding producer method return type */