February 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1401 - in tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging: defined and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-03 19:24:32 -0500 (Tue, 03 Feb 2009) New Revision: 1401 Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java Log: tests for TCKArtifact Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-03 23:59:52 UTC (rev 1400) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-04 00:24:32 UTC (rev 1401) @@ -39,7 +39,12 @@ protected File getCurrentPackageAsFile(File root) { - String[] packageHierarchy = getClass().getPackage().getName().split("\\."); + return getPackageAsFile(getClass().getPackage(), root); + } + + protected File getPackageAsFile(Package pkg, File root) + { + String[] packageHierarchy = pkg.getName().split("\\."); for (final String packageName : packageHierarchy) { File[] files = root.listFiles(new FilenameFilter() Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java 2009-02-03 23:59:52 UTC (rev 1400) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java 2009-02-04 00:24:32 UTC (rev 1401) @@ -3,8 +3,13 @@ import java.io.File; import java.io.FilenameFilter; +import org.jboss.webbeans.tck.AbstractTest; +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.tck.impl.packaging.TCKArtifact; import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; +import org.jboss.webbeans.tck.impl.util.Reflections; +import org.jboss.webbeans.tck.literals.NewLiteral; import org.testng.annotations.Test; public class ArtifactTest extends AbstractArtifactTest @@ -48,4 +53,14 @@ assert cowClasses[0].isFile(); } + @Test + public void testTCKArtifact() throws Exception + { + Artifact artifact = new TCKArtifact(); + File root = artifact.create(); + assert getPackageAsFile(Reflections.class.getPackage(), root).listFiles().length > 0; + assert getPackageAsFile(NewLiteral.class.getPackage(), root).listFiles().length > 0; + assert getPackageAsFile(AbstractTest.class.getPackage(), root).listFiles().length > 0; + } + }

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1400 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-03 18:59:52 -0500 (Tue, 03 Feb 2009) New Revision: 1400 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java Log: fix build Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java 2009-02-03 23:32:36 UTC (rev 1399) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java 2009-02-03 23:59:52 UTC (rev 1400) @@ -13,12 +13,11 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.Text; import com.sun.mirror.apt.AnnotationProcessor; import com.sun.mirror.apt.AnnotationProcessorEnvironment; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java 2009-02-03 23:32:36 UTC (rev 1399) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java 2009-02-03 23:59:52 UTC (rev 1400) @@ -5,8 +5,8 @@ import java.util.Collections; import java.util.Set; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import com.sun.mirror.apt.AnnotationProcessor; import com.sun.mirror.apt.AnnotationProcessorEnvironment;

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1399 - in tck/trunk/impl/src: main/java/org/jboss/webbeans/tck/impl and 49 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-03 18:32:36 -0500 (Tue, 03 Feb 2009) New Revision: 1399 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/ Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/CurrentBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/NewLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java Log: alter packages, default includes for a TCK test (no test) Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java (from rev 1398, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.tck; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +(a)Target(ElementType.METHOD) +@Documented +public @interface SpecAssertion +{ + public String section(); + public String id(); + public String note() default ""; +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java (from rev 1398, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +(a)Target(ElementType.METHOD) +@Documented +public @interface SpecAssertions +{ + public SpecAssertion[] value(); +} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.impl; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -(a)Target(ElementType.METHOD) -@Documented -public @interface SpecAssertion -{ - public String section(); - public String id(); - public String note() default ""; -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -(a)Target(ElementType.METHOD) -@Documented -public @interface SpecAssertions -{ - public SpecAssertion[] value(); -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,8 @@ package org.jboss.webbeans.tck.impl.packaging; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.WebBeansTCKImpl; +import org.jboss.webbeans.tck.impl.util.Reflections; +import org.jboss.webbeans.tck.literals.NewLiteral; public class TCKArtifact extends Artifact { @@ -9,8 +10,9 @@ public TCKArtifact() { super(); - getClasses().add(AbstractTest.class); - getClasses().add(WebBeansTCKImpl.class); + getPackages().add(AbstractTest.class.getPackage()); + getPackages().add(NewLiteral.class.getPackage()); + getPackages().add(Reflections.class.getPackage()); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,10 +7,10 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.webbeans.tck.impl.packaging.Artifact; import org.jboss.webbeans.tck.impl.packaging.ResourceDescriptor; +import org.jboss.webbeans.tck.impl.packaging.TCKArtifact; -public class WarArtifact extends Artifact +public class WarArtifact extends TCKArtifact { public static final String WEB_XML_DESTINATION = "WEB-INF/web.xml"; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.integration.context; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.application; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.conversation; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.integration.context.dependent; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.IllegalProductException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.request; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.session; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -23,7 +23,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.implementation.enterprise; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.lookup.byname; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.lookup.manager; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; public class ManagerTest extends AbstractTest Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.lookup.non.contextual; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals (from rev 1398, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/CurrentBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/CurrentBinding.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.tck.impl.literals; +package org.jboss.webbeans.tck.literals; import javax.inject.AnnotationLiteral; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/NewLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/NewLiteral.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.tck.impl.literals; +package org.jboss.webbeans.tck.literals; import javax.inject.AnnotationLiteral; import javax.inject.New; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,7 +11,7 @@ import javax.context.RequestScoped; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,7 +9,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,7 +10,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,7 +9,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,9 +9,9 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.DeploymentException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,8 +9,8 @@ import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -6,8 +6,8 @@ import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,8 +10,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -16,8 +16,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.commonAnnotations; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.decorator; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; public class DecoratorDefinitionTest Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.deployment; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.DefinitionException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,8 +12,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.NewLiteral; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.NewLiteral; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -4,8 +4,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.interceptor; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.DefinitionException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -13,9 +13,9 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,8 +10,8 @@ import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,8 +9,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,8 +12,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.NewLiteral; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.NewLiteral; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,7 +7,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken; import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.StaticInnerBean_Broken; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,7 +7,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,7 +10,7 @@ import javax.inject.AnnotationLiteral; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -4,7 +4,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,7 +7,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,7 +11,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,7 +11,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -31,8 +31,8 @@ import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.manager; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,8 +12,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,9 +12,9 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,107 +0,0 @@ -package org.jboss.webbeans.tck.impl.test; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; -import org.testng.annotations.Test; - -public class ArtifactTest -{ - - protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("WEB-INF"); - } - }; - - protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("beans.xml"); - } - - }; - - - - protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("web.xml"); - } - - }; - - - @Test - public void testDefaultWar() throws Exception - { - WarArtifact war = new WarArtifact(); - war.getClasses().add(Cow.class); - File root = war.create(); - assert root.listFiles().length == 2; - assert root.isDirectory(); - assert root.listFiles(WEB_INF_FILTER).length == 1; - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.getName().equals("WEB-INF"); - assert webInf.isDirectory(); - assert webInf.listFiles().length == 2; - assert webInf.listFiles(BEANS_XML_FILTER).length == 1; - File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0]; - assert beansXml.isFile(); - assert beansXml.getName().equals("beans.xml"); - assert beansXml.length() == 0; - assert webInf.listFiles(WEB_XML_FILTER).length == 1; - File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; - assert webXml.isFile(); - assert webXml.getName().equals("web.xml"); - assert webXml.length() != 0; - File currentPackage = getCurrentPackageAsFile(root); - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - } - - private File getCurrentPackageAsFile(File root) - { - String[] packageHierarchy = getClass().getPackage().getName().split("\\."); - for (final String packageName : packageHierarchy) - { - File[] files = root.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals(packageName); - } - - }); - if (files.length == 1) - { - root = files[0]; - } - else - { - throw new IllegalStateException("Unable to traverse package hierarchy " + packageHierarchy); - } - } - return root; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test; - -class Cow -{ - -} Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -4,7 +4,7 @@ import java.io.FilenameFilter; import java.util.Arrays; -import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.packaging.Artifact; import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; import org.testng.annotations.Test; @@ -14,9 +14,9 @@ @Test public void testAllClassesInPackage() throws Exception { - WarArtifact war = new WarArtifact(); - war.getPackages().add(ArtifactTest.class.getPackage()); - File root = war.create(); + Artifact artifact = new Artifact(); + artifact.getPackages().add(ArtifactTest.class.getPackage()); + File root = artifact.create(); File currentPackage = getCurrentPackageAsFile(root); System.out.println(Arrays.asList(currentPackage.listFiles())); assert currentPackage.listFiles().length == 6; Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.packaging.Artifact; import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; import org.testng.annotations.Test; @@ -13,9 +13,9 @@ @Test public void testAllClassesInPackageAndNotSubPackages() throws Exception { - WarArtifact war = new WarArtifact(); - war.getPackages().add(ArtifactTest.class.getPackage()); - File root = war.create(); + Artifact artifact = new Artifact(); + artifact.getPackages().add(ArtifactTest.class.getPackage()); + File root = artifact.create(); File currentPackage = getCurrentPackageAsFile(root); assert currentPackage.listFiles().length == 4; File[] cowClasses = currentPackage.listFiles(new FilenameFilter()

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1398 - in tck/trunk/impl/src: main/java/org/jboss/webbeans/tck/impl/packaging/standard/war and 8 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-03 18:23:24 -0500 (Tue, 03 Feb 2009) New Revision: 1398 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java Log: Support for including all classes in a package Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java 2009-02-03 22:14:04 UTC (rev 1397) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -1,28 +1,115 @@ package org.jboss.webbeans.tck.impl.packaging; +import static org.jboss.webbeans.tck.impl.util.Reflections.loadResourceAsStream; +import static org.jboss.webbeans.tck.impl.util.Reflections.loadResources; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLDecoder; import java.util.HashSet; import java.util.Random; import java.util.Set; import java.util.jar.JarInputStream; +import org.apache.log4j.Logger; + public class Artifact { + /** + * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} + * + * @author Thomas Heute + * @author Gavin King + * @author Norman Richards + * @author Pete Muir + * + */ + private static class URLPackageScanner + { + private static final Logger log = Logger.getLogger(URLPackageScanner.class); + + private final Package pkg; + + private final Set<String> classes = new HashSet<String>(); + + public URLPackageScanner(Package pkg) + { + this.pkg = pkg; + } + + private void scanPackage() + { + try + { + Set<String> paths = new HashSet<String>(); + String packageName = pkg.getName().replace(".", "/"); + for (URL url : loadResources(packageName)) + { + String urlPath = url.getFile(); + urlPath = URLDecoder.decode(urlPath, "UTF-8"); + if ( urlPath.startsWith("file:") ) + { + urlPath = urlPath.substring(5); + } + if ( urlPath.indexOf('!')>0 ) + { + urlPath = urlPath.substring(0, urlPath.indexOf('!')); + } + paths.add(urlPath); + } + handle(paths); + } + catch (IOException ioe) + { + log.warn("could not read: " + pkg.getName(), ioe); + } + } + + private void handle(Set<String> paths) + { + for ( String urlPath: paths ) + { + log.trace("scanning: " + urlPath); + File file = new File(urlPath); + if ( file.isDirectory() ) + { + for ( File child: file.listFiles() ) + { + if ( !child.isDirectory() ) + { + classes.add(pkg.getName() + "." + child.getName().substring(0, child.getName().lastIndexOf(".class"))); + } + } + } + } + } + + public Set<String> getClassNames() + { + scanPackage(); + return classes; + } + + } + + public static final Random random = new Random(System.currentTimeMillis()); - private Set<Class<?>> classes; - private Set<ResourceDescriptor> resources; + private final Set<Class<?>> classes; + private final Set<Package> packages; + private final Set<ResourceDescriptor> resources; public Artifact() { classes = new HashSet<Class<?>>(); resources = new HashSet<ResourceDescriptor>(); + packages = new HashSet<Package>(); } public JarInputStream asJar() throws IOException @@ -37,15 +124,16 @@ root.deleteOnExit(); for (Class<?> clazz : getClasses()) { - String classFilePathName = getClassFileName(clazz.getName()); - String directoryName = classFilePathName.substring(0, classFilePathName.lastIndexOf("/")); - String classFileName = classFilePathName.substring(classFilePathName.lastIndexOf("/") + 1); - File packageDirectory = makeDirectoryStructure(root, directoryName); - File classFile = new File(packageDirectory, classFileName); - classFile.createNewFile(); - classFile.deleteOnExit(); - copy(loadResourceAsStream(classFilePathName), classFile); + copyClass(clazz, root); } + for (Package pkg : getPackages()) + { + URLPackageScanner packageScanner = new URLPackageScanner(pkg); + for (String className : packageScanner.getClassNames()) + { + copyClass(className, root); + } + } for (ResourceDescriptor resourceDescriptor : getResources()) { String directoryName = resourceDescriptor.getName().substring(0, resourceDescriptor.getName().lastIndexOf("/")); @@ -59,6 +147,23 @@ return root; } + private static void copyClass(Class<?> clazz, File root) throws IOException + { + copyClass(clazz.getName(), root); + } + + private static void copyClass(String className, File root) throws IOException + { + String classFilePathName = getClassFileName(className); + String directoryName = classFilePathName.substring(0, classFilePathName.lastIndexOf("/")); + String classFileName = classFilePathName.substring(classFilePathName.lastIndexOf("/") + 1); + File packageDirectory = makeDirectoryStructure(root, directoryName); + File classFile = new File(packageDirectory, classFileName); + classFile.createNewFile(); + classFile.deleteOnExit(); + copy(loadResourceAsStream(classFilePathName), classFile); + } + private static File makeDirectoryStructure(File root, String directoryName) { for (String directory : directoryName.split("\\/")) @@ -94,39 +199,6 @@ } - protected static InputStream loadResourceAsStream(String name) - { - InputStream is = null; - if (Thread.currentThread().getContextClassLoader() != null) - { - is = Thread.currentThread().getContextClassLoader().getResourceAsStream(name); - } - if (is == null) - { - is = Artifact.class.getResourceAsStream(name); - } - return is; - } - - protected static URL loadResource(String name) - { - URL url = null; - if (Thread.currentThread().getContextClassLoader() != null) - { - url = Thread.currentThread().getContextClassLoader().getResource(name); - } - if (url == null) - { - url = Artifact.class.getResource(name); - } - return url; - } - - public void setClasses(Set<Class<?>> classes) - { - this.classes = classes; - } - public Set<Class<?>> getClasses() { return classes; @@ -137,9 +209,9 @@ return resources; } - public void setResources(Set<ResourceDescriptor> resources) + public Set<Package> getPackages() { - this.resources = resources; + return packages; } } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.impl.packaging; + +import org.jboss.webbeans.tck.AbstractTest; +import org.jboss.webbeans.tck.impl.WebBeansTCKImpl; + +public class TCKArtifact extends Artifact +{ + + public TCKArtifact() + { + super(); + getClasses().add(AbstractTest.class); + getClasses().add(WebBeansTCKImpl.class); + } + + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java 2009-02-03 22:14:04 UTC (rev 1397) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -1,5 +1,7 @@ package org.jboss.webbeans.tck.impl.packaging.standard.war; +import static org.jboss.webbeans.tck.impl.util.Reflections.loadResource; + import java.net.URL; import java.util.Arrays; import java.util.HashSet; @@ -20,7 +22,7 @@ public static WarArtifact of(Class<?>... classes) { WarArtifact war = new WarArtifact(); - war.setClasses(new HashSet<Class<?>>(Arrays.asList(classes))); + war.getClasses().addAll(new HashSet<Class<?>>(Arrays.asList(classes))); return war; } @@ -29,7 +31,7 @@ Set<ResourceDescriptor> standardResources = new HashSet<ResourceDescriptor>(); standardResources.add(new ResourceDescriptor(BEANS_XML_DESTINATION, getBeansXmlSource())); standardResources.add(new ResourceDescriptor(WEB_XML_DESTINATION, getWebXmlSource())); - setResources(standardResources); + getResources().addAll((standardResources)); } public URL getBeansXmlSource() Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java 2009-02-03 22:14:04 UTC (rev 1397) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -1,11 +1,17 @@ package org.jboss.webbeans.tck.impl.util; +import java.io.IOException; +import java.io.InputStream; import java.lang.annotation.Annotation; +import java.net.URL; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import java.util.Set; +import org.jboss.webbeans.tck.impl.packaging.Artifact; + /** * Utility class for static reflection-type operations * @@ -38,5 +44,47 @@ } return annotationTypeList.size() == 0; } + + public static InputStream loadResourceAsStream(String name) + { + InputStream is = null; + if (Thread.currentThread().getContextClassLoader() != null) + { + is = Thread.currentThread().getContextClassLoader().getResourceAsStream(name); + } + if (is == null) + { + is = Artifact.class.getResourceAsStream(name); + } + return is; + } + + public static URL loadResource(String name) + { + URL url = null; + if (Thread.currentThread().getContextClassLoader() != null) + { + url = Thread.currentThread().getContextClassLoader().getResource(name); + } + if (url == null) + { + url = Artifact.class.getResource(name); + } + return url; + } + + public static Iterable<URL> loadResources(String name) throws IOException + { + Enumeration<URL> urls = null; + if (Thread.currentThread().getContextClassLoader() != null) + { + urls = Thread.currentThread().getContextClassLoader().getResources(name); + } + if (urls == null) + { + urls = Artifact.class.getClassLoader().getResources(name); + } + return new EnumerationIterable<URL>(urls); + } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java 2009-02-03 22:14:04 UTC (rev 1397) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -11,7 +11,6 @@ this.chunky = chunky; } - @Override public boolean realChunky() { return chunky; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java 2009-02-03 22:14:04 UTC (rev 1397) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -11,7 +11,6 @@ this.clipped = clipped; } - @Override public boolean clipped() { return clipped; Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,66 @@ +package org.jboss.webbeans.tck.impl.test.packaging; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.Arrays; + +public abstract class AbstractArtifactTest +{ + + protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.equals("WEB-INF"); + } + }; + + protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("beans.xml"); + } + + }; + + + + protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("web.xml"); + } + + }; + + protected File getCurrentPackageAsFile(File root) + { + String[] packageHierarchy = getClass().getPackage().getName().split("\\."); + for (final String packageName : packageHierarchy) + { + File[] files = root.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals(packageName); + } + + }); + if (files.length == 1) + { + root = files[0]; + } + else + { + throw new IllegalStateException("Unable to traverse package hierarchy " + Arrays.asList(packageHierarchy) + ", unable to open directory " + packageName); + } + } + return root; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,61 @@ +package org.jboss.webbeans.tck.impl.test.packaging.all; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.Arrays; + +import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class ArtifactTest extends AbstractArtifactTest +{ + + @Test + public void testAllClassesInPackage() throws Exception + { + WarArtifact war = new WarArtifact(); + war.getPackages().add(ArtifactTest.class.getPackage()); + File root = war.create(); + File currentPackage = getCurrentPackageAsFile(root); + System.out.println(Arrays.asList(currentPackage.listFiles())); + assert currentPackage.listFiles().length == 6; + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + File[] foxClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Fox.class"); + } + + }); + assert foxClasses.length == 1; + assert foxClasses[0].getName().equals("Fox.class"); + assert foxClasses[0].isFile(); + + File[] testClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.startsWith("ArtifactTest"); + } + + }); + assert testClasses.length == 4; + + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.impl.test.packaging.all; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.impl.test.packaging.all; + +class Fox +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java (from rev 1396, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,51 @@ +package org.jboss.webbeans.tck.impl.test.packaging.defined; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class ArtifactTest extends AbstractArtifactTest +{ + + @Test + public void testDefaultWar() throws Exception + { + WarArtifact war = new WarArtifact(); + war.getClasses().add(Cow.class); + File root = war.create(); + assert root.listFiles().length == 2; + assert root.isDirectory(); + assert root.listFiles(WEB_INF_FILTER).length == 1; + File webInf = root.listFiles(WEB_INF_FILTER)[0]; + assert webInf.getName().equals("WEB-INF"); + assert webInf.isDirectory(); + assert webInf.listFiles().length == 2; + assert webInf.listFiles(BEANS_XML_FILTER).length == 1; + File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0]; + assert beansXml.isFile(); + assert beansXml.getName().equals("beans.xml"); + assert beansXml.length() == 0; + assert webInf.listFiles(WEB_XML_FILTER).length == 1; + File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; + assert webXml.isFile(); + assert webXml.getName().equals("web.xml"); + assert webXml.length() != 0; + File currentPackage = getCurrentPackageAsFile(root); + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/ArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/Cow.java (from rev 1396, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/Cow.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.impl.test.packaging.defined; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/defined/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,46 @@ +package org.jboss.webbeans.tck.impl.test.packaging.subpackages; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class ArtifactTest extends AbstractArtifactTest +{ + + @Test + public void testAllClassesInPackageAndNotSubPackages() throws Exception + { + WarArtifact war = new WarArtifact(); + war.getPackages().add(ArtifactTest.class.getPackage()); + File root = war.create(); + File currentPackage = getCurrentPackageAsFile(root); + assert currentPackage.listFiles().length == 4; + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + + File[] testClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.startsWith("ArtifactTest"); + } + + }); + assert testClasses.length == 3; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.impl.test.packaging.subpackages; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java 2009-02-03 23:23:24 UTC (rev 1398) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.impl.test.packaging.subpackages.pests; + +class Fox +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1397 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: definition/deployment and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-02-03 17:14:04 -0500 (Tue, 03 Feb 2009) New Revision: 1397 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java Log: Verified tests are at PRD2 version. Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-03 22:14:04 UTC (rev 1397) @@ -6,6 +6,7 @@ import javax.context.Contextual; import javax.context.CreationalContext; import javax.context.SessionScoped; +import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; @@ -43,11 +44,13 @@ public void testGetReturnsExistingInstance() { deployBeans(MySessionBean.class); - MySessionBean beanInstance = manager.getInstanceByType(MySessionBean.class); Contextual<MySessionBean> mySessionBean = manager.resolveByType(MySessionBean.class).iterator().next(); + MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + MySessionBean beanInstance = manager.getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); + assert beanInstance != null; MySessionBean beanInstanceFromGet = manager.getContext(SessionScoped.class).get(mySessionBean); - assert beanInstanceFromGet.equals(beanInstance); + assert beanInstanceFromGet == beanInstance; } /** @@ -150,12 +153,28 @@ * A destroyed instance must not subsequently be returned by the get() * method. */ - @Test(groups = { "contexts", "stub", "underInvestigation" }) + @Test(groups = { "contexts", "broken" }) @SpecAssertion(section = "8.1", id = "unknown") public void testDestroyedInstanceMustNotBeReturnedByGet() { - //TODO How is an instance destroyed such that the context is not and could later return the same instance - assert false; + deployBeans(MySessionBean.class, MyApplicationBean.class); + Bean<MySessionBean> mySessionBean = manager.resolveByType(MySessionBean.class).iterator().next(); + MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); + MySessionBean beanInstance = manager.getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); + assert beanInstance != null; + mySessionBean.destroy(beanInstance); + MySessionBean beanInstanceFromGet = manager.getContext(SessionScoped.class).get(mySessionBean); + assert beanInstanceFromGet != beanInstance; + + Bean<MyApplicationBean> myApplicationBean = manager.resolveByType(MyApplicationBean.class).iterator().next(); + MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>(); + MyApplicationBean myApplicationBeanInstance = manager.getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication); + assert myApplicationBeanInstance != null; + myApplicationBean.destroy(myApplicationBeanInstance); + + MyApplicationBean mySecondApplicationBeanInstance = manager.getContext(ApplicationScoped.class).get(myApplicationBean); + assert mySecondApplicationBeanInstance != null; + assert myApplicationBeanInstance != mySecondApplicationBeanInstance; } /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-03 15:47:47 UTC (rev 1396) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-03 22:14:04 UTC (rev 1397) @@ -1,7 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.deployment; import java.lang.annotation.Annotation; -import java.lang.reflect.Method; import java.util.List; import javax.inject.DefinitionException; @@ -17,12 +16,12 @@ /** * - * Spec version: PRD2 - * + * Spec version: Public Release Draft 2 + * */ public class DeploymentTypeDefinitionTest extends AbstractTest { - + @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { @@ -30,151 +29,240 @@ deploymentTypes.add(AnotherDeploymentType.class); deploymentTypes.add(HornedAnimalDeploymentType.class); deploymentTypes.add(NotInheritedDeploymentType.class); + deploymentTypes.add(InheritedDeploymentType.class); return deploymentTypes; } - - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section="2.5.1", id = "unknown") + + /** + * No bean may be declared with the (@Standard-bean) deployment type unless + * explicitly required by this specification. + */ + @Test(groups = { "deploymentType" }, expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "2.5.1", id = "unknown") public void testNonBuiltInComponentUsesStandard() { - createSimpleBean(Gazelle_Broken.class); + deployBeans(Gazelle_Broken.class); } - - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.5.2", id = "unknown") + + /** + * A deployment type is a Java annotation defined as @Target({TYPE, METHOD, + * FIELD}) and @Retention(RUNTIME). + * + * TODO This text is not really a testable assertion + */ + @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) + @SpecAssertion(section = "2.5.2", id = "unknown") public void testDeploymentTypeHasCorrectTarget() { assert false; } - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.5.2", id = "unknown") + /** + * A deployment type is a Java annotation defined as @Target({TYPE, METHOD, + * FIELD}) and @Retention(RUNTIME). + * + * TODO This text is not really a testable assertion + */ + @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) + @SpecAssertion(section = "2.5.2", id = "unknown") public void testDeploymentTypeHasCorrectRetention() { assert false; } - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.5.2", id = "unknown") - public void testDeploymentTypeDeclaresScopeTypeAnnotation() + /** + * All de- ployment types must also specify the @javax.inject.DeploymentType + * meta-annotation. + * + * TODO This text is not really a testable assertion + */ + @Test(groups = { "stub", "annotationDefinition", "deploymentType" }) + @SpecAssertion(section = "2.5.2", id = "unknown") + public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() { assert false; } - - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section="2.5.3", id = "unknown") + + /** + * An bean class or producer method or field may specify at most one + * deployment type. If multiple deployment type annotations are specified, a + * DefinitionException is thrown by the container at deployment time. + */ + @Test(groups = { "deploymentType" }, expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "2.5.3", id = "unknown") public void testTooManyDeploymentTypes() { - createSimpleBean(BeanWithTooManyDeploymentTypes_Broken.class); + deployBeans(BeanWithTooManyDeploymentTypes_Broken.class); } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.5.3", id = "unknown") + + /** + * By default, if no deployment type annotation is explicitly specified, a + * producer method or field inherits the deployment type of the bean in which + * it is defined. + * + * @throws Exception + */ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.3", id = "unknown") public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - manager.addBean(bean); - Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = createProducerMethodBean(method, bean); + deployBeans(SpiderProducer.class); + Bean<BlackWidow> blackWidowSpiderModel = manager.resolveByType(BlackWidow.class).iterator().next(); assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); } - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.5.4", id = "unknown") - public void testXmlDeploymentTypeOverridesJava() + + /** + * When a bean is declared in beans.xml, the deployment type may be specified + * using a tag with the annotation type name: + * + * TODO Section 2.5.4 does not claim that XML overrides Java for deployment + * types + */ + @Test(groups = { "stub", "webbeansxml", "deploymentType" }) + @SpecAssertion(section = "2.5.4", id = "unknown") + public void testXmlDeploymentTypeElement() { - //Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); - //AnnotatedClass<BeanWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedClass<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); - - //SimpleBean<BeanWithTooManyDeploymentTypes> model = createSimpleBean(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotatedItem, manager); - //assert model.getDeploymentType().equals(AnotherDeploymentType.class); + // Map<Class<? extends Annotation>, Annotation> + // xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends + // Annotation>, Annotation>(); + // xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, + // new AnotherDeploymentTypeAnnotationLiteral()); + // AnnotatedClass<BeanWithTooManyDeploymentTypes> + // xmlDefinedDeploymentTypeAnnotatedItem = new + // SimpleAnnotatedClass<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, + // xmlDefinedDeploymentTypeAnnotations); + + // SimpleBean<BeanWithTooManyDeploymentTypes> model = + // createSimpleBean(BeanWithTooManyDeploymentTypes.class, + // xmlDefinedDeploymentTypeAnnotatedItem, manager); + // assert model.getDeploymentType().equals(AnotherDeploymentType.class); assert false; } - - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.5.4", id = "unknown") - public void testXmlRespectsJavaDeploymentType() + /** + * The default deployment type for a bean which does not explicitly declare a + * deployment type depends upon its declared stereotypes: + * + * • If a bean does not declare any stereotype with a declared default + * deployment type, then the default deployment type is (@Production-bean). + * + */ + @Test(groups = { "webbeansxml", "deploymentType" }) + @SpecAssertion(section = "2.5.5", id = "unknown") + public void testDefaultDeploymentType() { - //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); - //SimpleBean<Tuna> tuna = createSimpleBean(Tuna.class, annotatedItem, manager); - //assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); - assert false; + deployBeans(BlackWidow.class); + Bean<BlackWidow> bean = manager.resolveByType(BlackWidow.class).iterator().next(); + assert bean.getDeploymentType().equals(Production.class); } - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.5.5", id = "unknown") - public void testXmlDefaultDeploymentType() - { - //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, antelopeAnnotatedItem, manager); - // assert antelope.getDeploymentType().equals(Production.class); - assert false; - } - - @Test @SpecAssertion(section="2.5.5", id = "unknown") + + /** + * • Otherwise, the default deployment type for the bean is the + * highest-precedence default deployment type declared by any stereotype + * declared by the bean. + */ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.5", id = "unknown") public void testHighestPrecedenceDeploymentTypeFromStereotype() { - Bean<?> bean = createSimpleBean(Rhinoceros.class); + deployBeans(Rhinoceros.class); + Bean<?> bean = manager.resolveByType(Rhinoceros.class).iterator().next(); assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); } - - @SuppressWarnings("unchecked") - @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) - @SpecAssertion(section="2.5.6", id = "unknown") + + /** + * If the deployment type is enabled, an instance of the bean may be obtained + * by lookup, injection or EL resolution. Otherwise, the bean is never + * instantiated by the container. + */ + @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedDependencyException.class) + @SpecAssertion(section = "2.5.6", id = "unknown") public void testBeanWithDisabledDeploymentTypeNotInstantiated() - { - Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class); - manager.addBean(bean); + { + deployBeans(RedSnapper.class); manager.getInstanceByType(RedSnapper.class); } - - - - @Test(groups={"stub", "webbeansxml"}, expectedExceptions=DeploymentException.class) - @SpecAssertion(section="2.5.6", id = "unknown") + /** + * If more than one deployment type is specified in XML, a + * DefinitionException is thrown by the container at deployment time. + */ + @Test(groups = { "stub", "webbeansxml", "deploymentType" }, expectedExceptions = DeploymentException.class) + @SpecAssertion(section = "2.5.4", id = "unknown") public void testMultipleDeployElementsCannotBeDefined() { - + } - - @Test - @SpecAssertions({ - @SpecAssertion(section= "2.5.5", id = "unknown"), - @SpecAssertion(section = "2.7.2", id = "unknown"), - @SpecAssertion(section = "4.1", id = "unknown") - }) + + /** + * If a bean explicitly declares a deployment type, any default deployment + * type declared by stereotypes are ignored. + */ + @Test(groups = { "deploymentType" }) + @SpecAssertions( { @SpecAssertion(section = "2.5.5", id = "unknown"), @SpecAssertion(section = "2.7.2", id = "unknown"), @SpecAssertion(section = "4.1", id = "unknown") }) public void testWebBeanDeploymentTypeOverridesStereotype() { - Bean<Reindeer> bean = createSimpleBean(Reindeer.class); + deployBeans(Reindeer.class); + Bean<Reindeer> bean = manager.resolveByType(Reindeer.class).iterator().next(); assert bean.getDeploymentType().equals(Production.class); } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + /** + * If X is annotated with a deployment type Z then Y inherits the annotation + * if and only if Z declares the @Inherited meta-annotation and neither Y nor + * any intermediate class that is a subclass of X and a superclass of Y + * declares a deployment type. + * + * @throws Exception + */ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "unknown") public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception { - assert createSimpleBean(BorderCollie.class).getDeploymentType().equals(AnotherDeploymentType.class); + deployBeans(BorderCollie.class); + assert manager.resolveByType(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + /** + * If X is annotated with a deployment type Z then Y inherits the annotation + * if and only if Z declares the @Inherited meta-annotation and neither Y nor + * any intermediate class that is a subclass of X and a superclass of Y + * declares a deployment type. + */ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "unknown") public void testDeploymentTypeNotDeclaredInheritedIsNotInherited() { - assert createSimpleBean(ShetlandPony.class).getDeploymentType().equals(Production.class); + deployBeans(ShetlandPony.class); + assert manager.resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + /** + * If X is annotated with a deployment type Z then Y inherits the annotation + * if and only if Z declares the @Inherited meta-annotation and neither Y nor + * any intermediate class that is a subclass of X and a superclass of Y + * declares a deployment type. + */ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "unknown") public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeNotMarkedInherited() { - assert createSimpleBean(GoldenRetriever.class).getDeploymentType().equals(Production.class); + deployBeans(GoldenRetriever.class); + assert manager.resolveByType(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class); } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + /** + * If X is annotated with a deployment type Z then Y inherits the annotation + * if and only if Z declares the @Inherited meta-annotation and neither Y nor + * any intermediate class that is a subclass of X and a superclass of Y + * declares a deployment type. + */ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "4.1", id = "unknown") public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeMarkedInherited() { - assert createSimpleBean(GoldenLabrador.class).getDeploymentType().equals(InheritedDeploymentType.class); + deployBeans(GoldenLabrador.class); + assert manager.resolveByType(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class); } - + }

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1396 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck: integration/context and 6 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-02-03 10:47:47 -0500 (Tue, 03 Feb 2009) New Revision: 1396 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecVersion.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java Log: Moved misplaced integration tests and removed the SpecVersion annotation. Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecVersion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecVersion.java 2009-02-03 15:22:56 UTC (rev 1395) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecVersion.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.webbeans.tck.impl; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -/** - * @author Pete Muir - * - */ -@Documented -(a)Target(ElementType.TYPE) -public @interface SpecVersion -{ - String value(); -} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.tck.integration.context; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + */ +public class ContextTest +{ + /** + * The built-in contexts do not propagate across remote method invocations or + * to asynchronous processes such as JMS message listeners or EJB timer + * service timeouts + */ + @Test(groups = { "stub", "contexts", "integration" }) + @SpecAssertion(section = "8.5", id = "unknown") + public void testBuiltInNormalScopedContextsDoNotPropagateAcrossRemoteMethodInvocations() + { + assert false; + } + + /** + * The built-in contexts do not propagate across remote method invocations or + * to asynchronous processes such as JMS message listeners or EJB timer + * service timeouts + */ + @Test(groups = { "stub", "contexts", "integration" }) + @SpecAssertion(section = "8.5", id = "unknown") + public void testBuiltInNormalScopedContextsDoNotPropagateAcrossAsynchronousMethodInvocations() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.tck.integration.context.dependent; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.testng.annotations.Test; + +/** + * Spec version: Public Release Draft 2 + */ +public class DependentContextTest +{ + /** + * when the container is injecting dependencies of an EJB or servlet or when + * a @PostConstruct or @PreDestroy callback is invoked by the EJB container. + */ + @Test(groups = { "contexts", "injection", "stub", "ejb3", "integration" }) + @SpecAssertion(section = "8.3", id = "unknown") + public void testContextIsActiveDuringEJBDependencyInjection() + { + assert false; + } + + /** + * destroy all dependent objects of an EJB bean or Servlet when the EJB bean + * or Servlet is destroyed, + */ + @Test(groups = { "stub", "contexts", "ejb3", "integration" }) + @SpecAssertion(section = "8.3.2", id = "unknown") + public void testDestroyingEjbDestroysDependents() + { + assert false; + } + + /** + * destroy all dependent objects of an EJB bean or Servlet when the EJB bean + * or Servlet is destroyed, + */ + @Test(groups = { "stub", "contexts", "servlet", "integration" }) + @SpecAssertion(section = "8.3.2", id = "unknown") + public void testDestroyingServletDestroysDependents() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-03 15:22:56 UTC (rev 1395) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -1,14 +1,16 @@ package org.jboss.webbeans.tck.integration.context.passivating; +import javax.inject.IllegalProductException; + import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.testng.annotations.Test; /** * - * @author Nicklas Karlsson + * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: PRD2 */ public class PassivatingContextTest extends AbstractTest { @@ -24,7 +26,6 @@ deployBeans(Turku.class); } - /** * The Web Bean manager must guarantee that JMS endpoint proxy objects are * serializable. @@ -35,4 +36,24 @@ { assert false; } + + /** + * If a producer method or field of scope @Dependent returns a + * non-serializable object for injection into a stateful session bean, into a + * non-transient field, Web Bean constructor parameter or initializer method + * parameter of a Web Bean which declares a passivating scope type, or into a + * parameter of a producer method which declares a passivating scope type, an + * IllegalProductException is thrown by the Web Bean manager. + * + * @throws NoSuchMethodException + * @throws SecurityException + */ + @Test(groups = { "contexts", "passivation", "integration", "broken" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "unknown") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException + { + deployBeans(CityProducer2.class, Maarianhamina_Broken.class); + manager.getInstanceByType(Maarianhamina_Broken.class); + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-03 15:22:56 UTC (rev 1395) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -2,7 +2,6 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; import org.testng.annotations.Test; /** @@ -16,8 +15,9 @@ * * @author Nicklas Karlsson * + * Spec version: Public Release Draft 2 + * */ -@SpecVersion("PRD2") public class EnterpriseBeanLifecycleTest extends AbstractTest { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-03 15:22:56 UTC (rev 1395) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -20,17 +20,17 @@ */ public class ContextTest extends AbstractTest { - + private @interface Dummy { - + } - + private @interface Unregistered - { - + { + } - + private static class DummyContext implements Context { @@ -38,7 +38,7 @@ { throw new UnsupportedOperationException(); } - + public <T> T get(Contextual<T> contextual) { return get(contextual, null); @@ -52,42 +52,46 @@ public boolean isActive() { return true; - } + } } - - @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) - @SpecAssertion(section="8.5", id = "unknown") + + @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) + @SpecAssertion(section = "8.5", id = "unknown") public void testGetContextWithNoActiveContextsFails() { configuration().getContexts().setInactive(configuration().getContexts().getRequestContext()); manager.getContext(RequestScoped.class); } - @Test(expectedExceptions={IllegalArgumentException.class}, groups={"manager"}) - @SpecAssertion(section="8.5", id = "unknown") + @Test(expectedExceptions = { IllegalArgumentException.class }, groups = { "manager" }) + @SpecAssertion(section = "8.5", id = "unknown") public void testGetContextWithTooManyActiveContextsFails() { - Context firstContext = new DummyContext() {}; - Context secondContext = new DummyContext() {}; + Context firstContext = new DummyContext() + { + }; + Context secondContext = new DummyContext() + { + }; manager.addContext(firstContext); manager.addContext(secondContext); manager.getContext(Dummy.class); } - @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) - @SpecAssertion(section="8.5", id = "unknown") + @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) + @SpecAssertion(section = "8.5", id = "unknown") public void testGetContextWithNoRegisteredContextsFails() { manager.getContext(Unregistered.class); } - @Test(groups={"manager"}) - @SpecAssertion(section="8.5", id = "unknown") + @Test(groups = { "manager" }) + @SpecAssertion(section = "8.5", id = "unknown") public void testGetContextReturnsActiveContext() { manager.getContext(RequestScoped.class); } - + /** * For each of the built-in normal scopes, contexts propagate across any Java * method call, including invocation of EJB local business methods. @@ -99,28 +103,4 @@ assert false; } - /** - * The built-in contexts do not propagate across remote method invocations or - * to asynchronous processes such as JMS message listeners or EJB timer - * service timeouts - */ - @Test(groups = { "stub", "contexts", "integration" }) - @SpecAssertion(section = "8.5", id = "unknown") - public void testBuiltInNormalScopedContextsDoNotPropagateAcrossRemoteMethodInvocations() - { - assert false; - } - - /** - * The built-in contexts do not propagate across remote method invocations or - * to asynchronous processes such as JMS message listeners or EJB timer - * service timeouts - */ - @Test(groups = { "stub", "contexts", "integration" }) - @SpecAssertion(section = "8.5", id = "unknown") - public void testBuiltInNormalScopedContextsDoNotPropagateAcrossAsynchronousMethodInvocations() - { - assert false; - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-03 15:22:56 UTC (rev 1395) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -11,10 +11,11 @@ import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; import org.testng.annotations.Test; -@SpecVersion("PRD2") +/** + * Spec version: Public Release Draft 2 + */ public class DependentContextTest extends AbstractTest { /** @@ -308,17 +309,6 @@ * when the container is injecting dependencies of an EJB or servlet or when * a @PostConstruct or @PreDestroy callback is invoked by the EJB container. */ - @Test(groups = { "contexts", "injection", "stub", "ejb3", "integration" }) - @SpecAssertion(section = "8.3", id = "unknown") - public void testContextIsActiveDuringEJBDependencyInjection() - { - assert false; - } - - /** - * when the container is injecting dependencies of an EJB or servlet or when - * a @PostConstruct or @PreDestroy callback is invoked by the EJB container. - */ @Test(groups = { "contexts", "injection", "stub", "servlet" }) @SpecAssertion(section = "8.3", id = "unknown") public void testContextIsActiveDuringServletDependencyInjection() @@ -394,28 +384,6 @@ } /** - * destroy all dependent objects of an EJB bean or Servlet when the EJB bean - * or Servlet is destroyed, - */ - @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.3.2", id = "unknown") - public void testDestroyingEjbDestroysDependents() - { - assert false; - } - - /** - * destroy all dependent objects of an EJB bean or Servlet when the EJB bean - * or Servlet is destroyed, - */ - @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.3.2", id = "unknown") - public void testDestroyingServletDestroysDependents() - { - assert false; - } - - /** * destroy all @Dependent scoped contextual instances created during an EL * expression evaluation when the evaluation completes, and */ Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-03 15:22:56 UTC (rev 1395) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-03 15:47:47 UTC (rev 1396) @@ -282,26 +282,7 @@ * parameter of a Web Bean which declares a passivating scope type, or into a * parameter of a producer method which declares a passivating scope type, an * IllegalProductException is thrown by the Web Bean manager. - * - * @throws NoSuchMethodException - * @throws SecurityException */ - @Test(groups = { "contexts", "passivation", "integration", "broken" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "unknown") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException - { - deployBeans(CityProducer2.class, Maarianhamina_Broken.class); - manager.getInstanceByType(Maarianhamina_Broken.class); - } - - /** - * If a producer method or field of scope @Dependent returns a - * non-serializable object for injection into a stateful session bean, into a - * non-transient field, Web Bean constructor parameter or initializer method - * parameter of a Web Bean which declares a passivating scope type, or into a - * parameter of a producer method which declares a passivating scope type, an - * IllegalProductException is thrown by the Web Bean manager. - */ @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) @SpecAssertion(section = "8.4", id = "unknown") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails()

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1395 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-02-03 10:22:56 -0500 (Tue, 03 Feb 2009) New Revision: 1395 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/MockCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SynchronousBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/TameBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/WhitefishBinding.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tarantula.java Log: Fixes to definition tests for annotation bindings. Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-03 12:17:38 UTC (rev 1394) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -1,8 +1,6 @@ package org.jboss.webbeans.tck.unit.definition.binding; - import java.lang.annotation.Annotation; -import java.lang.reflect.Method; import java.util.List; import java.util.Set; @@ -14,8 +12,6 @@ import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecAssertions; import org.jboss.webbeans.tck.impl.literals.CurrentBinding; -import org.jboss.webbeans.tck.impl.util.MockCreationalContext; -import org.jboss.webbeans.tck.impl.util.Reflections; import org.testng.annotations.Test; /** @@ -23,7 +19,7 @@ */ public class BindingDefinitionTest extends AbstractTest { - + @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { @@ -31,185 +27,202 @@ deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.3.3", id = "unknown"), - @SpecAssertion(section = "2.3.1", id = "unknown") - }) + + @Test + @SpecAssertions( { @SpecAssertion(section = "2.3.3", id = "unknown"), @SpecAssertion(section = "2.3.1", id = "unknown") }) public void testDefaultBindingDeclaredInJava() - { - Bean<Order> order = createSimpleBean(Order.class); + { + deployBeans(Order.class); + Bean<Order> order = manager.resolveByType(Order.class).iterator().next(); assert order.getBindings().size() == 1; order.getBindings().iterator().next().annotationType().equals(Production.class); } - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.3.2", id = "unknown") + @Test(groups = { "stub", "annotationDefinition", "underInvestigation" }) + @SpecAssertion(section = "2.3.2", id = "unknown") public void testBindingHasCorrectTarget() { + // TODO This is only a definition without any real assertion about a given + // binding type + // If there are many binding types, how do we find them? assert false; } - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.3.2", id = "unknown") + @Test(groups = { "stub", "annotationDefinition", "underInvestigation" }) + @SpecAssertion(section = "2.3.2", id = "unknown") public void testBindingHasCorrectRetention() { + // TODO This is only a definition without any real assertion about a given + // binding type + // If there are many binding types, how do we find them? assert false; } - @Test(groups={"stub", "annotationDefinition"}) - @SpecAssertion(section="2.3.2", id = "unknown") + @Test(groups = { "annotationDefinition" }) + @SpecAssertion(section = "2.3.2", id = "unknown") public void testBindingDeclaresBindingAnnotation() { - assert false; + deployBeans(SpiderProducer.class); + assert !manager.resolveByType(Tarantula.class, new TameBinding()).isEmpty(); } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.3.3", id = "unknown") + + @Test + @SpecAssertion(section = "2.3.3", id = "unknown") public void testBindingsDeclaredInJava() - { - Bean<Cat> cat = createSimpleBean(Cat.class); + { + deployBeans(Cat.class); + Bean<Cat> cat = manager.resolveByType(Cat.class, new SynchronousBinding()).iterator().next(); assert cat.getBindings().size() == 1; - assert Reflections.annotationSetMatches(cat.getBindings(), Synchronous.class); + assert cat.getBindings().contains(new SynchronousBinding()); } - - @Test @SpecAssertion(section="2.3.3", id = "unknown") + + @Test + @SpecAssertion(section = "2.3.3", id = "unknown") public void testMultipleBindings() - { - Bean<?> model = createSimpleBean(Cod.class); + { + deployBeans(Cod.class); + Bean<?> model = manager.resolveByType(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next(); assert model.getBindings().size() == 2; } - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.3.4", id = "unknown") + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "2.3.4", id = "unknown") public void testBindingsDeclaredInXml() { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, annotations); - - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, annotatedItem, manager); - // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); + // Map<Class<? extends Annotation>, Annotation> annotations = new + // HashMap<Class<? extends Annotation>, Annotation>(); + // annotations.put(Asynchronous.class, new + // AsynchronousAnnotationLiteral()); + // AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, + // annotations); + + // SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, + // annotatedItem, manager); + // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), + // Asynchronous.class); assert false; } - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.3.4", id = "unknown") + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "2.3.4", id = "unknown") public void testXmlBindingOverridesAndIgnoresJava() { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Asynchronous>() {}); + // Map<Class<? extends Annotation>, Annotation> annotations = new + // HashMap<Class<? extends Annotation>, Annotation>(); + // annotations.put(Asynchronous.class, new + // AsynchronousAnnotationLiteral()); + // AnnotatedClass<Cat> annotatedItem = new + // SimpleAnnotatedClass<Cat>(Cat.class, annotations); + + // SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, + // manager); + // assert cat.getBindingTypes().size() == 1; + // assert cat.getBindingTypes().contains(new + // AnnotationLiteral<Asynchronous>() {}); assert false; } - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.3.4", id = "unknown") + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "2.3.4", id = "unknown") public void testNoBindingsDeclaredInXml() { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Synchronous>() {}); + // Map<Class<? extends Annotation>, Annotation> annotations = new + // HashMap<Class<? extends Annotation>, Annotation>(); + // AnnotatedClass<Cat> annotatedItem = new + // SimpleAnnotatedClass<Cat>(Cat.class, annotations); + + // SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, + // manager); + // assert cat.getBindingTypes().size() == 1; + // assert cat.getBindingTypes().contains(new + // AnnotationLiteral<Synchronous>() {}); assert false; } - - @Test(groups={"stub", "webbeansxml"}) - @SpecAssertions({ - @SpecAssertion(section = "2.3.4", id = "unknown"), - @SpecAssertion(section = "2.3.1", id = "unknown") - }) + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertions( { @SpecAssertion(section = "2.3.4", id = "unknown"), @SpecAssertion(section = "2.3.1", id = "unknown") }) public void testDefaultBindingDeclaredInXml() { - Bean<?> model = createSimpleBean(Tuna.class); + deployBeans(Tuna.class); + Bean<?> model = manager.resolveByType(Tuna.class).iterator().next(); assert model.getBindings().size() == 1; assert model.getBindings().contains(new CurrentBinding()); assert false; } - - @Test(groups={"injection", "producerMethod"}) - @SpecAssertion(section="2.3.5", id = "unknown") + + @Test(groups = { "injection", "producerMethod" }) + @SpecAssertion(section = "2.3.5", id = "unknown") public void testFieldInjectedFromProducerMethod() throws Exception { - Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(createProducerMethodBean(method, spiderProducer)); - Barn barn = createSimpleBean(Barn.class).create(new MockCreationalContext<Barn>()); + deployBeans(SpiderProducer.class, Barn.class); + Barn barn = manager.resolveByType(Barn.class).iterator().next().create(new MockCreationalContext<Barn>()); assert barn.petSpider != null; assert barn.petSpider instanceof DefangedTarantula; } - - @Test(groups={"stub", "injection", "webbeansxml"}) - @SpecAssertion(section="2.3.5", id = "unknown") + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "2.3.5", id = "unknown") public void testFieldWithBindingInXml() { assert false; } - - @Test(groups={"stub", "injection", "webbeansxml"}) - @SpecAssertion(section="2.3.5", id = "unknown") + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "2.3.5", id = "unknown") public void testFieldWithBindingInXmlIgnoresAnnotations() { assert false; } - - @SuppressWarnings("unchecked") - @Test(groups={"injection", "producerMethod"}) + + @Test(groups = { "injection", "producerMethod" }) public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception { - Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(createProducerMethodBean(method, spiderProducer)); - method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); - Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer); - Spider spider = spiderBean.create(new MockCreationalContext<Spider>()); + deployBeans(SpiderProducer.class); + Spider spider = manager.resolveByType(Spider.class).iterator().next().create(new MockCreationalContext<Spider>()); assert spider != null; assert spider instanceof DefangedTarantula; } - - @Test(groups={"stub", "injection", "webbeansxml"}) - @SpecAssertion(section="2.3.6", id = "unknown") + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "2.3.6", id = "unknown") public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() { assert false; } - - @Test(groups={"stub", "injection", "webbeansxml"}) - @SpecAssertion(section="2.3.6", id = "unknown") + + @Test(groups = { "stub", "injection", "webbeansxml" }) + @SpecAssertion(section = "2.3.6", id = "unknown") public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() { assert false; } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + @Test + @SpecAssertion(section = "4.1", id = "unknown") public void testBindingDeclaredInheritedIsInherited() throws Exception { - Set<? extends Annotation> bindings = createSimpleBean(BorderCollie.class).getBindings(); + deployBeans(BorderCollie.class); + Set<? extends Annotation> bindings = manager.resolveByType(BorderCollie.class, new HairyBinding(false)).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Hairy.class); } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + @Test + @SpecAssertion(section = "4.1", id = "unknown") public void testBindingNotDeclaredInheritedIsNotInherited() { - Set<? extends Annotation> bindings = createSimpleBean(ShetlandPony.class).getBindings(); + deployBeans(ShetlandPony.class); + Set<? extends Annotation> bindings = manager.resolveByType(ShetlandPony.class).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Current.class); } - - @Test @SpecAssertion(section="4.1", id = "unknown") + + @Test + @SpecAssertion(section = "4.1", id = "unknown") public void testBindingDeclaredInheritedIsBlockedByIntermediateClass() { - Set<? extends Annotation> bindings = createSimpleBean(ClippedBorderCollie.class).getBindings(); + deployBeans(ClippedBorderCollie.class); + Set<? extends Annotation> bindings = manager.resolveByType(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getBindings(); assert bindings.size() == 1; Annotation binding = bindings.iterator().next(); assert binding.annotationType().equals(Hairy.class); Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.unit.definition.binding; + +import javax.inject.AnnotationLiteral; + +class ChunkyBinding extends AnnotationLiteral<Chunky> implements Chunky +{ + private boolean chunky; + + public ChunkyBinding(boolean chunky) + { + this.chunky = chunky; + } + + @Override + public boolean realChunky() + { + return chunky; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/ChunkyBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.unit.definition.binding; + +import javax.inject.AnnotationLiteral; + +public class HairyBinding extends AnnotationLiteral<Hairy> implements Hairy +{ + private boolean clipped; + + public HairyBinding(boolean clipped) + { + this.clipped = clipped; + } + + @Override + public boolean clipped() + { + return clipped; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/HairyBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/MockCreationalContext.java (from rev 1394, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/MockCreationalContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/MockCreationalContext.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.tck.unit.definition.binding; + +import javax.context.CreationalContext; + +public class MockCreationalContext<T> implements CreationalContext<T> +{ + + + public void push(T incompleteInstance) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/MockCreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SynchronousBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SynchronousBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SynchronousBinding.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.tck.unit.definition.binding; + +import javax.inject.AnnotationLiteral; + +class SynchronousBinding extends AnnotationLiteral<Synchronous> implements Synchronous +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/SynchronousBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/TameBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/TameBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/TameBinding.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.tck.unit.definition.binding; + +import javax.inject.AnnotationLiteral; + +class TameBinding extends AnnotationLiteral<Tame> implements Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/TameBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tarantula.java 2009-02-03 12:17:38 UTC (rev 1394) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/Tarantula.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -1,6 +1,13 @@ package org.jboss.webbeans.tck.unit.definition.binding; -class Tarantula extends Spider implements DeadlySpider +import java.io.Serializable; + +class Tarantula extends Spider implements DeadlySpider, Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/WhitefishBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/WhitefishBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/WhitefishBinding.java 2009-02-03 15:22:56 UTC (rev 1395) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.tck.unit.definition.binding; + +import javax.inject.AnnotationLiteral; + +class WhitefishBinding extends AnnotationLiteral<Whitefish> implements Whitefish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/WhitefishBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1394 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-03 07:17:38 -0500 (Tue, 03 Feb 2009) New Revision: 1394 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java Log: improved style Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java 2009-02-03 08:20:03 UTC (rev 1393) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java 2009-02-03 12:17:38 UTC (rev 1394) @@ -169,7 +169,7 @@ SpecAssertion annotation = d.getAnnotation( SpecAssertion.class ); SpecReference ref = new SpecReference( annotation.section(), annotation.id(), - d.getDeclaringType().getQualifiedName(), d.getSimpleName()); + d.getDeclaringType().getSimpleName(), d.getSimpleName()); references.add( ref ); } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java 2009-02-03 08:20:03 UTC (rev 1393) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java 2009-02-03 12:17:38 UTC (rev 1394) @@ -58,8 +58,33 @@ private void writeHeader(OutputStream out) throws IOException { - out.write("<html><head><title>JSR-299 TCK Coverage Report</title></head><body".getBytes()); - out.write("<h1>TCK Coverage Report</h1>".getBytes()); + StringBuilder sb = new StringBuilder(); + + sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); + sb.append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\n"); + sb.append("\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">"); + sb.append("<html><head><title>JSR-299 TCK Coverage Report</title>\n"); + + sb.append("<style type=\"text/css\">\n"); + sb.append(" .code {\n"); + sb.append(" float: left;\n"); + sb.append(" font-weight: bold;\n"); + sb.append(" width: 50px;\n"); + sb.append(" margin-top: 0px;\n"); + sb.append(" height: 100%; }\n"); + sb.append(" .results {\n"); + sb.append(" margin-left: 50px; }\n"); + sb.append(" #pass {\n"); + sb.append(" background-color: #fdd; }\n"); + sb.append(" #fail {\n"); + sb.append(" background-color: #dfd; }\n"); + + sb.append("</style>\n"); + + sb.append("</head><body>"); + sb.append("<h1>JSR-299 TCK Coverage</h1>"); + + out.write(sb.toString().getBytes()); } private void writeBody(OutputStream out) throws IOException @@ -69,7 +94,7 @@ for (String key : keys) { - out.write(("<h2>Section " + key + " - " + sections.get(key) + "</h2>").getBytes()); + out.write(("<h2>Section " + key + " - " + sections.get(key) + "</h2>\n").getBytes()); List<AuditAssertion> sectionAssertions = assertions.get(key); @@ -81,31 +106,35 @@ for (AuditAssertion assertion : sectionAssertions) { - sb.append("<div>"); + sb.append(" <div class=\"assertion\">\n"); - sb.append("<div style='float:left'>"); + sb.append(" <span class=\"code\">"); sb.append(assertion.getId()); sb.append(")"); - sb.append("</div>"); + sb.append("</span>\n"); - sb.append("<div style='float:left;margin-left:50px'>"); + sb.append(" <div class=\"results\">"); + sb.append("<p class=\"description\">"); sb.append(assertion.getText()); - sb.append("</div>"); + sb.append("</p>\n"); - sb.append("<br style='clear:both'/>"); - + sb.append(" <div class=\"coverage\">\n"); + sb.append(" <h4>Coverage</h4>\n"); + if (references.get(key) != null) { for (SpecReference ref : references.get(key)) { + sb.append(" <p>"); sb.append(ref.getClassName()); sb.append("."); sb.append(ref.getMethodName()); sb.append("()"); + sb.append("</p>\n"); } } - sb.append("</div>"); + sb.append(" </div>\n </div>\n"); } out.write(sb.toString().getBytes());

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1393 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation.

by webbeans-commits＠lists.jboss.org

Author: nickarls Date: 2009-02-03 03:20:03 -0500 (Tue, 03 Feb 2009) New Revision: 1393 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/DefaultConversationManager.java Log: Refactoring in preparation for concurrency control Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-02-03 08:20:03 UTC (rev 1393) @@ -0,0 +1,49 @@ +package org.jboss.webbeans.conversation; + +import java.util.concurrent.Future; +import java.util.concurrent.locks.ReentrantLock; + +import javax.servlet.http.HttpSession; + +import org.jboss.webbeans.context.ConversationContext; +import org.jboss.webbeans.servlet.ConversationBeanMap; + +public class ConversationEntry +{ + private String cid; + private Future<?> terminationHandle; + private ReentrantLock concurrencyLock; + + protected ConversationEntry(String cid, Future<?> terminationHandle) + { + this.cid = cid; + this.terminationHandle = terminationHandle; + this.concurrencyLock = new ReentrantLock(true); + } + + public static ConversationEntry of(String cid, Future<?> terminationHandle) + { + return new ConversationEntry(cid, terminationHandle); + } + + public boolean cancelTermination() + { + return terminationHandle.cancel(false); + } + + public void destroy(HttpSession session) + { + ConversationContext terminationContext = new ConversationContext(); + terminationContext.setBeanMap(new ConversationBeanMap(session, cid)); + terminationContext.destroy(); + } + + public void lock() { + concurrencyLock.lock(); + } + + public void unlock() { + concurrencyLock.unlock(); + } + +} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/DefaultConversationManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/DefaultConversationManager.java 2009-02-03 03:49:06 UTC (rev 1392) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/DefaultConversationManager.java 2009-02-03 08:20:03 UTC (rev 1393) @@ -45,13 +45,13 @@ @Current private Conversation currentConversation; - private Map<String, Future<?>> longRunningConversations; + private Map<String, ConversationEntry> longRunningConversations; private HttpSession session; protected DefaultConversationManager() { log.trace("Created " + getClass()); - longRunningConversations = new ConcurrentHashMap<String, Future<?>>(); + longRunningConversations = new ConcurrentHashMap<String, ConversationEntry>(); session = null; } @@ -80,7 +80,7 @@ log.info("Could not restore long-running conversation " + cid); return; } - if (!longRunningConversations.remove(cid).cancel(false)) + if (!longRunningConversations.remove(cid).cancelTermination()) { log.info("Failed to cancel termination of conversation " + cid); } @@ -96,7 +96,9 @@ { Runnable terminationTask = new TerminationTask(currentConversation.getId()); Future<?> terminationHandle = conversationTerminator.scheduleForTermination(terminationTask); - longRunningConversations.put(currentConversation.getId(), terminationHandle); + String cid = currentConversation.getId(); + ConversationEntry conversationEntry = ConversationEntry.of(cid, terminationHandle); + longRunningConversations.put(cid, conversationEntry); log.trace("Scheduling " + currentConversation + " for termination"); } else @@ -118,24 +120,18 @@ public void run() { log.trace("Conversation " + cid + " timed out and was terminated"); - destroyConversation(cid, session); + longRunningConversations.get(cid).destroy(session); } } - + public void destroyAllConversations() { - for (Map.Entry<String, Future<?>> entry : longRunningConversations.entrySet()) { - entry.getValue().cancel(false); - destroyConversation(entry.getKey(), session); + for (ConversationEntry conversationEntry : longRunningConversations.values()) + { + conversationEntry.cancelTermination(); + conversationEntry.destroy(session); } + longRunningConversations.clear(); } - private void destroyConversation(String cid, HttpSession session) - { - ConversationContext terminationContext = new ConversationContext(); - terminationContext.setBeanMap(new ConversationBeanMap(session, cid)); - terminationContext.destroy(); - longRunningConversations.remove(cid); - } - }

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1392 - in tck/trunk/impl: src/main/java/org/jboss/webbeans/tck/impl and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-02 22:49:06 -0500 (Mon, 02 Feb 2009) New Revision: 1392 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/AuditAssertion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/SpecReference.java Modified: tck/trunk/impl/pom.xml Log: initial attempt at coverage report, still under construction Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-02-02 22:23:54 UTC (rev 1391) +++ tck/trunk/impl/pom.xml 2009-02-03 03:49:06 UTC (rev 1392) @@ -124,10 +124,32 @@ </execution> </executions> <configuration> + <factory>org.jboss.webbeans.tck.impl.report.CoverageProcessorFactory</factory> <testOutputDirectory>${project.build.directory}/site</testOutputDirectory> </configuration> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>default-tools.jar</id> + <activation> + <property> + <name>java.vendor</name> + <value>Sun Microsystems Inc.</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.5.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + </dependencies> + </profile> + </profiles> </project> Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/AuditAssertion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/AuditAssertion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/AuditAssertion.java 2009-02-03 03:49:06 UTC (rev 1392) @@ -0,0 +1,51 @@ +package org.jboss.webbeans.tck.impl.report; + +/** + * Represents a single assertion as defined in the audit xml + * + * @author Shane Bryzak + * + */ +public class AuditAssertion implements Comparable<AuditAssertion> +{ + private String section; + private String id; + private String text; + private String note; + + public AuditAssertion(String section, String id, String text, String note) + { + this.section = section; + this.id = id; + this.text = text; + this.note = note; + } + + public String getSection() + { + return section; + } + + public String getId() + { + return id; + } + + public String getText() + { + return text; + } + + public String getNote() + { + return note; + } + + public int compareTo(AuditAssertion other) + { + int i = section.compareTo(other.section); + return i != 0 ? i : id.compareTo(other.id); + } + + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessor.java 2009-02-03 03:49:06 UTC (rev 1392) @@ -0,0 +1,176 @@ +package org.jboss.webbeans.tck.impl.report; + +import com.sun.mirror.util.DeclarationVisitors; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; + +import com.sun.mirror.apt.AnnotationProcessor; +import com.sun.mirror.apt.AnnotationProcessorEnvironment; +import com.sun.mirror.declaration.AnnotationTypeDeclaration; +import com.sun.mirror.declaration.Declaration; +import com.sun.mirror.declaration.MethodDeclaration; +import com.sun.mirror.util.SimpleDeclarationVisitor; + +/** + * Annotation processor for generating TCK coverage report + * + * @author Shane Bryzak + */ +public class CoverageProcessor implements AnnotationProcessor +{ + private static final String OUTDIR_OPTION_NAME = "-s"; + private static final String REPORT_FILE_NAME = "coverage.html"; + + private static final String AUDIT_FILE_NAME = "tck-audit.xml"; + + private Map<String,List<AuditAssertion>> assertions = new HashMap<String,List<AuditAssertion>>(); + private Map<String,String> sections = new HashMap<String,String>(); + + private final AnnotationProcessorEnvironment env; + private final File baseDir; + + private final List<SpecReference> references = new ArrayList<SpecReference>(); + + public CoverageProcessor(AnnotationProcessorEnvironment env) + { + this.env = env; + String baseDirName = env.getOptions().get( OUTDIR_OPTION_NAME ); + baseDir = new File( baseDirName ); + baseDir.mkdirs(); + + try + { + loadAssertions(); + } + catch (Exception ex) + { + throw new RuntimeException("Error parsing tck-audit.xml: " + + ex.getClass().getName() + " - " + ex.getMessage(), ex); + } + } + + /** + * Load the spec assertions defined in tck-audit.xml + */ + private void loadAssertions() throws Exception + { + DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + + Document doc = builder.parse(new FileInputStream(AUDIT_FILE_NAME)); + NodeList sectionNodes = doc.getDocumentElement().getChildNodes(); + + for (int i = 0; i < sectionNodes.getLength(); i++) + { + if (sectionNodes.item(i) instanceof Element && + "section".equals(sectionNodes.item(i).getNodeName())) + { + processSectionNode((Element) sectionNodes.item(i)); + } + } + } + + private void processSectionNode(Element node) + { + String sectionId = node.getAttribute("id"); + sections.put(sectionId, node.getAttribute("title")); + + NodeList assertionNodes = node.getChildNodes(); + + for (int i = 0; i < assertionNodes.getLength(); i++) + { + if (assertionNodes.item(i) instanceof Element && + "assertion".equals(assertionNodes.item(i).getNodeName())) + { + processAssertionNode(sectionId, (Element) assertionNodes.item(i)); + } + } + } + + private void processAssertionNode(String sectionId, Element node) + { + List<AuditAssertion> value = assertions.get(sectionId); + if (value == null) + { + value = new ArrayList<AuditAssertion>(); + assertions.put(sectionId, value); + } + + String text = null; + String note = null; + + for (int i = 0; i < node.getChildNodes().getLength(); i++) + { + Node child = node.getChildNodes().item(i); + + if (child instanceof Element) + { + if ("text".equals(child.getNodeName())) + { + text = child.getTextContent(); + } + else if ("note".equals(child.getNodeName())) + { + note = child.getTextContent(); + } + } + } + + value.add(new AuditAssertion(node.getAttribute("section"), + node.getAttribute("id"), text, note)); + } + + public void process() + { + AnnotationTypeDeclaration annotationType = (AnnotationTypeDeclaration) + env.getTypeDeclaration(SpecAssertion.class.getCanonicalName()); + + for (Declaration d : env.getDeclarationsAnnotatedWith(annotationType)) + { + d.accept(DeclarationVisitors.getDeclarationScanner( + new CreateReferenceVisitor(), DeclarationVisitors.NO_OP)); + } + + CoverageReport report = new CoverageReport(references, assertions, sections); + + try + { + File reportFile = new File(baseDir, REPORT_FILE_NAME); + FileOutputStream out = new FileOutputStream(reportFile); + report.generate(out); + out.flush(); + out.close(); + } + catch (IOException ex) + { + throw new RuntimeException("Error generating report file", ex); + } + } + + private class CreateReferenceVisitor extends SimpleDeclarationVisitor + { + public void visitMethodDeclaration(MethodDeclaration d) + { + SpecAssertion annotation = d.getAnnotation( SpecAssertion.class ); + SpecReference ref = new SpecReference( + annotation.section(), annotation.id(), + d.getDeclaringType().getQualifiedName(), d.getSimpleName()); + references.add( ref ); + } + } +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageProcessorFactory.java 2009-02-03 03:49:06 UTC (rev 1392) @@ -0,0 +1,41 @@ +package org.jboss.webbeans.tck.impl.report; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecAssertions; + +import com.sun.mirror.apt.AnnotationProcessor; +import com.sun.mirror.apt.AnnotationProcessorEnvironment; +import com.sun.mirror.apt.AnnotationProcessorFactory; +import com.sun.mirror.declaration.AnnotationTypeDeclaration; + +public class CoverageProcessorFactory implements AnnotationProcessorFactory +{ + private static final Collection<String> supportedAnnotations = Collections.unmodifiableCollection( + Arrays.asList( + SpecAssertion.class.getCanonicalName(), + SpecAssertions.class.getCanonicalName() + ) + ); + + public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> annotationTypeDeclarations, + AnnotationProcessorEnvironment env) + { + return new CoverageProcessor(env); + } + + public Collection<String> supportedAnnotationTypes() + { + return supportedAnnotations; + } + + public Collection<String> supportedOptions() + { + return null; + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/CoverageReport.java 2009-02-03 03:49:06 UTC (rev 1392) @@ -0,0 +1,121 @@ +package org.jboss.webbeans.tck.impl.report; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Generates the TCK spec coverage report + * + * @author Shane Bryzak + */ +public class CoverageReport +{ + /** + * References to the spec assertions made by the tck tests + */ + private final Map<String,List<SpecReference>> references; + + /** + * Assertions, mapped by section id + */ + private final Map<String,List<AuditAssertion>> assertions; + + /* + * Section titles + */ + private final Map<String,String> sections; + + public CoverageReport(List<SpecReference> references, Map<String,List<AuditAssertion>> assertions, + Map<String,String> sections) + { + this.references = new HashMap<String,List<SpecReference>>(); + + for (SpecReference ref : references) + { + if (!this.references.containsKey(ref.getSection())) + { + this.references.put(ref.getSection(), new ArrayList<SpecReference>()); + } + + this.references.get(ref.getSection()).add(ref); + } + + this.assertions = assertions; + this.sections = sections; + } + + public void generate(OutputStream out) throws IOException + { + writeHeader(out); + writeBody(out); + writeFooter(out); + } + + private void writeHeader(OutputStream out) throws IOException + { + out.write("<html><head><title>JSR-299 TCK Coverage Report</title></head><body".getBytes()); + out.write("<h1>TCK Coverage Report</h1>".getBytes()); + } + + private void writeBody(OutputStream out) throws IOException + { + List<String> keys = new ArrayList<String>(sections.keySet()); + Collections.sort(keys); + + for (String key : keys) + { + out.write(("<h2>Section " + key + " - " + sections.get(key) + "</h2>").getBytes()); + + List<AuditAssertion> sectionAssertions = assertions.get(key); + + if (sectionAssertions != null && !sectionAssertions.isEmpty()) + { + Collections.sort(sectionAssertions); + + StringBuilder sb = new StringBuilder(); + + for (AuditAssertion assertion : sectionAssertions) + { + sb.append("<div>"); + + sb.append("<div style='float:left'>"); + sb.append(assertion.getId()); + sb.append(")"); + sb.append("</div>"); + + sb.append("<div style='float:left;margin-left:50px'>"); + sb.append(assertion.getText()); + sb.append("</div>"); + + sb.append("<br style='clear:both'/>"); + + if (references.get(key) != null) + { + for (SpecReference ref : references.get(key)) + { + sb.append(ref.getClassName()); + sb.append("."); + sb.append(ref.getMethodName()); + sb.append("()"); + } + } + + sb.append("</div>"); + } + + out.write(sb.toString().getBytes()); + } + } + } + + private void writeFooter(OutputStream out) throws IOException + { + out.write("</table>".getBytes()); + out.write("</body></html>".getBytes()); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/SpecReference.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/SpecReference.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/report/SpecReference.java 2009-02-03 03:49:06 UTC (rev 1392) @@ -0,0 +1,42 @@ +package org.jboss.webbeans.tck.impl.report; + +/** + * Represents the metadata for a single instance of @SpecAssertion + * + * @author Shane Bryzak + */ +public class SpecReference +{ + private String section; + private String assertion; + private String className; + private String methodName; + + SpecReference(String section, String assertion, String className, String methodName) + { + this.section = section; + this.assertion = assertion; + this.className = className; + this.methodName = methodName; + } + + public String getSection() + { + return section; + } + + public String getAssertion() + { + return assertion; + } + + public String getClassName() + { + return className; + } + + public String getMethodName() + { + return methodName; + } +}

17 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2009