[webbeans-commits] Webbeans SVN: r1573 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/lookup/byname and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-18 11:52:33 -0500 (Wed, 18 Feb 2009)
New Revision: 1573
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
Log:
Switch tests to use beans.xml
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -3,15 +3,14 @@
import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches;
import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
import javax.context.RequestScoped;
import javax.inject.AnnotationLiteral;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -20,6 +19,7 @@
*
*/
@Artifact
+@BeansXml("beans.xml")
public class RealizationTest extends AbstractDeclarativeTest
{
@@ -30,16 +30,6 @@
{
};
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
- deploymentTypes.addAll(getStandardDeploymentTypes());
- deploymentTypes.add(AnotherDeploymentType.class);
- deploymentTypes.add(FarmAnimalDeploymentType.class);
- return deploymentTypes;
- }
-
@Test
@SpecAssertion(section = "4.4", id = "unknown")
public void testRealizedBeanWithProducerMethodHasSameScope()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,11 +1,9 @@
package org.jboss.jsr299.tck.unit.lookup.byname;
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -14,17 +12,10 @@
*
*/
@Artifact
+@BeansXml("beans.xml")
public class ResolutionByNameTest extends AbstractDeclarativeTest
{
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes();
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
-
/**
* The getInstanceByName() method must:
*
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-interface Animal
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,24 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-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.inject.BindingType;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@BindingType
-@interface Chunky
-{
-
- boolean realChunky();
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -4,10 +4,8 @@
import javax.inject.Production;
@Production
-@Whitefish
-@Chunky(realChunky=true)
@Named("whitefish")
-class Cod implements ScottishFish
+class Cod
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -33,7 +33,7 @@
public class DuplicateNameResolutionTest extends AbstractDeclarativeTest
{
/**
- * � Otherwise, if resolveByName() returned more than one Web Bean, throw an
+ * Otherwise, if resolveByName() returned more than one Web Bean, throw an
* AmbiguousDependencyException.
*
* @throws Exception
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-
-interface ScottishFish extends Animal
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -4,9 +4,8 @@
import javax.inject.Production;
@Production
-@Whitefish
@Named("whitefish")
-class Sole implements ScottishFish
+class Sole
{
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java 2009-02-18 16:21:18 UTC (rev 1572)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java 2009-02-18 16:52:33 UTC (rev 1573)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
-
-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.inject.BindingType;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@BindingType
-@interface Whitefish
-{
-
-}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml 2009-02-18 16:52:33 UTC (rev 1573)
@@ -0,0 +1,9 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.realization">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ <test:FarmAnimalDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/realization/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml 2009-02-18 16:52:33 UTC (rev 1573)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.byname">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/byname/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1572 - in ri/trunk: jboss-tck-runner and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-18 11:21:18 -0500 (Wed, 18 Feb 2009)
New Revision: 1572
Modified:
ri/trunk/jboss-as/build.properties
ri/trunk/jboss-tck-runner/pom.xml
Log:
run incontainer tests
Modified: ri/trunk/jboss-as/build.properties
===================================================================
--- ri/trunk/jboss-as/build.properties 2009-02-18 15:40:28 UTC (rev 1571)
+++ ri/trunk/jboss-as/build.properties 2009-02-18 16:21:18 UTC (rev 1572)
@@ -1,4 +1,5 @@
#jboss.home=/Applications/jboss-5.0.0.GA
+java.opts=-Xms128m -Xmx256m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
webbeans-ri-int.version=5.2.0-SNAPSHOT
webbeans-ri.version=1.0.0-SNAPSHOT
jboss-ejb3.version=1.0.0
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-18 15:40:28 UTC (rev 1571)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-18 16:21:18 UTC (rev 1572)
@@ -150,6 +150,10 @@
<name>org.jboss.jsr299.tck.libraryDirectory</name>
<value>target/dependency/lib</value>
</property>
+ <property>
+ <name>org.jboss.jsr299.tck.runIntegrationTests</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -186,6 +190,10 @@
<value>true</value>
</property>
<property>
+ <name>org.jboss.jsr299.tck.runIntegrationTests</name>
+ <value>true</value>
+ </property>
+ <property>
<name>org.jboss.jsr299.tck.libraryDirectory</name>
<value>target/dependency/lib</value>
</property>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1571 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-18 10:40:28 -0500 (Wed, 18 Feb 2009)
New Revision: 1571
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
Log:
skip deployment errors incontainer for now
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 15:08:47 UTC (rev 1570)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 15:40:28 UTC (rev 1571)
@@ -43,6 +43,7 @@
private TCKArtifactDescriptor artifact;
private DeploymentException deploymentException;
+ private boolean skipTest = false;
private boolean isSuiteDeployingTestsToContainer()
{
@@ -114,7 +115,13 @@
{
// We expect this exception, so ignore it
deploymentException = null;
+ skipTest = true;
}
+ else if (!getCurrentConfiguration().isStandalone())
+ {
+ deploymentException = null;
+ skipTest = true;
+ }
}
else
{
@@ -198,6 +205,7 @@
undeployArtifact();
this.artifact = null;
this.deploymentException = null;
+ skipTest = false;
}
@BeforeMethod(alwaysRun=true)
@@ -233,11 +241,11 @@
{
testResult.setThrowable(deploymentException.getCause());
}
- else if (!isDeployToContainerNeeded())
+ else if (!isDeployToContainerNeeded() && !skipTest)
{
callback.runTestMethod(testResult);
}
- else
+ else if (!skipTest)
{
try
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1570 - in tck/trunk/impl/src: main/java/org/jboss/jsr299/tck/impl/packaging/jsr299 and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-18 10:08:47 -0500 (Wed, 18 Feb 2009)
New Revision: 1570
Added:
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java
Log:
Remove @EjbArtifact
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -17,7 +17,6 @@
* standalone mode, the artifact itself won't be deployed, just the contained
* classes and /META-INF/beans.xml file).
*
- * @see EjbArtifact
* @see Classes
* @see IntegrationTest
* @see Packaging
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.impl.packaging;
import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR;
-import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED;
import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR;
import java.io.File;
@@ -32,7 +31,6 @@
private static final Logger log = Logger.getLogger(ArtifactProcessor.class);
private final boolean unit;
- private final boolean ejbs;
private final boolean addDeclaringPackage;
private final String beansXml;
private final PackagingType packagingType;
@@ -53,13 +51,7 @@
if (declaringClass.isAnnotationPresent(Artifact.class))
{
this.addDeclaringPackage = declaringClass.getAnnotation(Artifact.class).addCurrentPackage();
- this.ejbs = false;
}
- else if (declaringClass.isAnnotationPresent(EjbArtifact.class))
- {
- this.addDeclaringPackage = declaringClass.getAnnotation(EjbArtifact.class).addCurrentPackage();
- this.ejbs = true;
- }
else
{
throw new IllegalStateException("Unable to find @Artifact on " + declaringClass);
@@ -80,7 +72,7 @@
}
else
{
- this.packagingType = UNSPECIFIED;
+ this.packagingType = WAR;
}
if (declaringClass.isAnnotationPresent(IntegrationTest.class))
@@ -92,11 +84,6 @@
this.unit = true;
}
- if (unit && (packagingType.equals(WAR) || packagingType.equals(EAR)))
- {
- throw new IllegalArgumentException("Cannot specify @Packaging(WAR) or @Packaging(EAR) if @Integration test is not present");
- }
-
if (declaringClass.isAnnotationPresent(Resources.class))
{
this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value());
@@ -157,8 +144,7 @@
public TCKArtifactDescriptor createArtifact()
{
- final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage);
- artifact.setEjbs(ejbs);
+ final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, addDeclaringPackage);
artifact.setUnit(unit);
artifact.setExpectedDeploymentException(expectedDeploymentException);
artifact.getClasses().addAll(classes);
@@ -189,25 +175,17 @@
}
}
- private static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean ejbs, boolean addDeclaringPackage)
+ private static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean addDeclaringPackage)
{
TCKArtifactDescriptor artifact;
- if (packagingType.equals(WAR))
+ if (!standalone && packagingType.equals(WAR))
{
artifact = new WarArtifactDescriptor(declaringClass, beansXml);
}
- else if (packagingType.equals(EAR))
+ else if (!standalone && packagingType.equals(EAR))
{
artifact = new EarArtifactDescriptor(declaringClass, beansXml);
}
- else if (!standalone && ejbs)
- {
- artifact = new EarArtifactDescriptor(declaringClass, beansXml);
- }
- else if (!standalone)
- {
- artifact = new WarArtifactDescriptor(declaringClass, beansXml);
- }
else
{
artifact = new TCKArtifactDescriptor(declaringClass, beansXml);
@@ -281,7 +259,7 @@
public TCKArtifactDescriptor createArtifact(Class<?> declaringClass)
{
- if (declaringClass.isAnnotationPresent(Artifact.class) || declaringClass.isAnnotationPresent(EjbArtifact.class))
+ if (declaringClass.isAnnotationPresent(Artifact.class))
{
return new ArtifactProcessor(declaringClass, configuration.isStandalone(), configuration.getLibraryDirectory()).createArtifact();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -122,7 +122,7 @@
private void addClass(String className)
{
Class<?> clazz = Reflections.loadClass(className);
- if (clazz != null && clazz.isAnnotationPresent(Artifact.class) || clazz.isAnnotationPresent(EjbArtifact.class))
+ if (clazz != null && clazz.isAnnotationPresent(Artifact.class))
{
if (annotationType != null && clazz.isAnnotationPresent(annotationType))
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -11,7 +11,6 @@
* Add classes to the deployed artifact
*
* @see Artifact
- * @see EjbArtifact
* @see Resources
*
* @author Pete Muir
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/EjbArtifact.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -1,36 +0,0 @@
-package org.jboss.jsr299.tck.impl.packaging;
-
-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;
-
-/**
- * Mark this class as requiring an JSR299 artifact to be deployed to the
- * container. By default all classes in the current package, as well as support
- * classes, will be deployed. The resultant artifact will support session beans.
- *
- * This test may be a unit test (in which case, if the suite is run in
- * standalone mode, the artifact itself won't be deployed, just the contained
- * classes and /META-INF/beans.xml file).
- *
- * @author Pete Muir
- *
- * @see Artifact
- * @see Classes
- * @see IntegrationTest
- * @see Packaging
- * @see Resources
- *
- */
-@Documented
-@Retention(RUNTIME)
-@Target(TYPE)
-public @interface EjbArtifact
-{
-
- boolean addCurrentPackage() default true;
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -11,7 +11,6 @@
* container.
*
* @see Artifact
- * @see EjbArtifact
* @see IntegrationTest
*
* @author Pete Muir
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -2,7 +2,7 @@
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED;
+import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
@@ -14,7 +14,6 @@
*
* @see IntegrationTest
* @see Artifact
- * @see EjbArtifact
*
* @author Pete Muir
*
@@ -25,6 +24,6 @@
public @interface Packaging
{
- PackagingType value() default UNSPECIFIED;
+ PackagingType value() default WAR;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -3,6 +3,6 @@
public enum PackagingType
{
- UNSPECIFIED, EAR, WAR
+ EAR, WAR
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -12,7 +12,6 @@
* @see Resource
* @see Classes
* @see Artifact
- * @see EjbArtifact
*
* @author Pete Muir
*
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -40,7 +40,6 @@
private static final Logger log = Logger.getLogger(TCKArtifactDescriptor.class);
private boolean unit;
- private boolean ejbs;
private Class<? extends Throwable> expectedDeploymentException;
public TCKArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
@@ -71,16 +70,6 @@
return new ByteArrayInputStream(os.toByteArray());
}
- public boolean isEjbs()
- {
- return ejbs;
- }
-
- public void setEjbs(boolean ejbs)
- {
- this.ejbs = ejbs;
- }
-
public boolean isUnit()
{
return unit;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -22,10 +22,12 @@
import javax.event.Observer;
import javax.inject.manager.Bean;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.impl.packaging.EjbArtifact;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.jboss.jsr299.tck.impl.packaging.IntegrationTest;
-import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
import org.testng.annotations.Test;
/**
@@ -36,8 +38,9 @@
* Spec version: Public Release Draft 2
*
*/
-@EjbArtifact
+@Artifact
@IntegrationTest
+(a)Packaging(PackagingType.EAR)
public class EventTest extends AbstractDeclarativeTest
{
@Test(groups = { "stub", "events", "integration" })
Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -20,7 +20,7 @@
public void beforeClass()
{
configuration = new MockConfiguration();
- configuration.setStandalone(true);
+ configuration.setStandalone(false);
}
@Test
Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -5,7 +5,9 @@
import org.jboss.jsr299.tck.api.Configuration;
import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator;
+import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor;
import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
+import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor;
import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration;
import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest;
import org.testng.annotations.BeforeClass;
@@ -14,20 +16,23 @@
public class DeclarativeStandaloneTest extends AbstractArtifactTest
{
- private Configuration configuration;
+ private Configuration standaloneConfiguration;
+ private Configuration nonStandaloneConfiguration;
@BeforeClass
public void beforeClass()
{
- configuration = new MockConfiguration();
- configuration.setStandalone(true);
+ standaloneConfiguration = new MockConfiguration();
+ standaloneConfiguration.setStandalone(true);
+ nonStandaloneConfiguration = new MockConfiguration();
+ nonStandaloneConfiguration.setStandalone(false);
}
@Test
public void testDefaultDeclartiveArtifact() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyTest.class);
- assert !artifact.isEjbs();
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyTest.class);
+ assert artifact.getClass().equals(TCKArtifactDescriptor.class);
assert artifact.isUnit();
File root = artifact.getExplodedJar();
File currentPackage = getCurrentPackageAsFile(root);
@@ -77,7 +82,7 @@
@Test
public void testClassesSpecifiedArtifact() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyClassesSpecifiedTest.class);
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyClassesSpecifiedTest.class);
File root = artifact.getExplodedJar();
File currentPackage = getCurrentPackageAsFile(root);
assert currentPackage.listFiles().length == 1;
@@ -99,7 +104,7 @@
@Test
public void testResourcesSpecifiedArtifact() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyResourcesSpecifiedTest.class);
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyResourcesSpecifiedTest.class);
File root = artifact.getExplodedJar();
assert root.listFiles(META_INF_FILTER).length == 1;
File metaInf = root.listFiles(META_INF_FILTER)[0];
@@ -117,14 +122,14 @@
@Test
public void testIntegrationTestDeclartiveArtifact() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyIntegrationTest.class);
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyIntegrationTest.class);
assert !artifact.isUnit();
}
@Test
public void testCustomBeansXml() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyCustomBeansXmlTest.class);
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyCustomBeansXmlTest.class);
File root = artifact.getExplodedJar();
File metaInf = root.listFiles(META_INF_FILTER)[0];
assert metaInf.listFiles(BEANS_XML_FILTER).length == 1;
@@ -133,17 +138,25 @@
assert beans.startsWith("<my></my>");
}
- //@Test
+ @Test
public void testEjbTestDeclartiveArtifact() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyEjbTest.class);
- assert artifact.isEjbs();
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(nonStandaloneConfiguration).createArtifact(DummyEjbTest.class);
+ assert artifact.getClass().equals(EarArtifactDescriptor.class);
}
- @Test(expectedExceptions=IllegalArgumentException.class)
- public void testWrongPackaging()
+ @Test
+ public void testStandaloneEjbTestDeclartiveArtifact() throws Exception
{
- TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyWarUnitTest_Broken.class);
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyEjbTest.class);
+ assert artifact.getClass().equals(TCKArtifactDescriptor.class);
}
+ @Test
+ public void testWarDeclarativePackaging()
+ {
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(nonStandaloneConfiguration).createArtifact(DummyWarUnitTest.class);
+ assert artifact.getClass().equals(WarArtifactDescriptor.class);
+ }
+
}
Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone;
-import org.jboss.jsr299.tck.impl.packaging.EjbArtifact;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
-@EjbArtifact
+@Artifact @Packaging(PackagingType.EAR)
class DummyEjbTest
{
Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java (from rev 1567, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone;
+
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+
+
+@Artifact
+(a)Packaging(PackagingType.WAR)
+class DummyWarUnitTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone;
-
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.Packaging;
-import org.jboss.jsr299.tck.impl.packaging.PackagingType;
-
-
-@Artifact
-(a)Packaging(PackagingType.WAR)
-class DummyWarUnitTest_Broken
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-18 14:30:32 UTC (rev 1569)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-18 15:08:47 UTC (rev 1570)
@@ -19,7 +19,7 @@
public void beforeClass()
{
configuration = new MockConfiguration();
- configuration.setStandalone(true);
+ configuration.setStandalone(false);
}
@Test
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1569 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-18 09:30:32 -0500 (Wed, 18 Feb 2009)
New Revision: 1569
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
Log:
Fix lifecycle
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-18 14:22:39 UTC (rev 1568)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-18 14:30:32 UTC (rev 1569)
@@ -130,10 +130,10 @@
*/
public void beginRequest(HttpServletRequest request)
{
- restoreSessionContext(request.getSession());
BeanMap beanMap = new SimpleBeanMap();
request.setAttribute(REQUEST_ATTRIBUTE_NAME, beanMap);
super.beginRequest(request.getRequestURI(), beanMap);
+ restoreSessionContext(request.getSession());
}
/**
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1568 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-18 09:22:39 -0500 (Wed, 18 Feb 2009)
New Revision: 1568
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java
Log:
Fix standalone tests
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-02-18 13:07:18 UTC (rev 1567)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-02-18 14:22:39 UTC (rev 1568)
@@ -54,6 +54,10 @@
public void deploy(InputStream archiveStream, String name) throws DeploymentException, IOException
{
+ if (deploymentManager == null)
+ {
+ throw new IllegalStateException("setup() has not been called!");
+ }
Exception failure = null;
try
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 13:07:18 UTC (rev 1567)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 14:22:39 UTC (rev 1568)
@@ -73,7 +73,7 @@
* THEN
* we need to deploy
*/
- return !isInContainer() && artifact != null && ((getCurrentConfiguration().isStandalone() && !artifact.isUnit()) || !getCurrentConfiguration().isStandalone());
+ return !isInContainer() && artifact != null && ((getCurrentConfiguration().isStandalone() && !artifact.isUnit() && getCurrentConfiguration().isRunIntegrationTests()) || !getCurrentConfiguration().isStandalone());
}
private void deployArtifact()
@@ -84,7 +84,7 @@
{
getCurrentConfiguration().getContainers().deploy(artifact.getJarAsStream(), artifact.getDefaultName());
}
- else if (artifact != null)
+ else if (artifact != null && artifact.isUnit())
{
// Not a legacy test
Set<Class<?>> classes = artifact.getClasses();
@@ -129,7 +129,7 @@
{
getCurrentConfiguration().getContainers().undeploy(artifact.getDefaultName());
}
- if (getCurrentConfiguration().isStandalone())
+ if (getCurrentConfiguration().isStandalone() && artifact != null && artifact.isUnit())
{
getCurrentConfiguration().getStandaloneContainers().undeploy();
}
@@ -214,6 +214,11 @@
@AfterMethod(alwaysRun=true)
public void afterMethod()
{
+ if (!isInContainer() && artifact == null)
+ {
+ // This is a legacy test
+ getCurrentConfiguration().getStandaloneContainers().undeploy();
+ }
setCurrentManager(null);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java 2009-02-18 13:07:18 UTC (rev 1567)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java 2009-02-18 14:22:39 UTC (rev 1568)
@@ -15,6 +15,7 @@
{
if (!ConfigurationImpl.get().isRunIntegrationTests() && method.getMethod().getDeclaringClass().isAnnotationPresent(IntegrationTest.class))
{
+ context.setStopped(true);
return false;
}
else
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1567 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-02-18 08:07:18 -0500 (Wed, 18 Feb 2009)
New Revision: 1567
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
Log:
mapped context tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-18 10:53:32 UTC (rev 1566)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-18 13:07:18 UTC (rev 1567)
@@ -95,7 +95,7 @@
* method call, including invocation of EJB local business methods.
*/
@Test(groups = { "stub", "contexts", "underInvestigation" })
- @SpecAssertion(section = "8.5", id = "unknown")
+ @SpecAssertion(section = "8.5", id = "b")
public void testBuiltInNormalScopedContextsPropagateAcrossAnyJavaMethodCall()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-18 10:53:32 UTC (rev 1566)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-18 13:07:18 UTC (rev 1567)
@@ -36,11 +36,8 @@
getCurrentManager().addContext(context);
}
- /**
- * return an existing instance of the given contextual type, or
- */
@Test(groups = { "contexts", "broken" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "a")
public void testGetReturnsExistingInstance()
{
deployBeans(MySessionBean.class);
@@ -53,11 +50,8 @@
assert beanInstanceFromGet == beanInstance;
}
- /**
- * if no CreationalContext is given, return a null value, or
- */
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "b")
public void testGetWithoutCreationalContextReturnsNull()
{
deployBeans(MySessionBean.class);
@@ -66,13 +60,8 @@
assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
}
- /**
- * if a CreationalContext is given, create a new instance of the given
- * contextual type by calling Contextual.create() and return the new
- * instance.
- */
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "c")
public void testGetWithCreationalContextReturnsNewInstance()
{
deployBeans();
@@ -85,12 +74,8 @@
assert bean.isCreateCalled();
}
- /**
- * The get() method may not return a null value unless no CreationalContext
- * is given, or Contextual.create() returns a null value.
- */
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "d")
public void testGetMayNotReturnNullUnlessNoCreationalContextOrContextualCreateReturnsNull()
{
// The case of no creational context is already tested where a null is
@@ -104,12 +89,8 @@
assert bean.isCreateCalled();
}
- /**
- * The get() method may not create a new instance of the given contextual
- * type unless a CreationalContext is given.
- */
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "e")
public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven()
{
deployBeans(MySessionBean.class, MyApplicationBean.class);
@@ -128,13 +109,8 @@
assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myOtherCreationalContext) != null;
}
- /**
- * The Context implementation is responsible for destroying any contextual
- * instance it creates by passing the instance to the destroy() method of the
- * Contextual object representing the contextual type.
- */
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "f")
public void testContextDestroysBeansWhenDestroyed()
{
MyContextual bean = new MyContextual(getCurrentManager());
@@ -150,12 +126,8 @@
assert bean.isDestroyCalled();
}
- /**
- * A destroyed instance must not subsequently be returned by the get()
- * method.
- */
@Test(groups = { "contexts", "broken" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "g")
public void testDestroyedInstanceMustNotBeReturnedByGet()
{
deployBeans(MySessionBean.class, MyApplicationBean.class);
@@ -178,13 +150,8 @@
assert myApplicationBeanInstance != mySecondApplicationBeanInstance;
}
- /**
- * When a scope is inactive, any invocation of the get() from the current
- * thread upon the Context object for that scope results in a
- * ContextNotActiveException.
- */
@Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "h")
public void testInvokingGetOnInactiveContextFails()
{
deployBeans(MySessionBean.class);
@@ -201,7 +168,7 @@
* thread
*/
@Test(groups = { "contexts", "stub", "underInvestigation" })
- @SpecAssertion(section = "8.1", id = "unknown")
+ @SpecAssertion(section = "8.1", id = "review")
public void testOnlyOneMappedInstancePerContextualTypePerThread()
{
assert false;
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1566 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-18 05:53:32 -0500 (Wed, 18 Feb 2009)
New Revision: 1566
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Agent.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/DogAgent.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Pomeranian.java
Log:
Fixed some problems with the new integration tests for Events.
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Agent.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Agent.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Agent.java 2009-02-18 10:53:32 UTC (rev 1566)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.integration.event;
+
+public interface Agent
+{
+
+ public abstract void sendInTransaction(Object event);
+
+ public abstract void sendOutsideTransaction(Object event);
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Agent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/DogAgent.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/DogAgent.java 2009-02-18 08:18:43 UTC (rev 1565)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/DogAgent.java 2009-02-18 10:53:32 UTC (rev 1566)
@@ -1,7 +1,9 @@
package org.jboss.jsr299.tck.integration.event;
+import javax.annotation.Named;
import javax.annotation.Resource;
import javax.ejb.EJBException;
+import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
import javax.inject.Current;
@@ -11,8 +13,10 @@
import static javax.ejb.TransactionManagementType.BEAN;
@Stateless
+(a)Local(Agent.class)
@TransactionManagement(BEAN)
-public class DogAgent
+@Named
+public class DogAgent implements Agent
{
@Resource
private UserTransaction userTransaction;
@@ -20,7 +24,7 @@
@Current
private Manager jsr299Manager;
- public void sendInTransaction(Object event) throws EJBException
+ public void sendInTransaction(Object event)
{
try
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-18 08:18:43 UTC (rev 1565)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-18 10:53:32 UTC (rev 1566)
@@ -36,8 +36,8 @@
* Spec version: Public Release Draft 2
*
*/
-//@EjbArtifact
-//@IntegrationTest
+@EjbArtifact
+@IntegrationTest
public class EventTest extends AbstractDeclarativeTest
{
@Test(groups = { "stub", "events", "integration" })
@@ -54,29 +54,28 @@
assert false;
}
- @Test(groups = { "stub", "events", "integration" })
+ @Test(groups = { "events", "integration" })
@SpecAssertion(section = "7.5.6", id = "unknown")
public void testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress()
{
- Pomeranian dog = (Pomeranian) getCurrentManager().getInstanceByName("pomeranian");
- DogAgent dogAgent = (DogAgent) getCurrentManager().getInstanceByName("dogAgent");
+ Pomeranian dog = (Pomeranian) getCurrentManager().getInstanceByName("Teddy");
+ Agent dogAgent = getCurrentManager().getInstanceByType(DogAgent.class);
dogAgent.sendOutsideTransaction("event");
- assert dog.getNotificationThread().equals(Thread.currentThread());
}
- @Test(groups = { "stub", "events", "integration" })
+ @Test(groups = { "events", "integration" })
@SpecAssertion(section = "7.5.6", id = "unknown")
public void testAfterTransactionCompletionObserver()
{
- DogAgent dogAgent = (DogAgent) getCurrentManager().getInstanceByName("dogAgent");
+ Agent dogAgent = getCurrentManager().getInstanceByType(DogAgent.class);
dogAgent.sendInTransaction("event");
}
- @Test(groups = { "stub", "events", "integration" })
+ @Test(groups = { "events", "integration" })
@SpecAssertion(section = "7.5.6", id = "unknown")
public void testAfterTransactionSuccessObserver()
{
- DogAgent dogAgent = (DogAgent) getCurrentManager().getInstanceByName("dogAgent");
+ Agent dogAgent = getCurrentManager().getInstanceByType(DogAgent.class);
dogAgent.sendInTransaction(new Integer(4));
}
@@ -123,7 +122,7 @@
/**
*
*/
- @Test(groups = { "stub", "events", "integration" })
+ @Test(groups = { "events", "integration" })
@SpecAssertion(section = "7.5.8", id = "unknown")
public void testEnterpriseBeanObserverMethodCalledWithCallerContext()
{
@@ -134,8 +133,7 @@
assert observers.size() == 1;
getCurrentManager().fireEvent(event);
- Pomeranian dog = (Pomeranian) getCurrentManager().getInstanceByName("pomeranian");
- assert Thread.currentThread().equals(dog.getNotificationThread());
+ Pomeranian dog = (Pomeranian) getCurrentManager().getInstanceByName("Teddy");
}
@Test(groups = { "stub", "events", "integration" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Pomeranian.java 2009-02-18 08:18:43 UTC (rev 1565)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/Pomeranian.java 2009-02-18 10:53:32 UTC (rev 1566)
@@ -4,36 +4,111 @@
import javax.annotation.Named;
import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
import javax.ejb.Stateful;
+import javax.ejb.TransactionManagement;
import javax.event.AfterTransactionCompletion;
import javax.event.AfterTransactionFailure;
import javax.event.AfterTransactionSuccess;
import javax.event.Observes;
+import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
+import static javax.ejb.TransactionManagementType.BEAN;
+import static javax.transaction.Status.STATUS_ACTIVE;
+import static javax.transaction.Status.STATUS_COMMITTED;
+import static javax.transaction.Status.STATUS_COMMITTING;
+import static javax.transaction.Status.STATUS_MARKED_ROLLBACK;
+import static javax.transaction.Status.STATUS_NO_TRANSACTION;
+import static javax.transaction.Status.STATUS_PREPARED;
+import static javax.transaction.Status.STATUS_PREPARING;
+import static javax.transaction.Status.STATUS_ROLLEDBACK;
+import static javax.transaction.Status.STATUS_ROLLING_BACK;
+
+
@Stateful
@Tame
@Named("Teddy")
+@TransactionManagement(BEAN)
class Pomeranian implements PomeranianInterface
{
@Resource
private UserTransaction transaction;
+
+ @Resource
+ private SessionContext context;
+
+ private boolean correctContext = false;
+ private boolean correctTransactionState = false;
- public Thread notificationThread;
-
+ /**
+ * Observes a String event only after the transaction is completed.
+ *
+ * @param someEvent
+ */
public void observeStringEvent(@Observes @AfterTransactionCompletion String someEvent)
{
- notificationThread = Thread.currentThread();
+ try
+ {
+ if (transaction.getStatus() == STATUS_COMMITTED)
+ {
+ setCorrectTransactionState(true);
+ }
+ else
+ {
+ throw new EJBException("Transaction " + transaction + " is not in expected state");
+ }
+
+ if (context.getCallerPrincipal().getName().equals("Bubba"))
+ {
+ setCorrectContext(true);
+ }
+ }
+ catch (SystemException e)
+ {
+ throw new EJBException("Failed to detect transaction status", e);
+ }
}
+ /**
+ * Observes an Integer event if the transaction is successfully completed.
+ *
+ * @param event
+ */
public void observeIntegerEvent(@Observes @AfterTransactionSuccess Integer event)
{
-
+ try
+ {
+ if (transaction.getStatus() == STATUS_COMMITTED)
+ {
+ setCorrectTransactionState(true);
+ }
+ }
+ catch (SystemException e)
+ {
+ throw new EJBException("Failed to detect transaction status", e);
+ }
}
+ /**
+ * Observes a Float event only if the transaction failed.
+ *
+ * @param event
+ */
public void observeFloatEvent(@Observes @AfterTransactionFailure Float event)
{
-
+ try
+ {
+ if (transaction.getStatus() == STATUS_ROLLEDBACK)
+ {
+ setCorrectTransactionState(true);
+ }
+ }
+ catch (SystemException e)
+ {
+ throw new EJBException("Failed to detect transaction status", e);
+ }
}
public void observeBigIntegerEvent(@Observes BigInteger event)
@@ -41,8 +116,24 @@
}
- public Thread getNotificationThread()
+ public boolean isCorrectContext()
{
- return notificationThread;
+ return correctContext;
}
+
+ public void setCorrectContext(boolean correctContext)
+ {
+ this.correctContext = correctContext;
+ }
+
+ public boolean isCorrectTransactionState()
+ {
+ return correctTransactionState;
+ }
+
+ public void setCorrectTransactionState(boolean correctTransactionState)
+ {
+ this.correctTransactionState = correctTransactionState;
+ }
+
}
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1565 - in tck/trunk/impl/src/main: resources and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-02-18 03:18:43 -0500 (Wed, 18 Feb 2009)
New Revision: 1565
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
mapped conversation context tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java 2009-02-18 07:46:33 UTC (rev 1564)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java 2009-02-18 08:18:43 UTC (rev 1565)
@@ -12,217 +12,134 @@
*/
public class ConversationContextTest extends AbstractDeclarativeTest
{
- /**
- * For a JSF faces request, the context is active from the beginning of the
- * apply request values phase, until the response is complete.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "a")
public void testContextActiveFromBeginningOfApplyRequestValuesPhasetoResponseCompleteForJsfRequest()
{
assert false;
}
- /**
- * For a JSF non-faces request, the context is active during the render
- * response phase
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "b")
public void testContextActiveDuringRenderResponsePhaseForNonFacesJsfRequest()
{
assert false;
}
- /**
- * Any JSF request has exactly one associated conversation
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "c")
public void testJsfRequestHasExactlyOneAssociatedConversation()
{
assert false;
}
- /**
- * The conversation associated with a JSF request is determined at the end of
- * the restore view phase and does not change during the request
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "d")
public void testAssociatedConversationOfJsfRequestIsDeterminedAtEndOfRestoreViewPhase()
{
assert false;
}
- /**
- * The conversation associated with a JSF request is determined at the end of
- * the restore view phase and does not change during the request
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "d")
public void testAssociatedConversationOfJsfRequestDoesNotChangeDuringRequest()
{
assert false;
}
- /**
- * By default, a conversation is transient
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "e")
public void testDefaultConversationIsTransient()
{
assert false;
}
- /**
- * All long-running conversations have a string-valued unique identifier
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "h")
public void testConversationsHaveUniqueStringIdentifiers()
{
assert false;
}
- /**
- * If the conversation associated with the current JSF request is in the
- * transient state at the end of a JSF request, it is destroyed, and the
- * conversation context is also destroyed.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "j")
public void testTransientConversationIsDestroyedAtEndOfJsfRequest()
{
assert false;
}
- /**
- * If the conversation associated with the current JSF request is in the
- * transient state at the end of a JSF request, it is destroyed, and the
- * conversation context is also destroyed.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "j")
public void testTransientConversationContextIsDestroyedAtEndOfJsfRequest()
{
assert false;
}
- /**
- * If the conversation associated with the current JSF request is in the
- * long-running state at the end of a JSF request, it is not destroyed
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "k")
public void testLongRunningConversationNotDestroyedAtEndOfJsfRequest()
{
assert false;
}
- /**
- * The long-running conversation context associated with a request that
- * renders a JSF view is automatically propagated to any faces request (JSF
- * form submission) that originates from that rendered page.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "l")
public void testLongRunningConversationOfJsfRenderingRequestIsPropagatedToRequestFromRenderedPage()
{
assert false;
}
- /**
- * The long-running conversation context associated with a request that
- * results in a JSF redirect (via a navigation rule) is automatically
- * propagated to the resulting non-faces request, and to any other subsequent
- * request to the same URL. This is accomplished via use of a GET request
- * parameter named cid containing the unique identifier of the conversation.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "m")
public void testLongRunningConversationOfJsfRedirectIsPropagatedToNonFacesRequest()
{
assert false;
}
- /**
- * The long-running conversation associated with a request may be propagated
- * to any non-faces request via use of a GET request parameter named cid
- * containing the unique identifier of the conversation. In this case, the
- * application must manage this request parameter
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "n")
public void testLongRunningConversationManuallyPropagatedToNonFacesRequest()
{
assert false;
}
- /**
- * When no conversation is propagated to a JSF request, the request is
- * associated with a new transient conversation.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "o")
public void testNewTransientRequestIsCreatedWhenNoConversationIsPropagated()
{
assert false;
}
- /**
- * All long-running conversations are scoped to a particular HTTP servlet
- * session and may not cross session boundaries
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "p")
public void testLongRunningConversationsMayNotCrossHttpSessions()
{
assert false;
}
- /**
- * When the HTTP servlet session is invalidated, all long-running
- * conversation contexts created during the current session are destroyed
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "q")
public void testAllLongRunningConversationContextsOfInvalidatedHttpSessionAreDestroyed()
{
assert false;
}
- /**
- * The Web Bean manager is permitted to arbitrarily destroy any long-running
- * conversation that is associated with no current JSF request, in order to
- * conserve resources
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "r")
public void testManagerCanDestroyOrphanedLongRunningConversations()
{
assert false;
}
- /**
- * If the propagated conversation cannot be restored, the request is
- * associated with a new transient conversation
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "s")
public void testNewTransientConversationIsCreatedWhenConversationCannotBeRestored()
{
assert false;
}
- /**
- * The Web Bean manager ensures that a long-running conversation may be
- * associated with at most one request at a time, by blocking or rejecting
- * concurrent requests.
- */
@Test(groups = { "stub", "contexts" })
- @SpecAssertion(section = "8.5.4", id = "unknown")
+ @SpecAssertion(section = "8.5.4", id = "u")
public void testConcurrentRequestsToLongRunningConversationsAreHandled()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-18 07:46:33 UTC (rev 1564)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-18 08:18:43 UTC (rev 1565)
@@ -3023,7 +3023,7 @@
</assertion>
<assertion id="m">
- <text>The long-running conversation context associated with a request that renders a JSF view is automatically propagated to any faces request (JSF form submission) that originates from that rendered page</text>
+ <text>The long-running conversation context associated with a request that results in a JSF redirect (via a navigation rule) is automatically propagated to the resulting non-faces request, and to any other subsequent request to the same URL. This is accomplished via use of a GET request parameter named cid containing the unique identifier of the conversation</text>
</assertion>
<assertion id="n">
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1564 - in tck/trunk/impl/src/main: resources and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-02-18 02:46:33 -0500 (Wed, 18 Feb 2009)
New Revision: 1564
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
map dependent context tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-18 01:16:36 UTC (rev 1563)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-18 07:46:33 UTC (rev 1564)
@@ -16,12 +16,8 @@
*/
public class DependentContextTest extends AbstractDeclarativeTest
{
- /**
- * No injected instance of the (@Dependent-scoped) Web Bean is ever shared
- * between multiple injection points.
- */
@Test(groups = { "contexts", "injection" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "a")
public void testInstanceNotSharedBetweenInjectionPoints()
{
deployBeans(Fox.class, FoxRun.class);
@@ -34,14 +30,8 @@
assert !foxRun.fox.equals(foxRun.anotherFox);
}
- /**
- * Any injected instance of the (@Dependent scoped) bean is bound to the
- * lifecycle of the bean, servlet or EJB into which it is injected.
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "stub" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "b")
public void testDependentBeansBoundToLifecycleOfContainingBean() throws Exception
{
// Once injected, dependent beans will be destroyed when the
@@ -50,12 +40,8 @@
testDestroyingParentDestroysDependents();
}
- /**
- * Any instance of the (@Dependent scoped) bean that is used to evaluate a
- * Unified EL expression exists to service that evaluation only.
- */
@Test(groups = { "contexts", "el" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "c")
public void testInstanceUsedForElEvaluationNotShared() throws Exception
{
deployBeans(Fox.class);
@@ -74,13 +60,8 @@
}.run();
}
- /**
- * Any instance of the (@Dependent scoped) bean that receives a producer
- * method, producer field, disposal method or observer method invocation
- * exists to service that invocation only.
- */
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "d")
public void testInstanceUsedForProducerMethodNotShared() throws Exception
{
deployBeans(SpiderProducer.class);
@@ -92,13 +73,8 @@
assert tarantula != tarantula2;
}
- /**
- * Any instance of the (@Dependent-scoped) Web Bean that receives a producer
- * method, producer field, disposal method or observer method invocation
- * exists to service that invocation only
- */
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "d")
public void testInstanceUsedForProducerFieldNotShared() throws Exception
{
deployBeans(OtherSpiderProducer.class);
@@ -110,15 +86,8 @@
assert tarantula != tarantula2;
}
- /**
- * Any instance of the (@Dependent-scoped) Web Bean that receives a producer
- * method, producer field, disposal method or observer method invocation
- * exists to service that invocation only
- *
- * @throws Exception
- */
@Test(groups = { "broken", "contexts", "disposalMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "d")
public void testInstanceUsedForDisposalMethodNotShared() throws Exception
{
// deployBeans(SpiderProducer.class);
@@ -140,15 +109,8 @@
// }.run();
}
- /**
- * Any instance of the (@Dependent-scoped) Web Bean that receives a producer
- * method, producer field, disposal method or observer method invocation
- * exists to service that invocation only
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "d")
public void testInstanceUsedForObserverMethodNotShared() throws Exception
{
deployBeans(HorseStable.class);
@@ -167,12 +129,8 @@
}.run();
}
- /**
- * Every invocation of the get() operation of the Context object for the @Dependent
- * scope with a CreationalContext re- turns a new instance of the given bean.
- */
@Test(groups = "contexts")
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "e")
public void testContextGetWithCreateTrueReturnsNewInstance() throws Exception
{
deployBeans(Fox.class);
@@ -193,12 +151,8 @@
}.run();
}
- /**
- * Every invocation of the get() operation of the Context object for the @Dependent
- * scope with no CreationalContext re- turns a null value.
- */
@Test(groups = "contexts")
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "f")
public void testContextGetWithCreateFalseReturnsNull() throws Exception
{
deployBeans(Fox.class);
@@ -218,23 +172,15 @@
}.run();
}
- /**
- * The @Dependent scope is inactive except:
- */
@Test(groups = { "contexts", "underInvestigation" }, expectedExceptions = ContextNotActiveException.class)
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "g")
public void testContextIsInactive()
{
//getCurrentManager().getContext(Dependent.class);
}
- /**
- * when an instance of a bean with scope @Dependent is created by the
- * container to receive a producer method, producer field, disposal method or
- * observer method invocation, or
- */
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "g")
public void testContextIsActiveWhenInvokingProducerMethod()
{
deployBeans(SpiderProducer.class);
@@ -244,13 +190,8 @@
assert SpiderProducer.isDependentContextActive();
}
- /**
- * when an instance of a bean with scope @Dependent is created by the
- * container to receive a producer method, producer field, disposal method or
- * observer method invocation, or
- */
@Test(groups = { "stub", "contexts", "producerField", "underInvestigation" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "g")
public void testContextIsActiveWhenInvokingProducerField()
{
// TODO Rather difficult to detect anything when a producer field is
@@ -258,13 +199,8 @@
assert false;
}
- /**
- * when an instance of a bean with scope @Dependent is created by the
- * container to receive a producer method, producer field, disposal method or
- * observer method invocation, or
- */
@Test(groups = { "broken", "contexts", "disposalMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "g")
public void testContextIsActiveWhenInvokingDisposalMethod()
{
// deployBeans(SpiderProducer.class);
@@ -276,13 +212,8 @@
// assert SpiderProducer.isDependentContextActive();
}
- /**
- * when an instance of a bean with scope @Dependent is created by the
- * container to receive a producer method, producer field, disposal method or
- * observer method invocation, or
- */
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "g")
public void testContextIsActiveWhenInvokingObserverMethod()
{
deployBeans(HorseStable.class);
@@ -290,12 +221,8 @@
assert HorseStable.isDependentContextActive();
}
- /**
- * while a Unified EL expression is evaluated, or
- * @throws Exception
- */
@Test(groups = { "contexts", "el" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "h")
public void testContextIsActiveWhenEvaluatingElExpression() throws Exception
{
deployBeans(SensitiveFox.class);
@@ -312,11 +239,8 @@
}.run();
}
- /**
- * while an observer method is invoked, or
- */
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "i")
public void testContextIsActiveWhenInvokingObserver()
{
deployBeans(ApplicationHorseStable.class);
@@ -324,14 +248,8 @@
assert ApplicationHorseStable.isDependentContextActive();
}
- /**
- * when the container is creating or destroying a contextual instance of a
- * bean or injecting its dependencies, or
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "beanLifecycle" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "j")
public void testContextIsActiveDuringBeanCreation() throws Exception
{
deployBeans(SensitiveFox.class);
@@ -350,12 +268,8 @@
}.run();
}
- /**
- * when the container is creating or destroying a contextual instance of a
- * bean or injecting its dependencies, or
- */
@Test(groups = { "broken", "contexts", "beanDestruction" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "j")
public void testContextIsActiveDuringBeanDestruction()
{
// Since the only way to check the context during bean
@@ -364,12 +278,8 @@
this.testContextIsActiveWhenInvokingDisposalMethod();
}
- /**
- * when the container is creating or destroying a contextual instance of a
- * bean or injecting its dependencies, or
- */
@Test(groups = { "contexts", "injection" })
- @SpecAssertion(section = "8.4", id = "unknown")
+ @SpecAssertion(section = "8.3", id = "j")
public void testContextIsActiveDuringInjection()
{
deployBeans(FoxRun.class, Fox.class);
@@ -378,14 +288,8 @@
assert foxRun.fox != null;
}
- /**
- * destroy all dependent objects of a contextual bean instance when the
- * instance is destroyed,
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "beanDestruction" })
- @SpecAssertion(section = "8.3.2", id = "unknown")
+ @SpecAssertion(section = "8.3.2", id = "a")
public void testDestroyingParentDestroysDependents() throws Exception
{
deployBeans(Farm.class, Horse.class, Stable.class);
@@ -408,14 +312,8 @@
}.run();
}
- /**
- * destroy all @Dependent scoped contextual instances created during an EL
- * expression evaluation when the evaluation completes, and
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "el"})
- @SpecAssertion(section = "8.3.2", id = "unknown")
+ @SpecAssertion(section = "8.3.2", id = "c")
public void testDependentsDestroyedWhenElEvaluationCompletes() throws Exception
{
deployBeans(Fox.class);
@@ -435,15 +333,8 @@
}.run();
}
- /**
- * destroy any @Dependent scoped contextual instance created to receive a
- * producer method, producer field, disposal method or observer method
- * invocation when the invocation completes
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3.2", id = "unknown")
+ @SpecAssertion(section = "8.3.2", id = "d")
public void testDependentsDestroyedWhenProducerMethodCompletes() throws Exception
{
deployBeans(SpiderProducer.class);
@@ -469,15 +360,8 @@
}.run();
}
- /**
- * destroy any @Dependent scoped contextual instance created to receive a
- * producer method, producer field, disposal method or observer method
- * invocation when the invocation completes
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "producerField" })
- @SpecAssertion(section = "8.3.2", id = "unknown")
+ @SpecAssertion(section = "8.3.2", id = "d")
public void testDependentsDestroyedWhenProducerFieldCompletes() throws Exception
{
deployBeans(OtherSpiderProducer.class);
@@ -503,15 +387,8 @@
}.run();
}
- /**
- * destroy any @Dependent scoped contextual instance created to receive a
- * producer method, producer field, disposal method or observer method
- * invocation when the invocation completes
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "disposalMethod" })
- @SpecAssertion(section = "8.3.2", id = "unknown")
+ @SpecAssertion(section = "8.3.2", id = "d")
public void testDependentsDestroyedWhenDisposalMethodCompletes() throws Exception
{
deployBeans(SpiderProducer.class);
@@ -533,15 +410,8 @@
}.run();
}
- /**
- * destroy any @Dependent scoped contextual instance created to receive a
- * producer method, producer field, disposal method or observer method
- * invocation when the invocation completes
- *
- * @throws Exception
- */
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "unknown")
+ @SpecAssertion(section = "8.3.2", id = "d")
public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes() throws Exception
{
deployBeans(HorseStable.class);
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-18 01:16:36 UTC (rev 1563)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-18 07:46:33 UTC (rev 1564)
@@ -2660,8 +2660,7 @@
</assertion>
<assertion id="g">
- <text>The @Dependent scope is inactive except when an instance of a bean with scope @Dependent is created by the container to receive a producer method, producer
-field, disposal method or observer method invocation</text>
+ <text>The @Dependent scope is inactive except when an instance of a bean with scope @Dependent is created by the container to receive a producer method, producer field, disposal method or observer method invocation</text>
<note>Assertions g through k are all related and should be treated as "or" conditions</note>
</assertion>
17 years, 1 month
- 1
- 0