From ad086e27d77625e0f9cf349fe49b4a57c30cd4f0 Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Mon, 15 Mar 2021 17:28:43 +0100 Subject: [PATCH 1/2] Introduce BeansXML API for beans.xml file creation. Change tests to use this API instead of shrinkwrap descriptors where applicable. Correct existing beans.xml files to use new namespaces and version 3.0. Add a simple test of BeansXml API. --- .../ConstructorInterceptionTest.java | 12 +- ...essionBeanConstructorInterceptionTest.java | 12 +- ...typeInterceptorBindingAnnotationsTest.java | 12 +- ...tiveInterceptorBindingAnnotationsTest.java | 13 +- .../InterceptorBindingTypeWithMemberTest.java | 16 +- .../MultipleInterceptorBindingsTest.java | 8 +- .../InterceptorBindingOverridingTest.java | 12 +- .../InterceptorBindingResolutionTest.java | 9 +- ...priseInterceptorBindingResolutionTest.java | 14 +- .../bindings/AroundConstructTest.java | 13 +- .../LifecycleInterceptorDefinitionTest.java | 5 +- ...eanLifecycleInterceptorDefinitionTest.java | 8 +- .../cdi/tck/shrinkwrap/ArchiveBuilder.java | 100 +++--- .../AlternativeAvailabilityTest.java | 6 +- .../name/NoClassWithSpecifiedNameTest.java | 11 +- .../NoAnnotationWithSpecifiedNameTest.java | 7 +- .../ClassIsNotAlternativeTest.java | 6 +- .../stereotype/ClassIsNotAlternativeTest.java | 3 +- .../type/twice/SameTypeListedTwiceTest.java | 6 +- .../ResourceAlternativeAvailabilityTest.java | 13 +- .../qualifier/QualifierInheritedTest.java | 10 +- .../qualifier/QualifierNotDeclaredTest.java | 6 +- .../qualifier/QualifierNotInheritedTest.java | 10 +- ...ectedBeanWithUnselectedStereotypeTest.java | 10 +- .../veto/VetoedAlternativeTest.java | 9 +- ...edBeanWithNonPassivatingDecoratorTest.java | 9 +- ...seBeanWithNonPassivatingDecoratorTest.java | 8 +- ...ssivatingInjectedFieldInDecoratorTest.java | 8 +- ...orWithNonPassivatingInjectedFieldTest.java | 5 +- ...BeanWithNonPassivatingInterceptorTest.java | 5 +- ...BeanWithNonPassivatingInterceptorTest.java | 8 +- .../NonPassivationCapableSessionBeanTest.java | 5 +- .../invalid/StatefulSessionBeanTest.java | 8 +- .../StatefulSessionBeanXmlDescriptorTest.java | 5 +- .../valid/StatefulSessionBeanTest.java | 7 +- .../StatefulSessionBeanXmlDescriptorTest.java | 7 +- ...NonPassivationCapableDependenciesTest.java | 5 +- ...NonPassivationCapableDependenciesTest.java | 8 +- .../beanmanager/BeanManagerDecoratorTest.java | 7 +- .../BuiltinConversationDecoratorTest.java | 13 +- .../event/BuiltinEventDecoratorTest.java | 14 +- .../complex/ComplexEventDecoratorTest.java | 4 +- ...uiltinHttpServletRequestDecoratorTest.java | 22 +- .../BuiltinServletContextDecoratorTest.java | 16 +- .../BuiltinHttpSessionDecoratorTest.java | 16 +- .../BuiltinInjectionPointDecoratorTest.java | 4 +- .../BuiltinInstanceDecoratorTest.java | 17 +- .../BuiltinPrincipalDecoratorTest.java | 15 +- .../BuiltinUserTransactionDecoratorTest.java | 7 +- ...coratorMatchingBeanWithFinalClassTest.java | 5 +- .../definition/DecoratorDefinitionTest.java | 26 +- .../DecoratorListedTwiceInBeansXmlTest.java | 4 +- .../EnabledDecoratorNotADecoratorTest.java | 7 +- .../finalBeanClass/FinalBeanClassTest.java | 7 +- .../finalBeanMethod/FinalBeanMethodTest.java | 5 +- ...ecoratorWithInvalidAbstractMethodTest.java | 3 +- .../MultipleDelegateInjectionPointsTest.java | 4 +- .../NoDelegateInjectionPointsTest.java | 7 +- .../DecoratorWithNoDecoratedTypes2Test.java | 6 +- ...nExistantDecoratorClassInBeansXmlTest.java | 8 +- .../NotAllDecoratedTypesImplementedTest.java | 7 +- .../TypeParametersNotTheSameTest.java | 4 +- .../DecoratorWithAsyncObserverMethodTest.java | 4 +- .../DecoratorWithObserverMethodTest.java | 4 +- .../DifferentTypeParametersTest.java | 6 +- ...ecoratorInstanceIsDependentObjectTest.java | 13 +- ...ratorNotAppliedToResultOfProducerTest.java | 6 +- ...lementsParameterizedDecoratedTypeTest.java | 7 +- .../DecoratorAndInterceptorTest.java | 6 +- .../invocation/DecoratorInvocationTest.java | 11 +- .../EJBDecoratorInvocationTest.java | 8 +- .../EnterpriseDecoratorInvocationTest.java | 25 +- .../EnterpriseDecoratorOrderingTest.java | 13 +- .../global/GlobalDecoratorOrderingTest.java | 17 +- ...seStereotypeAlternativeSpecializeTest.java | 4 +- .../EnterpriseStereotypeAlternativeTest.java | 4 +- ...peWithMultipleInterceptorBindingsTest.java | 7 +- ...priseStereotypeInterceptorBindingTest.java | 8 +- .../discovery/BeanDiscoveryTest.java | 28 +- .../EnterpriseBeanDiscoveryTest.java | 26 +- ...nterpriseDefaultBeanDiscoveryModeTest.java | 14 +- .../DefaultBeanDiscoveryModeTest.java | 7 +- .../exclude/ExcludeFiltersTest.java | 29 +- .../modules/EnterpriseArchiveModulesTest.java | 18 +- .../packaging/ejb/EJBJarDeploymentTest.java | 4 +- .../rar/ResourceAdapterArchiveTest.java | 8 +- .../war/modules/WebArchiveModulesTest.java | 20 +- ...AlternativeInLibraryWithExtensionTest.java | 9 +- .../metadata/AlternativeMetadataTest.java | 15 +- ...etadataInterceptorInjectionTargetTest.java | 4 +- .../AlternativeMetadataInterceptorTest.java | 3 +- .../bean/bytype/BeanByTypeTest.java | 5 +- .../beanManager/BeanManagerTest.java | 28 +- .../beanManager/bean/SyntheticBeanTest.java | 7 +- .../InterceptorBindingEquivalenceTest.java | 5 +- .../BeanAttributesConfiguratorTest.java | 19 +- .../InterceptorExtensionTest.java | 7 +- .../CustomInterceptorInvocationTest.java | 8 +- .../CustomInterceptorRegistrationTest.java | 8 +- .../lifecycle/atd/AfterTypeDiscoveryTest.java | 12 +- .../VerifyValuesTest.java | 15 +- .../DecoratorProcessBeanAttributesTest.java | 12 +- .../InterceptorProcessBeanAttributesTest.java | 12 +- .../modify/SetBeanAttributesTest.java | 3 +- .../modify/InjectionPointOverridingTest.java | 6 +- .../processBean/ProcessBeanTest.java | 8 +- .../metadata/BuiltinMetadataBeanTest.java | 15 +- .../BuiltinMetadataSessionBeanTest.java | 17 +- .../DisposerMethodOnDecoratorTest.java | 8 +- .../DisposerMethodOnInterceptorTest.java | 5 +- .../newBean/NewEnterpriseBeanTest.java | 14 +- .../ProducerFieldOnDecoratorTest.java | 5 +- .../ProducerFieldOnInterceptorTest.java | 8 +- .../ProducerMethodOnDecoratorTest.java | 8 +- .../ProducerMethodOnInterceptorTest.java | 8 +- .../newSimpleBean/NewSimpleBeanTest.java | 28 +- .../definition/InterceptorDefinitionTest.java | 34 +- ...pendentBeanFinalMethodInterceptorTest.java | 8 +- .../FinalClassClassLevelInterceptorTest.java | 5 +- .../FinalClassMethodLevelInterceptorTest.java | 8 +- .../FinalMethodClassLevelInterceptorTest.java | 5 +- ...FinalMethodMethodLevelInterceptorTest.java | 5 +- ...alScopedBeanFinalClassInterceptorTest.java | 8 +- ...lScopedBeanFinalMethodInterceptorTest.java | 8 +- .../NonExistantClassInBeansXmlTest.java | 5 +- .../NonInterceptorClassInBeansXmlTest.java | 3 +- .../InterceptorWithObserverMethodTest.java | 8 +- .../SameClassListedTwiceInBeansXmlTest.java | 8 +- .../InterceptorConflictingEnablementTest.java | 14 +- ...geDrivenBeanInterceptorInvocationTest.java | 12 +- .../SessionBeanInterceptorDefinitionTest.java | 8 +- .../InterceptorBindingInheritanceTest.java | 6 +- ...ithInheritedClassLevelInterceptorTest.java | 5 +- ...ithInheritedStereotypeInterceptorTest.java | 5 +- ...ithInheritedClassLevelInterceptorTest.java | 5 +- ...ithInheritedStereotypeInterceptorTest.java | 5 +- .../InterceptorOrderTest.java | 15 +- ...iseLifecycleInterceptorDefinitionTest.java | 12 +- .../order/LifecycleInterceptorOrderTest.java | 12 +- .../InterceptorBindingTypeWithMemberTest.java | 10 +- .../invocation/InterceptorInvocationTest.java | 5 +- .../EnterpriseInterceptorOrderingTest.java | 11 +- .../global/GlobalInterceptorOrderingTest.java | 15 +- .../lookup/byname/ResolutionByNameTest.java | 3 +- .../decorator/DecoratoredBeanProxyTest.java | 4 +- .../interceptor/InterceptedBeanProxyTest.java | 9 +- .../AmbiguousDependencyResolutionTest.java | 6 +- .../DestroyingDependentInstanceTest.java | 15 +- .../InjectableReferenceTest.java | 7 +- .../injectionpoint/InjectionPointTest.java | 26 +- .../provider/init/CDIProviderInitTest.java | 10 +- .../runtime/CDIProviderRuntimeTest.java | 6 +- ...anagedBeanInjectionAvailability02Test.java | 6 +- ...eManagedBeanInjectionAvailabilityTest.java | 9 +- ...essionBeanInjectionAvailability02Test.java | 6 +- ...eSessionBeanInjectionAvailabilityTest.java | 6 +- .../InterceptorModularityTest.java | 5 +- .../alternative/Specialization02Test.java | 6 +- .../alternative/Specialization03Test.java | 6 +- .../alternative/Specialization04Test.java | 9 +- .../alternative/Specialization05Test.java | 8 +- .../InterceptorNotResolvedTest.java | 6 +- .../shrinkwrap/api/BeanDiscoveryMode.java | 16 + .../jboss/shrinkwrap/api/BeansXmlVersion.java | 16 + .../org/jboss/shrinkwrap/impl/BeansXml.java | 300 ++++++++++++++++++ .../broken/incorrect/name/beans.xml | 9 + .../incorrect/name/stereotype/beans.xml | 9 + .../tests/alternative/enterprise/beans.xml | 4 +- .../cdi/tck/tests/context/dependent/beans.xml | 4 +- .../beans.xml | 4 +- .../beans.xml | 4 +- .../beans.xml | 4 +- .../beans.xml | 4 +- .../beans.xml | 4 +- .../beans.xml | 4 +- .../beans.xml | 4 +- .../cdi/tck/tests/decorators/custom/beans.xml | 4 +- .../nonExistantClassInBeansXml/beans.xml | 9 + .../inject/delegateConstructor/beans.xml | 4 +- .../definition/inject/delegateField/beans.xml | 4 +- .../delegateInitializerMethod/beans.xml | 4 +- .../decorators/invocation/observer/beans.xml | 4 +- .../invocation/producer/method/beans.xml | 4 +- .../tck/tests/decorators/resolution/beans.xml | 4 +- .../deployment/discovery/enterprise/beans.xml | 5 + .../tck/tests/deployment/trimmed/beans.xml | 4 +- .../deployment/trimmed/enteprise/beans.xml | 4 +- .../nonExistantClassInBeansXml/beans.xml | 9 + .../interceptors/definition/custom/beans.xml | 4 +- .../enterprise/interceptorOrder/beans.xml | 4 +- .../nonContextualReference/beans.xml | 4 +- .../beans.xml | 4 +- .../interceptorNotListedInBeansXml/beans.xml | 4 +- .../typesafe/resolution/decorator/beans.xml | 4 +- .../tck/tests/se/discovery/trimmed/beans.xml | 4 +- .../tck/test/shrinkwrap/AssetUtilTest.java | 27 +- .../shrinkwrap/beansxml/BeansXmlTest.java | 45 +++ .../beansxml/DummyReferenceClass.java | 4 + impl/src/test/resources/beans-01.xml | 2 +- impl/src/test/resources/beans-02.xml | 2 +- impl/src/test/resources/beans-03.xml | 2 +- impl/src/test/resources/beans-04.xml | 2 +- impl/src/test/resources/beans-05.xml | 2 +- 203 files changed, 1101 insertions(+), 1102 deletions(-) create mode 100644 impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java create mode 100644 impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java create mode 100644 impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java create mode 100644 impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/beans.xml create mode 100644 impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/beans.xml create mode 100644 impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml create mode 100644 impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/beans.xml create mode 100644 impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml create mode 100644 impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java create mode 100644 impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/DummyReferenceClass.java diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java index ec5069c454..4de75f363c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java @@ -23,14 +23,12 @@ import static org.jboss.cdi.tck.util.ActionSequence.assertSequenceDataEquals; import jakarta.enterprise.inject.Instance; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -50,12 +48,8 @@ public class ConstructorInterceptionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(ConstructorInterceptionTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(AlphaInterceptor1.class.getName(), AlphaInterceptor2.class.getName(), - BravoInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class)) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java index f9c98abbe7..3c8105416e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java @@ -22,14 +22,12 @@ import static org.jboss.cdi.tck.util.ActionSequence.assertSequenceDataEquals; import jakarta.enterprise.inject.Instance; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -49,12 +47,8 @@ public class SessionBeanConstructorInterceptionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SessionBeanConstructorInterceptionTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(AlphaInterceptor1.class.getName(), AlphaInterceptor2.class.getName(), - BravoInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class)) + .build(); } @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java index a33ce70a6f..b018ff6bb9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_BINDING_TYPES_WITH_MEMBERS; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -47,12 +45,8 @@ public static WebArchive createTestArchive() { .withClasses(Bar.class, FooBinding.class, BarBinding.class, BazBinding.class, FooInterceptor.class, BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class, FooStereotype.class, BarStereotype.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(FooInterceptor.class.getName(), BarInterceptor.class.getName(), - YesBazInterceptor.class.getName(), NoBazInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(FooInterceptor.class, BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java index 6e6cf48aca..3342d85a09 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_BINDING_TYPES_WITH_MEMBERS; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,12 +42,9 @@ public static WebArchive createTestArchive() { .withTestClass(InvalidTransitiveInterceptorBindingAnnotationsTest.class) .withClasses(Foo.class, FooBinding.class, BarBinding.class, BazBinding.class, FooInterceptor.class, BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(FooInterceptor.class.getName(), BarInterceptor.class.getName(), - YesBazInterceptor.class.getName(), NoBazInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(FooInterceptor.class, BarInterceptor.class, + YesBazInterceptor.class, NoBazInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java index 04e121cecc..1f6b2e8a1a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java @@ -21,22 +21,20 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import java.util.List; - import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.enterprise.util.AnnotationLiteral; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.List; + /** * Tests for interceptor bindings types with members. * @@ -55,12 +53,8 @@ public abstract class PlantInterceptorBindingLiteral extends AnnotationLiteral

, A extends A protected ResourceDescriptor beansXml = null; - protected BeansDescriptor beansDescriptor = null; + protected BeansXml beansDescriptor = null; protected ResourceDescriptor webXml = null; @@ -172,7 +168,7 @@ public T withName(String name) { * Add beans.xml located in src/main/resource/{testPackagePath}. *

*

- * Do not use this in new tests - use {@link #withBeansXml(BeansDescriptor)} instead. + * Do not use this in new tests - use {@link #withBeansXml(BeansXml)} instead. *

* * @param beansXml @@ -184,12 +180,12 @@ public T withBeansXml(String beansXml) { } /** - * Add beans.xml descriptor created with shrinkwrap-descriptors. + * Add beans.xml descriptor created with TCK utils * * @param beansDescriptor * @return self */ - public T withBeansXml(BeansDescriptor beansDescriptor) { + public T withBeansXml(BeansXml beansDescriptor) { this.beansDescriptor = beansDescriptor; return self(); } @@ -316,7 +312,7 @@ public T withTestClass(Class testClazz) { *

* Always use this for as-client test archives, e.g. deployment method annotated with {@link ShouldThrowException}. * - * @param test + * @param testClazz * @return self */ public T withTestClassDefinition(Class testClazz) { @@ -480,7 +476,7 @@ public T withEjbJarXml(String ejbJarXml) { /** * Add ejb-jar.xml descriptor created with shrinkwrap-descriptors. * - * @param ejbJarXml + * @param descriptor * @return */ public T withEjbJarXml(EjbJarDescriptor descriptor) { @@ -538,7 +534,7 @@ public T withDefaultPersistenceXml() { /** * Add persistence.xml descriptor created with shrinkwrap-descriptors. * - * @param persistenceXml + * @param persistenceDescriptor * @return self */ public T withPersistenceXml(PersistenceDescriptor persistenceDescriptor) { @@ -585,8 +581,8 @@ public T withBeanLibrary(Class... beanClasses) { * @param beanClasses * @return self */ - public T withBeanLibrary(BeansDescriptor beansDescriptor, Class... beanClasses) { - return withBeanLibrary(null, beansDescriptor, beanClasses); + public T withBeanLibrary(BeansXml beansXml, Class... beanClasses) { + return withBeanLibrary(null, beansXml, beanClasses); } /** @@ -607,8 +603,8 @@ public T withBeanLibrary(String name, Class... beanClasses) { * @param beanClasses * @return self */ - public T withBeanLibrary(String name, BeansDescriptor beansDescriptor, Class... beanClasses) { - return withLibrary(name, beansDescriptor, true, beanClasses); + public T withBeanLibrary(String name, BeansXml beansXml, Class... beanClasses) { + return withLibrary(name, beansXml, true, beanClasses); } /** @@ -624,24 +620,25 @@ public T withLibrary(Class... classes) { /** * Add library that consists of defined classes. Include empty beans.xml if necessary. * - * @param serviceProvider - * @param omitBeansXml + * @param beansXml + * @param includeEmptyBeanXml * @param classes * @return self */ - public T withLibrary(BeansDescriptor beansDescriptor, boolean includeEmptyBeanXml, Class... classes) { - return withLibrary(null, beansDescriptor, includeEmptyBeanXml, classes); + public T withLibrary(BeansXml beansXml, boolean includeEmptyBeanXml, Class... classes) { + return withLibrary(null, beansXml, includeEmptyBeanXml, classes); } /** * Add library that consists of defined classes. Include empty beans.xml if necessary. * - * @param serviceProvider - * @param omitBeansXml + * @param name + * @param beansXml + * @param includeEmptyBeanXml * @param classes * @return self */ - public T withLibrary(String name, BeansDescriptor beansDescriptor, boolean includeEmptyBeanXml, Class... classes) { + public T withLibrary(String name, BeansXml beansXml, boolean includeEmptyBeanXml, Class... classes) { if (libraries == null) libraries = new ArrayList(5); @@ -655,7 +652,7 @@ public T withLibrary(String name, BeansDescriptor beansDescriptor, boolean inclu ServiceProviderDescriptor serviceProvider = extensions.isEmpty() ? null : new ServiceProviderDescriptor(Extension.class, extensions.toArray(new Class[extensions.size()])); - this.libraries.add(beansDescriptor != null ? new LibraryDescriptor(name, serviceProvider, beansDescriptor, classes) : new LibraryDescriptor(name, + this.libraries.add(beansXml != null ? new LibraryDescriptor(name, serviceProvider, beansXml, classes) : new LibraryDescriptor(name, serviceProvider, includeEmptyBeanXml, classes)); return self(); } @@ -783,7 +780,7 @@ public A build() { protected abstract A buildInternal(); /** - * Process packages. Exclude classes specified via {@link #withExcludedClass(Class)}. If in as-client mode, filter test class. + * Process packages. Exclude classes specified via {@link #withExcludedClass(String)}. If in as-client mode, filter test class. * * @param archive */ @@ -988,15 +985,11 @@ protected Asset getBeansDescriptorAsset() { Asset asset = null; if (beansDescriptor != null) { - if (beansDescriptor.getBeanDiscoveryMode() == null || beansDescriptor.getBeanDiscoveryMode().isEmpty()) { - beansDescriptor.beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version(Versions.v1_1); - } - asset = new StringAsset(beansDescriptor.exportAsString()); + asset = beansDescriptor; } else if (beansXml != null) { asset = new ClassLoaderAsset(beansXml.getSource()); } else { - asset = new StringAsset( - Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version(Versions.v1_1).exportAsString()); + asset = new BeansXml(); } if (this.isDebugMode) { @@ -1010,14 +1003,10 @@ protected Asset getBeansDescriptorAsset() { */ protected String getBeansDescriptorTarget() { - String target = null; + String target = "beans.xml"; - if (beansDescriptor != null) { - target = beansDescriptor.getDescriptorName(); - } else if (beansXml != null) { + if (beansXml != null) { target = beansXml.getTarget(); - } else { - target = "beans.xml"; } return target; } @@ -1107,7 +1096,7 @@ protected class LibraryDescriptor { private List> libraryClasses = null; - protected BeansDescriptor beansDescriptor = null; + protected BeansXml beansDescriptor = null; private boolean includeEmptyBeanXml = false; @@ -1118,16 +1107,13 @@ public LibraryDescriptor(File fileDescriptor) { this.fileDescriptor = fileDescriptor; } - public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, BeansDescriptor beansDescriptor, Class... classes) { + public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, BeansXml beansDescriptor, Class... classes) { super(); if (serviceProvider != null) { this.serviceProviders = new ArrayList(); this.serviceProviders.add(serviceProvider); } this.beansDescriptor = beansDescriptor; - if (beansDescriptor.getBeanDiscoveryMode() == null || beansDescriptor.getBeanDiscoveryMode().isEmpty()) { - beansDescriptor.beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version(Versions.v1_1); - } this.libraryClasses = Arrays.asList(classes); this.name = name; } @@ -1197,7 +1183,7 @@ public JavaArchive buildJarArchive() { } if (beansDescriptor != null) { - library.addAsManifestResource(new StringAsset(beansDescriptor.exportAsString()), beansDescriptor.getDescriptorName()); + library.addAsManifestResource(beansDescriptor, "beans.xml"); } else if (includeEmptyBeanXml) { library.addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/AlternativeAvailabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/AlternativeAvailabilityTest.java index 71b9b874e1..06cbdc5660 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/AlternativeAvailabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/AlternativeAvailabilityTest.java @@ -42,6 +42,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -54,9 +55,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(AlternativeAvailabilityTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(Chicken.class.getName(), EnabledSheepProducer.class.getName(), SnakeProducer.class.getName()) - .stereotype(EnabledAlternativeStereotype.class.getName()).up()).build(); + new BeansXml().alternatives(Chicken.class, EnabledSheepProducer.class, SnakeProducer.class) + .stereotype(EnabledAlternativeStereotype.class)).build(); } @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java index 387788ab6e..65e83ce9b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java @@ -20,14 +20,11 @@ import static org.jboss.cdi.tck.cdi.Sections.EXCEPTIONS; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,12 +37,8 @@ public class NoClassWithSpecifiedNameTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NoClassWithSpecifiedNameTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateAlternatives() - .clazz("org.jboss.jsr299.org.jboss.cdi.tck.tests.alternative.broken.incorrect.name.NonExistingClass") - .up()).build(); + .withBeansXml("beans.xml") + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java index 45b3553823..8e8d5cb0ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java @@ -19,14 +19,11 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +36,7 @@ public class NoAnnotationWithSpecifiedNameTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NoAnnotationWithSpecifiedNameTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .stereotype("org.jboss.cdi.tck.tests.policy.broken.incorrect.name.stereotype.Mock").up()) + .withBeansXml("beans.xml") .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java index 91817296b4..59ca8fcd61 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -38,7 +36,7 @@ public class ClassIsNotAlternativeTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(ClassIsNotAlternativeTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Cat.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Cat.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/stereotype/ClassIsNotAlternativeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/stereotype/ClassIsNotAlternativeTest.java index a40d6a36fe..335f0f7249 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/stereotype/ClassIsNotAlternativeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/not/alternative/stereotype/ClassIsNotAlternativeTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -38,7 +39,7 @@ public class ClassIsNotAlternativeTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(ClassIsNotAlternativeTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Mock.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Mock.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/same/type/twice/SameTypeListedTwiceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/same/type/twice/SameTypeListedTwiceTest.java index 55ed5e9787..a263cad312 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/same/type/twice/SameTypeListedTwiceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/broken/same/type/twice/SameTypeListedTwiceTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +40,8 @@ public class SameTypeListedTwiceTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SameTypeListedTwiceTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(Dog.class.getName(), Cat.class.getName(), Cat.class.getName()).up()).build(); + .withBeansXml(new BeansXml().alternatives(Dog.class, Cat.class, Cat.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java index 71433ad61c..03be0ae480 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java @@ -22,23 +22,21 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.Set; - import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.Set; + /** * @author Martin Kouba */ @@ -50,9 +48,8 @@ public class ResourceAlternativeAvailabilityTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(ResourceAlternativeAvailabilityTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(EnabledResourceProducer.class.getName()).up()).withDefaultPersistenceXml().build(); + .withBeansXml(new BeansXml().alternatives(EnabledResourceProducer.class)) + .withDefaultPersistenceXml().build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java index 21590ea532..55a22851e0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java @@ -23,21 +23,19 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.lang.annotation.Inherited; - import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Inherited; + /** * * @author Martin Kouba @@ -49,7 +47,7 @@ public class QualifierInheritedTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(QualifierInheritedTest.class) .withClasses(Tree.class, Larch.class, Forest.class, True.class, TrueLiteral.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Larch.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Larch.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java index fc9cbe641c..e564b4a54e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java @@ -24,13 +24,11 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,7 +44,7 @@ public class QualifierNotDeclaredTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(QualifierNotDeclaredTest.class) .withClasses(Foo.class, Bar.class, Baz.class, Qux.class, True.class, TrueLiteral.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Bar.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Bar.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java index 9b23e692c8..a751ef3cbe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java @@ -23,21 +23,19 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.lang.annotation.Inherited; - import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Inherited; + /** * * @author Martin Kouba @@ -49,7 +47,7 @@ public class QualifierNotInheritedTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(QualifierNotInheritedTest.class) .withClasses(Monster.class, Troll.class, Dungeon.class, False.class, FalseLiteral.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Troll.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Troll.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java index 14c947bcb7..863d189daa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java @@ -20,21 +20,19 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import static org.testng.Assert.assertEquals; -import java.util.Set; - import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.Set; + /** * @author Martin Kouba */ @@ -44,7 +42,7 @@ public class SelectedBeanWithUnselectedStereotypeTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(SelectedBeanWithUnselectedStereotypeTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Bar.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Bar.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/veto/VetoedAlternativeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/veto/VetoedAlternativeTest.java index 4ea431a612..622bc6bb7f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/veto/VetoedAlternativeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/veto/VetoedAlternativeTest.java @@ -19,13 +19,11 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import jakarta.enterprise.context.RequestScoped; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.Assert; @@ -43,9 +41,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(VetoedAlternativeTest.class) .withExtension(VetoingExtension.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(MockPaymentProcessorImpl.class.getName()) - .stereotype(AlternativeConsumerStereotype.class.getName()).up()).build(); + new BeansXml().alternatives(MockPaymentProcessorImpl.class).stereotype(AlternativeConsumerStereotype.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java index 6bfd690219..be0d12e089 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -37,12 +35,9 @@ public class ManagedBeanWithNonPassivatingDecoratorTest extends AbstractTest { @ShouldThrowException(DeploymentException.class) @Deployment public static WebArchive createTestArchive() { - // Originally EAR but no enterprise feature used return new WebArchiveBuilder() .withTestClassPackage(ManagedBeanWithNonPassivatingDecoratorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(MaarianhaminaDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml().decorators(MaarianhaminaDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java index e5762a0866..7163550b85 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java @@ -20,14 +20,12 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION_EE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +38,7 @@ public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractTest public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnterpriseBeanWithNonPassivatingDecoratorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(MaarianhaminaDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml().decorators(MaarianhaminaDecorator.class)).build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java index 7de109e5e2..402756a85a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java @@ -20,14 +20,12 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION_EE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +38,7 @@ public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extend public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(BrokenDecorator.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().decorators(BrokenDecorator.class)).build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java index 5a42582be9..32313d1c9f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +40,7 @@ public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorWithNonPassivatingInjectedFieldTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(CityDecorator.class.getName()).up()) - .build(); + .withBeansXml(new BeansXml().decorators(CityDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java index 5335f1c170..85bbcaee67 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +41,7 @@ public class EnterpriseBeanWithNonPassivatingInterceptorTest extends AbstractTes public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnterpriseBeanWithNonPassivatingInterceptorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(DigitalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)).build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java index 9723c170ad..b2bf35c97d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +37,7 @@ public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends Abs public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(PassivationCapableBeanWithNonPassivatingInterceptorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(BrokenInterceptor.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().interceptors(BrokenInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java index a30deb700d..d14743dafa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java @@ -25,6 +25,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -47,9 +48,7 @@ public class NonPassivationCapableSessionBeanTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NonPassivationCapableSessionBeanTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(DigitalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)).build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java index ab9c17cc66..be857b2e88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java @@ -20,14 +20,12 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_CAPABLE_EE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,9 +44,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(StatefulSessionBeanTest.class) .withClasses(Digital.class, DigitalInterceptor.class, Telephone.class, TelephoneLine.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(DigitalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)).build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanXmlDescriptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanXmlDescriptorTest.java index 0bbe75a848..1b66fd8224 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanXmlDescriptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanXmlDescriptorTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,9 +47,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(StatefulSessionBeanXmlDescriptorTest.class) .withClasses(Digital.class, DigitalInterceptor.class, Elephant.class, ElephantLocal.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(DigitalInterceptor.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)) .build() .addAsWebInfResource(StatefulSessionBeanXmlDescriptorTest.class.getPackage(), "ejb-jar.xml", "ejb-jar.xml"); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanTest.java index 58ca899e3b..4f45488dd8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanTest.java @@ -23,8 +23,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -43,9 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(StatefulSessionBeanTest.class) .withClasses(Digital.class, DigitalInterceptor.class, Telephone.class, TelephoneLine.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(DigitalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)).build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanXmlDescriptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanXmlDescriptorTest.java index 02881381a9..7672996423 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanXmlDescriptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/StatefulSessionBeanXmlDescriptorTest.java @@ -23,8 +23,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -43,9 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(StatefulSessionBeanXmlDescriptorTest.class) .withClasses(Digital.class, DigitalInterceptor.class, Elephant.class, ElephantLocal.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(DigitalInterceptor.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)) .build() .addAsWebInfResource(StatefulSessionBeanXmlDescriptorTest.class.getPackage(), "ejb-jar.xml", "ejb-jar.xml"); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java index 15cd9d6891..02bb42031e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -51,9 +52,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(DecoratorWithNonPassivationCapableDependenciesTest.class) .withClasses(Engine.class, Ferry.class, Vessel.class, VesselDecorator.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(VesselDecorator.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().decorators(VesselDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java index 5d190e782a..9208ea9ee9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java @@ -20,13 +20,11 @@ import static org.testng.Assert.assertEquals; import jakarta.enterprise.inject.spi.InterceptionType; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -50,9 +48,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(InterceptorWithNonPassivationCapableDependenciesTest.class) .withClasses(Engine.class, EnginePowered.class, EnginePoweredInterceptor.class, Ferry.class, Vessel.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(EnginePoweredInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(EnginePoweredInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java index 5005c5a889..c776f29a6d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java @@ -24,13 +24,11 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -50,8 +48,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BeanManagerDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(BeanManagerDecorator.class.getName()).up()).build(); + new BeansXml().decorators(BeanManagerDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java index 52d2b1b0c4..2729501360 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java @@ -22,23 +22,21 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import java.lang.reflect.Type; -import java.util.Collections; - import jakarta.enterprise.context.Conversation; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; + /** * @author Martin Kouba * @@ -52,8 +50,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinConversationDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(ConversationDecorator.class.getName()).up()).build(); + new BeansXml().decorators(ConversationDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/BuiltinEventDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/BuiltinEventDecoratorTest.java index 570e34f549..454d8b7f87 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/BuiltinEventDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/BuiltinEventDecoratorTest.java @@ -22,25 +22,23 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.lang.reflect.Type; -import java.util.Collections; - import jakarta.enterprise.event.Event; import jakarta.enterprise.util.TypeLiteral; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.Assert; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; + /** * @author Martin Kouba * @@ -54,9 +52,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinEventDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(FooEventDecorator.class.getName()) - .clazz(StringEventDecorator.class.getName()).clazz(CharSequenceEventDecorator.class.getName()) - .up()).build(); + new BeansXml().decorators(FooEventDecorator.class, StringEventDecorator.class, CharSequenceEventDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/complex/ComplexEventDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/complex/ComplexEventDecoratorTest.java index 7f95c3e30e..2ed283c68a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/complex/ComplexEventDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/event/complex/ComplexEventDecoratorTest.java @@ -30,6 +30,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -57,8 +58,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(ComplexEventDecoratorTest.class) .withExtension(OrderedEventDeliveryExtension.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(OrderedEventDeliveryDecorator.class.getName()).up()).build(); + new BeansXml().decorators(OrderedEventDeliveryDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java index b340de424d..16c4b5778e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java @@ -23,29 +23,27 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; - import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; + /** * @author Martin Kouba * @@ -60,9 +58,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinHttpServletRequestDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(HttpServletRequestDecorator1.class.getName()) - .clazz(HttpServletRequestDecorator2.class.getName()).up()).build(); + new BeansXml().decorators(HttpServletRequestDecorator1.class, HttpServletRequestDecorator2.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java index 68e8bb7caf..43b444378e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java @@ -22,25 +22,23 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; import jakarta.servlet.ServletContext; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + /** * @author Martin Kouba * @@ -55,9 +53,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinServletContextDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(ServletContextDecorator1.class.getName()) - .clazz(ServletContextDecorator2.class.getName()).up()).build(); + new BeansXml().decorators(ServletContextDecorator1.class, ServletContextDecorator2.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java index 85d96a5682..00342e496e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java @@ -23,25 +23,23 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; import jakarta.servlet.http.HttpSession; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + /** * @author Martin Kouba * @@ -55,9 +53,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinHttpSessionDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(HttpSessionDecorator1.class.getName()).clazz(HttpSessionDecorator2.class.getName()).up()) - .build(); + new BeansXml().decorators(HttpSessionDecorator1.class, HttpSessionDecorator2.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java index 0f83f678c4..653f7a114d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java @@ -32,6 +32,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -50,8 +51,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinInjectionPointDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(InjectionPointDecorator.class.getName()).up()).build(); + new BeansXml().decorators(InjectionPointDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java index 83172fd083..73314e3daf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java @@ -21,27 +21,25 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; - import jakarta.enterprise.inject.Instance; import jakarta.enterprise.util.TypeLiteral; import jakarta.inject.Inject; import jakarta.inject.Provider; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; + /** * Basic test for decorating built-in {@link Instance} bean. * @@ -57,8 +55,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinInstanceDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(MuleInstanceDecorator.class.getName()).up()).build(); + new BeansXml().decorators(MuleInstanceDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java index f87e9aba6b..41ccca848f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java @@ -21,23 +21,21 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.lang.reflect.Type; -import java.security.Principal; -import java.util.Collections; - import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.tests.decorators.AbstractDecoratorTest; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.security.Principal; +import java.util.Collections; + /** * * @author Martin Kouba @@ -52,8 +50,7 @@ public static EnterpriseArchive createTestArchive() { .withTestClassPackage(BuiltinPrincipalDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(PrincipalDecorator.class.getName()) - .up()).build(); + new BeansXml().decorators(PrincipalDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java index d2c2801646..73205307a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java @@ -21,13 +21,11 @@ import jakarta.inject.Inject; import jakarta.transaction.Status; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -51,8 +49,7 @@ public static EnterpriseArchive createTestArchive() { return new EnterpriseArchiveBuilder() .withTestClassPackage(BuiltinUserTransactionDecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(UserTransactionDecorator.class.getName()).up()).build(); + new BeansXml().decorators(UserTransactionDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java index 37fd2b7842..6c812c3902 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -41,8 +42,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(CustomDecoratorMatchingBeanWithFinalClassTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(VehicleDecorator.class.getName()) - .up()).withExtension(AfterBeanDiscoveryObserver.class).build(); + new BeansXml().decorators(VehicleDecorator.class)) + .withExtension(AfterBeanDiscoveryObserver.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/DecoratorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/DecoratorDefinitionTest.java index b7a0cc7a96..62a7dd8a04 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/DecoratorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/DecoratorDefinitionTest.java @@ -30,28 +30,26 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.List; - import jakarta.decorator.Delegate; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.util.AnnotationLiteral; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.HashSet; +import java.util.List; + /** * @author pmuir * @author Martin Kouba @@ -64,13 +62,9 @@ public class DecoratorDefinitionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorDefinitionTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateDecorators() - .clazz(BazDecorator1.class.getName(), BazDecorator2.class.getName(), - FooDecorator.class.getName(), TimestampLogger.class.getName(), - ChargeDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml().decorators(BazDecorator1.class, BazDecorator2.class, + FooDecorator.class, TimestampLogger.class, + ChargeDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java index f442a19491..84aba0bd39 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,8 +46,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorListedTwiceInBeansXmlTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(PresentDecorator.class.getName(), PresentDecorator.class.getName()).up()).build(); + new BeansXml().decorators(PresentDecorator.class, PresentDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java index 54eed94143..f1d94ba66d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_DECORATORS_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,8 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnabledDecoratorNotADecoratorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java index 34039049ee..eff817610f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATOR_RESOLUTION; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,8 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(FinalBeanClassTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java index 8fef377d4c..131bf358d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,8 +45,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(FinalBeanMethodTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java index f9976e4473..b95983442e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,7 +47,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorWithInvalidAbstractMethodTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(ThiefDecorator.class.getName()).up()) + new BeansXml().decorators(ThiefDecorator.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java index 768043dd59..228a3cfbee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,8 +45,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(MultipleDelegateInjectionPointsTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java index 5fd44f2098..1e3b15ceea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DELEGATE_ATTRIBUTE; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,8 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NoDelegateInjectionPointsTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java index f81b82a59f..b7c23cb076 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATOR_BEAN; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -49,7 +47,7 @@ public static WebArchive createTestArchive() { .withTestClass(DecoratorWithNoDecoratedTypes1Test.class) .withClasses(Foo.class, FooDecorator.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(FooDecorator.class.getName()).up()) + new BeansXml().decorators(FooDecorator.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java index fd9b0355c3..f9047dafab 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java @@ -19,14 +19,11 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_DECORATORS_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +36,8 @@ public class NonExistantDecoratorClassInBeansXmlTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NonExistantDecoratorClassInBeansXmlTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz("com.acme.NonExistantDecoratorClass").up()).build(); + .withBeansXml("beans.xml") + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java index 7da4baa2bc..5d1ef1e1b7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATED_TYPES; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,8 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NotAllDecoratedTypesImplementedTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java index 35473eb18b..19bc7ddbee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -46,8 +47,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(TypeParametersNotTheSameTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java index d85534026f..2250a4a715 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -41,8 +42,7 @@ public static WebArchive createTestArchive() { .withClasses(ApplicationLogger.class, FooPayload.class, Logger.class, MockLogger.class) .withTestClass(DecoratorWithAsyncObserverMethodTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(ApplicationLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(ApplicationLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java index b0fd5ef3db..ec6ba017be 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,8 +47,7 @@ public static WebArchive createTestArchive() { .withClasses(FilesystemLogger.class, FooPayload.class, Logger.class, MockLogger.class) .withTestClass(DecoratorWithObserverMethodTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(FilesystemLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(FilesystemLogger.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java index d31aeca44a..7a6e510467 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATED_TYPES; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,7 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DifferentTypeParametersTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(RadioDecorator.class.getName()).up()) + new BeansXml().decorators(RadioDecorator.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java index d716c360c4..d63d3b359e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java @@ -20,22 +20,20 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATORS; import static org.testng.Assert.assertTrue; -import java.net.URL; - +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; +import java.net.URL; /** * @@ -53,8 +51,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorInstanceIsDependentObjectTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(ChargeDecorator.class.getName()) - .up()).build(); + new BeansXml().decorators(ChargeDecorator.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java index b3f7a36b03..785ddef7bc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java @@ -25,8 +25,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -43,8 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorNotAppliedToResultOfProducerTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(ChargeDecorator.class.getName()) - .up()).build(); + new BeansXml().decorators(ChargeDecorator.class)).build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java index fa2fbfbb01..537d3c19a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java @@ -21,13 +21,11 @@ import static org.testng.Assert.assertEquals; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -45,8 +43,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DelegateTypeImplementsParameterizedDecoratedTypeTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()) - .up()).build(); + new BeansXml().decorators(TimestampLogger.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java index bb93d68195..7d8417c984 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java @@ -33,6 +33,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -46,9 +47,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorAndInterceptorTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(FooInterceptor1.class.getName(), FooInterceptor2.class.getName()).up() - .getOrCreateDecorators().clazz(FooDecorator1.class.getName(), FooDecorator2.class.getName()).up()) + new BeansXml().interceptors(FooInterceptor1.class, FooInterceptor2.class) + .decorators(FooDecorator1.class, FooDecorator2.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/DecoratorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/DecoratorInvocationTest.java index 74aa2922c9..dd92261173 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/DecoratorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/DecoratorInvocationTest.java @@ -25,8 +25,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -45,12 +44,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(DecoratorInvocationTest.class) .withExcludedClasses(EJBDecoratorInvocationTest.class.getName(), PigSty.class.getName(), PigStyImpl.class.getName(), PigStyDecorator.class.getName(), Pig.class.getName()) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateDecorators() - .clazz(BarDecorator.class.getName(), FooDecorator1.class.getName(), - FooDecorator2.class.getName(), TimestampLogger.class.getName()).up()).build(); + .withBeansXml(new BeansXml().decorators(BarDecorator.class, FooDecorator1.class, FooDecorator2.class, TimestampLogger.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java index b58d2a4328..d60296b0aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java @@ -22,13 +22,11 @@ import static org.testng.Assert.assertTrue; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -47,8 +45,8 @@ public static WebArchive createTestArchive() { .withTestClass(EJBDecoratorInvocationTest.class) .withClasses(PigSty.class, PigStyImpl.class, PigStyDecorator.class, Pig.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(PigStyDecorator.class.getName()) - .up()).build(); + new BeansXml().decorators(PigStyDecorator.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java index d3d5c19a12..aaa6551d2e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java @@ -24,25 +24,23 @@ import static org.jboss.cdi.tck.cdi.Sections.DELEGATE_ATTRIBUTE; import static org.testng.Assert.assertEquals; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + /** * * @author Martin Kouba @@ -55,15 +53,10 @@ public class EnterpriseDecoratorInvocationTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnterpriseDecoratorInvocationTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(FooInterceptor.class.getName()) - .up() - .getOrCreateDecorators() - .clazz(FooBusinessDecorator1.class.getName(), FooBusinessDecorator2.class.getName(), - BarBusinessDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml() + .interceptors(FooInterceptor.class) + .decorators(FooBusinessDecorator1.class, FooBusinessDecorator2.class, BarBusinessDecorator.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java index cfc40653f1..bf50c29588 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java @@ -37,6 +37,7 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -47,7 +48,7 @@ * @author Matus Abaffy */ @SpecVersion(spec = "cdi", version = "2.0") -public class EnterpriseDecoratorOrderingTest extends AbstractTest { + public class EnterpriseDecoratorOrderingTest extends AbstractTest { /** * Modules: @@ -74,8 +75,7 @@ public static EnterpriseArchive createTestArchive() { //A - default test-ejb.jar .withTestClassDefinition(EnterpriseDecoratorOrderingTest.class) .withClasses(DecoratedImpl.class, LegacyDecorator2.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class) - .getOrCreateDecorators().clazz(LegacyDecorator2.class.getName()).up()) + .withBeansXml(new BeansXml().decorators(LegacyDecorator2.class)) //B .withBeanLibrary(Decorated.class, GloballyEnabledDecorator3.class) //C @@ -86,9 +86,7 @@ public static EnterpriseArchive createTestArchive() { JavaArchive ejbArchive = ShrinkWrap .create(JavaArchive.class, ejbJar) .addClasses(DummyDao.class, GloballyEnabledDecorator2.class, GloballyEnabledDecorator5.class, LegacyDecorator3.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(LegacyDecorator3.class.getName()).up().exportAsString()), "beans.xml") + .addAsManifestResource(new BeansXml().decorators(LegacyDecorator3.class), "beans.xml") .setManifest( new StringAsset(Descriptors.create(ManifestDescriptor.class) .addToClassPath(EnterpriseArchiveBuilder.DEFAULT_EJB_MODULE_NAME) @@ -100,8 +98,7 @@ public static EnterpriseArchive createTestArchive() { .notTestArchive() //F .withClasses(EnterpriseDecoratorOrderingTest.class, GloballyEnabledDecorator1.class, LegacyDecorator1.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class) - .getOrCreateDecorators().clazz(LegacyDecorator1.class.getName()).up()) + .withBeansXml(new BeansXml().decorators(LegacyDecorator1.class)) //G .withBeanLibrary(GloballyEnabledDecorator4.class) .build() diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java index 725d0cdc1e..d665cad76f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java @@ -21,22 +21,20 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_DECORATORS_PRIORITY; import static org.testng.Assert.assertEquals; -import java.util.ArrayList; -import java.util.List; - import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.List; + /** *

* This test was originally part of the Weld test suite. @@ -55,12 +53,7 @@ public static WebArchive createTestArchive() { .withTestClass(GlobalDecoratorOrderingTest.class) .withClasses(DecoratedImpl.class, LegacyDecorator1.class, LegacyDecorator2.class, LegacyDecorator3.class, WebApplicationGlobalDecorator.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateDecorators() - .clazz(LegacyDecorator1.class.getName(), LegacyDecorator2.class.getName(), - LegacyDecorator3.class.getName()).up()) + .withBeansXml(new BeansXml().decorators(LegacyDecorator1.class, LegacyDecorator2.class, LegacyDecorator3.class)) .withBeanLibrary(AbstractDecorator.class, Decorated.class, GloballyEnabledDecorator1.class, GloballyEnabledDecorator2.class, GloballyEnabledDecorator3.class, GloballyEnabledDecorator4.class, GloballyEnabledDecorator5.class).build(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java index 5646b3fa6b..4dd4139057 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -46,8 +47,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(EnterpriseStereotypeAlternativeSpecializeTest.class) .withClasses(Mock.class, Service.class, MockService.class, RealService.class, AbstractService.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().stereotype(Mock.class.getName()).up()) + .withBeansXml(new BeansXml().stereotype(Mock.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java index 7f3264c58a..aab02828b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -46,8 +47,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(EnterpriseStereotypeAlternativeTest.class) .withClasses(Mock.class, SimpleAlternativeService.class, Service.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().stereotype(Mock.class.getName()).up()) + .withBeansXml(new BeansXml().stereotype(Mock.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java index 9bbe24bd5b..a2610ff509 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java @@ -25,8 +25,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -43,9 +42,7 @@ public class StereotypeWithMultipleInterceptorBindingsTest extends AbstractTest public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(StereotypeWithMultipleInterceptorBindingsTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(AlphaInterceptor.class.getName(), OmegaInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(AlphaInterceptor.class, OmegaInterceptor.class)).build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java index daa23bd1ad..85edfba4f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java @@ -20,13 +20,11 @@ import static org.jboss.cdi.tck.cdi.Sections.INTERCEPTORS_EE; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -45,9 +43,7 @@ public class EnterpriseStereotypeInterceptorBindingTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnterpriseStereotypeInterceptorBindingTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(AlphaInterceptor.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().interceptors(AlphaInterceptor.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java index 643dde11e7..6427f3b709 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java @@ -26,18 +26,15 @@ import jakarta.enterprise.inject.spi.Extension; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; -import org.jboss.cdi.tck.util.Versions; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -54,13 +51,11 @@ public class BeanDiscoveryTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { - // 1.1 version beans.xml with bean-discovery-mode of all + // beans.xml with bean-discovery-mode of all JavaArchive alpha = ShrinkWrap .create(JavaArchive.class) .addClass(Alpha.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).exportAsString()), - "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml"); // Empty beans.xml JavaArchive bravo = ShrinkWrap.create(JavaArchive.class).addClass(Bravo.class) .addAsManifestResource(new StringAsset(""), "beans.xml"); @@ -68,26 +63,21 @@ public static WebArchive createTestArchive() { JavaArchive charlie = ShrinkWrap .create(JavaArchive.class) .addClass(Charlie.class) - .addAsManifestResource(new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version( - Versions.v1_1).exportAsString()), "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL),"beans.xml"); // Bean defining annotation and no beans.xml JavaArchive delta = ShrinkWrap.create(JavaArchive.class).addClasses(Delta.class, Golf.class, India.class, Kilo.class, Mike.class, Interceptor1.class, Decorator1.class); - // Bean defining annotation and 1.1 version beans.xml with bean-discovery-mode of annotated + // Bean defining annotation and beans.xml with bean-discovery-mode of annotated JavaArchive echo = ShrinkWrap .create(JavaArchive.class) .addClasses(Echo.class, EchoNotABean.class, Hotel.class, Juliet.class, JulietNotABean.class, Lima.class, November.class, Interceptor2.class, Decorator2.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ANNOTATED.toString()).exportAsString()), - "beans.xml"); - // Bean defining annotation and 1.1 version beans.xml with bean-discovery-mode of none + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED), "beans.xml"); + // Bean defining annotation and beans.xml with bean-discovery-mode of none JavaArchive foxtrot = ShrinkWrap .create(JavaArchive.class) .addClass(Foxtrot.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._NONE.toString()).exportAsString()), - "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE), "beans.xml"); // Archive which contains an extension and no beans.xml file JavaArchive legacy = ShrinkWrap.create(JavaArchive.class).addClasses(LegacyExtension.class, LegacyAlpha.class, diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java index 9166ee1474..5389255d55 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java @@ -27,20 +27,19 @@ import jakarta.enterprise.inject.spi.Extension; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -63,13 +62,11 @@ public class EnterpriseBeanDiscoveryTest extends AbstractTest { @Deployment public static EnterpriseArchive createTestArchive() { - // 1.1 version beans.xml with bean-discovery-mode of all + // beans.xml with bean-discovery-mode of all JavaArchive alpha = ShrinkWrap .create(JavaArchive.class, ALPHA_JAR) .addClasses(Alpha.class, AlphaLocal.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).exportAsString()), - "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml"); // Empty beans.xml JavaArchive bravo = ShrinkWrap.create(JavaArchive.class, BRAVO_JAR).addClasses(Bravo.class, BravoLocal.class) .addAsManifestResource(new StringAsset(""), "beans.xml"); @@ -77,23 +74,20 @@ public static EnterpriseArchive createTestArchive() { JavaArchive charlie = ShrinkWrap .create(JavaArchive.class, CHARLIE_JAR) .addClasses(Charlie.class, CharlieLocal.class) - .addAsManifestResource(new StringAsset(Descriptors.create(BeansDescriptor.class).exportAsString()), "beans.xml"); + // add path to pre-created beans.xml + .addAsManifestResource(EnterpriseBeanDiscoveryTest.class.getPackage().getName().replace('.', '/').concat("/") + "beans.xml"); // Session bean and no beans.xml JavaArchive delta = ShrinkWrap.create(JavaArchive.class, DELTA_JAR).addClasses(Delta.class, DeltaLocal.class); - // Session bean and 1.1 version beans.xml with bean-discovery-mode of annotated + // Session bean and beans.xml with bean-discovery-mode of annotated JavaArchive echo = ShrinkWrap .create(JavaArchive.class, ECHO_JAR) .addClasses(Echo.class, EchoLocal.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ANNOTATED.toString()).exportAsString()), - "beans.xml"); - // Session bean and 1.1 version beans.xml with bean-discovery-mode of none + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED), "beans.xml"); + // Session bean and beans.xml with bean-discovery-mode of none JavaArchive foxtrot = ShrinkWrap .create(JavaArchive.class, FOXTROT_JAR) .addClasses(Foxtrot.class, FoxtrotLocal.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._NONE.toString()).exportAsString()), - "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE), "beans.xml"); // Archive which contains an extension and no beans.xml file - not a bean archive JavaArchive legacy = ShrinkWrap.create(JavaArchive.class, LEGACY_JAR) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java index d1ff9fbd3d..7dbb9be220 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java @@ -22,23 +22,21 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.Set; - import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.ObserverMethod; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.Set; + @Test(groups = { JAVAEE_FULL, INTEGRATION }) @SpecVersion(spec = "cdi", version = "2.0") public class EnterpriseDefaultBeanDiscoveryModeTest extends AbstractTest { @@ -52,8 +50,8 @@ public class EnterpriseDefaultBeanDiscoveryModeTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(EnterpriseDefaultBeanDiscoveryModeTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ANNOTATED.toString())).withExtension( - TestExtension.class).build(); + .withBeansXml(new BeansXml(BeanDiscoveryMode.ANNOTATED)) + .withExtension(TestExtension.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java index eb0ab5d34d..bae22a28d8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java @@ -32,10 +32,10 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -53,8 +53,7 @@ public class DefaultBeanDiscoveryModeTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder() - .withBeansXml(Descriptors.create(BeansDescriptor.class) - .beanDiscoveryMode(BeanDiscoveryMode._ANNOTATED.toString()).version("2.0")) + .withBeansXml(new BeansXml(BeanDiscoveryMode.ANNOTATED)) .withTestClass(DefaultBeanDiscoveryModeTest.class) .withExtension(TestExtension.class) .withPackage(DefaultBeanDiscoveryModeTest.class.getPackage()).build(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/exclude/ExcludeFiltersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/exclude/ExcludeFiltersTest.java index 223b332546..c5e2d91e66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/exclude/ExcludeFiltersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/exclude/ExcludeFiltersTest.java @@ -36,6 +36,7 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -55,21 +56,19 @@ public static WebArchive createTestArchive() { .withPackage(Beard.class.getPackage()) .withPackage(Chonmage.class.getPackage()) .withPackage(Meat.class.getPackage()) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).createScan().createExclude() - .name(Chonmage.class.getPackage().getName() + ".*").up().createExclude() - .name(Mustache.class.getPackage().getName() + ".**").up().createExclude() - .name(Meat.class.getPackage().getName() + ".*").createIfClassAvailable().name("com.some.unreal.class.Name").up().up().createExclude() - .name(Meat.class.getPackage().getName() + ".*").createIfClassNotAvailable().name(ExcludeFiltersTest.class.getName()).up().up().createExclude() - .name(Alpha.class.getName()).createIfClassAvailable().name(Stubble.class.getName()).up().up().createExclude() - .name(Stubble.class.getName()).up().createExclude() - .name(Foxtrot.class.getName()).createIfClassAvailable().name("com.some.unreal.class.Name").up().up().createExclude() - .name(Bravo.class.getName()).createIfClassNotAvailable().name("com.some.unreal.class.Name").up().up().createExclude() - .name(Echo.class.getName()).createIfClassNotAvailable().name(ExcludeFiltersTest.class.getName()).up().up().createExclude() - .name(Charlie.class.getName()).createIfSystemProperty().name(TestSystemProperty.EXCLUDE_DUMMY.getKey()).up().up().createExclude() - .name(Delta.class.getName()).createIfSystemProperty().name(TestSystemProperty.EXCLUDE_DUMMY.getKey()) - .value(TestSystemProperty.EXCLUDE_DUMMY.getValue()).up().up().up() - ) + .withBeansXml(new BeansXml().excludeFilters( + BeansXml.Exclude.match(Chonmage.class.getPackage().getName() + ".*"), + BeansXml.Exclude.match(Mustache.class.getPackage().getName() + ".**"), + BeansXml.Exclude.match(Meat.class.getPackage().getName() + ".*").ifClassAvailable("com.some.unreal.class.Name"), + BeansXml.Exclude.match(Meat.class.getPackage().getName() + ".*").ifClassNotAvailable(ExcludeFiltersTest.class.getName()), + BeansXml.Exclude.match(Alpha.class.getName()).ifClassAvailable(Stubble.class.getName()), + BeansXml.Exclude.match(Stubble.class.getName()), + BeansXml.Exclude.match(Foxtrot.class.getName()).ifClassAvailable("com.some.unreal.class.Name"), + BeansXml.Exclude.match(Bravo.class.getName()).ifClassNotAvailable("com.some.unreal.class.Name"), + BeansXml.Exclude.match(Echo.class.getName()).ifClassNotAvailable(ExcludeFiltersTest.class.getName()), + BeansXml.Exclude.match(Charlie.class.getName()).ifSystemProperty(TestSystemProperty.EXCLUDE_DUMMY.getKey()), + BeansXml.Exclude.match(Delta.class.getName()).ifSystemProperty(TestSystemProperty.EXCLUDE_DUMMY.getKey(), TestSystemProperty.EXCLUDE_DUMMY.getValue()) + )) .withExtension(VerifyingExtension.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java index bd29586f61..5f8cfc93b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java @@ -30,32 +30,29 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import java.util.Set; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Extension; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; -import org.jboss.cdi.tck.util.Versions; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.Set; + /** * This test is aimed to verify packaging-related issues in a little bit more complex deployment scenario. The assertions are * rather informative and redundant as they're already verified in elementary tests. @@ -105,10 +102,7 @@ public static EnterpriseArchive createTestArchive() { .create(JavaArchive.class, "bar-ejb.jar") .addClasses(Bar.class, AlternativeBar.class, BarInspector.class, ContainerEventsObserver.class, LegacyServiceProducer.class) .addAsServiceProvider(Extension.class, ContainerEventsObserver.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SecurityInterceptor.class.getName()).up().beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version(Versions.v1_1) - .exportAsString()), "beans.xml") + .addAsManifestResource(new BeansXml().interceptors(SecurityInterceptor.class), "beans.xml") // Make A visible in a portable way .setManifest( new StringAsset(Descriptors.create(ManifestDescriptor.class) @@ -120,9 +114,7 @@ public static EnterpriseArchive createTestArchive() { .notTestArchive() // F - with enabled decorator .withClasses(Baz.class, EnterpriseArchiveModulesTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(LoggingDecorator.class.getName()) - .up().getOrCreateAlternatives().clazz(AlternativeBar.class.getName()).up()) + .withBeansXml(new BeansXml().decorators(LoggingDecorator.class).alternatives(AlternativeBar.class)) // G .withBeanLibrary(Qux.class) .build() diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java index ec4e9c4dcf..d89eed7e89 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java @@ -37,6 +37,7 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -53,8 +54,7 @@ public static JavaArchive createEjbtArchive() { .create(JavaArchive.class, "test-ejb.jar") .addClasses(FooRemote.class, FooBean.class, Bar.class, ProcessBeanObserver.class) .addAsServiceProvider(Extension.class, ProcessBeanObserver.class) - .addAsManifestResource(new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version( - Versions.v1_1).exportAsString()), "beans.xml"); + .addAsManifestResource(new BeansXml(), "beans.xml"); } @Deployment(name = "TEST", order = 2) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java index fd64d54d3f..1777d99b2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java @@ -25,16 +25,14 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; -import org.jboss.cdi.tck.util.Versions; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.connector16.ConnectorDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -59,9 +57,7 @@ public static EnterpriseArchive createTestArchive() { rar.addAsLibrary(ShrinkWrap .create(JavaArchive.class) .addClasses(Translator.class, TestResourceAdapter.class) - .addAsManifestResource(new StringAsset(Descriptors.create(BeansDescriptor.class) - .beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).version(Versions.v1_1) - .exportAsString()), "beans.xml")); + .addAsManifestResource(new BeansXml(), "beans.xml")); rar.addAsManifestResource( new StringAsset(Descriptors.create(ConnectorDescriptor.class).version("1.6").displayName("Test RA") .vendorName("Red Hat Middleware LLC").eisType("Test RA").resourceadapterVersion("0.1") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java index 33722c15ce..c89ec6ef17 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java @@ -30,23 +30,21 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import java.util.Set; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.Set; + /** * This test is aimed to verify packaging-related issues in a little bit more complex deployment scenario. The assertions are * rather informative and redundant as they're already verified in elementary tests. @@ -74,18 +72,12 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(WebArchiveModulesTest.class) // A .withClasses(Foo.class, Secured.class, SecurityInterceptor.class, Business.class, BusinessOperationEvent.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeBar.class.getName()) - .up()) + .withBeansXml(new BeansXml().alternatives(AlternativeBar.class)) // B - .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SecurityInterceptor.class.getName()).up(), Bar.class, AlternativeBar.class, + .withBeanLibrary(new BeansXml().interceptors(SecurityInterceptor.class), Bar.class, AlternativeBar.class, BarInspector.class) // C - .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(LoggingDecorator.class.getName()) - .up(), Baz.class, LoggingDecorator.class, Bazinga.class) + .withBeanLibrary(new BeansXml().decorators(LoggingDecorator.class), Baz.class, LoggingDecorator.class, Bazinga.class) // D .withBeanLibrary(Qux.class, ContainerEventsObserver.class, LegacyServiceProducer.class) // E diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java index 0d3b57f96e..f190930919 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java @@ -21,13 +21,11 @@ import static org.jboss.cdi.tck.cdi.Sections.INITIALIZATION; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -55,9 +53,8 @@ public class AlternativeInLibraryWithExtensionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(AlternativeInLibraryWithExtensionTest.class) - .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(BarAlternative.class.getName()) - .up(), Foo.class, Bar.class, BarAlternative.class, NoopExtension.class).build(); + .withBeanLibrary(new BeansXml().alternatives(BarAlternative.class), + Foo.class, Bar.class, BarAlternative.class, NoopExtension.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java index 5ee7e16115..0848973fc9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java @@ -23,26 +23,24 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import java.lang.annotation.Annotation; -import java.util.Set; - import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.AnnotationLiteral; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Annotation; +import java.util.Set; + /** * This test class contains tests for adding meta data using extensions. * @@ -57,10 +55,7 @@ public class AlternativeMetadataTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(AlternativeMetadataTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(GroceryInterceptor.class.getName()).up() - ) + .withBeansXml(new BeansXml().interceptors(GroceryInterceptor.class)) .withExtension(ProcessAnnotatedTypeObserver.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java index 1c85b56c73..87ecfd88b7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java @@ -40,6 +40,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -52,7 +53,8 @@ public class AlternativeMetadataInterceptorInjectionTargetTest extends AbstractT public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(AlternativeMetadataInterceptorInjectionTargetTest.class) .withClasses(Login.class, LoginInterceptor.class, LoginInterceptorBinding.class, Secured.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(LoginInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(LoginInterceptor.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java index d68f3132e9..24dff9f8d5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -46,7 +47,7 @@ public class AlternativeMetadataInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(AlternativeMetadataInterceptorTest.class) .withClasses(InterceptorExtension.class, Login.class, LoginInterceptor.class, LoginInterceptorBinding.class, Secured.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(LoginInterceptor.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(LoginInterceptor.class)) .withExtension(InterceptorExtension.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/bean/bytype/BeanByTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/bean/bytype/BeanByTypeTest.java index 0da07fa9a3..9872dc8f2d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/bean/bytype/BeanByTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/bean/bytype/BeanByTypeTest.java @@ -33,6 +33,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -51,9 +52,7 @@ public class BeanByTypeTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(BeanByTypeTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(AlternativeConnector.class.getName()).up()).build(); + .withBeansXml(new BeansXml().alternatives(AlternativeConnector.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/BeanManagerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/BeanManagerTest.java index 1e41400447..565ebd15a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/BeanManagerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/BeanManagerTest.java @@ -34,17 +34,6 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import java.lang.annotation.Annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; @@ -58,20 +47,29 @@ import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.literals.RetentionLiteral; import org.jboss.cdi.tck.literals.TargetLiteral; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Annotation; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + /** * Mostly tests for extensions specified in chapter 11 of the specification and not already tested elsewhere. * @@ -88,7 +86,7 @@ public class BeanManagerTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(BeanManagerTest.class) .withClasses(RetentionLiteral.class, TargetLiteral.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Soy.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Soy.class)) .withExtensions(AfterBeanDiscoveryObserver.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/bean/SyntheticBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/bean/SyntheticBeanTest.java index 370f2990dd..0a60413057 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/bean/SyntheticBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/bean/SyntheticBeanTest.java @@ -28,13 +28,11 @@ import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.PassivationCapable; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -56,8 +54,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SyntheticBeanTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(SimpleInterceptor.class.getName()) - .up().getOrCreateDecorators().clazz(VehicleDecorator.class.getName()).up()) + new BeansXml().interceptors(SimpleInterceptor.class).decorators(VehicleDecorator.class)) .withExtension(BeanExtension.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java index 2a59053606..908c41110e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java @@ -35,6 +35,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -51,9 +52,7 @@ public class InterceptorBindingEquivalenceTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorBindingEquivalenceTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java index 7006d54baf..14fa6daa02 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java @@ -21,27 +21,26 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanAttributes; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + /** * @author Matej Novotny */ @@ -55,9 +54,7 @@ public class BeanAttributesConfiguratorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(BeanAttributesConfiguratorTest.class) .withExtension(ProcessBeanAttributesObserver.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(Axe.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Axe.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java index 1d4f5bc1ca..0cf54c7e18 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java @@ -26,13 +26,11 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -61,8 +59,7 @@ public static WebArchive createTestArchive() { .withLibrary(SuffixingInterceptor.class, IncrementingInterceptor.class, LifecycleInterceptor.class, Suffixed.class, FullMarathon.class, Incremented.class, InterceptorExtension.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SuffixingInterceptor.class.getName(), IncrementingInterceptor.class.getName(), LifecycleInterceptor.class.getName()).up()) + new BeansXml().interceptors(SuffixingInterceptor.class, IncrementingInterceptor.class, LifecycleInterceptor.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorInvocationTest.java index 1dbcb921de..a6724b80bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorInvocationTest.java @@ -22,14 +22,12 @@ import jakarta.inject.Inject; import jakarta.interceptor.Interceptor; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.HierarchyDiscovery; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -62,9 +60,7 @@ public static WebArchive createTestArchive() { CustomInterceptorExtension.class, FooInterceptor.class, FooInterceptorBinding.class, InterceptedBean.class) .withExtension(CustomInterceptorExtension.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(FooInterceptor.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().interceptors(FooInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java index 122e32d202..9866e1b0c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.AFTER_BEAN_DISCOVERY; import jakarta.interceptor.Interceptor; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.HierarchyDiscovery; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -56,9 +54,7 @@ public static WebArchive createTestArchive() { CustomInterceptorExtension.class, FooInterceptor.class, FooInterceptorBinding.class, InterceptedBean.class, InterceptedSerializableBean.class) .withExtension(CustomInterceptorExtension.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(FooInterceptor.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().interceptors(FooInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java index e56c43cf45..1afcd83333 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java @@ -27,7 +27,6 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -37,8 +36,7 @@ import org.jboss.cdi.tck.tests.extensions.lifecycle.atd.lib.Foo; import org.jboss.cdi.tck.tests.extensions.lifecycle.atd.lib.Pro; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -56,11 +54,9 @@ public static WebArchive createTestArchive() { .withTestClassPackage(AfterTypeDiscoveryTest.class) .withExtension(AfterTypeDiscoveryObserver.class) .withLibrary(Boss.class, Foo.class, Bar.class, Baz.class, Pro.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(CharlieInterceptor.class.getName()).up().getOrCreateDecorators() - .clazz(CharlieDecorator.class.getName()).up().getOrCreateAlternatives() - .clazz(CharlieAlternative.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(CharlieInterceptor.class) + .decorators(CharlieDecorator.class).alternatives(CharlieAlternative.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java index 4835857b10..8b44429be5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java @@ -26,8 +26,6 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import java.lang.annotation.Annotation; - import jakarta.decorator.Decorator; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; @@ -42,18 +40,18 @@ import jakarta.enterprise.inject.spi.BeanAttributes; import jakarta.inject.Inject; import jakarta.inject.Named; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Annotation; + /** *

* This test was originally part of Weld test suite. @@ -74,10 +72,9 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(VerifyValuesTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(Alpha.class.getName(), BravoProducer.class.getName(), CharlieProducer.class.getName()) - .up().getOrCreateInterceptors().clazz(BravoInterceptor.class.getName()).up().getOrCreateDecorators() - .clazz(BravoDecorator.class.getName()).up()).withExtension(VerifyingExtension.class).build(); + new BeansXml().alternatives(Alpha.class, BravoProducer.class, CharlieProducer.class) + .interceptors(BravoInterceptor.class).decorators(BravoDecorator.class)) + .withExtension(VerifyingExtension.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java index 568b8cbe8e..3432a2487c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java @@ -24,8 +24,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,12 +44,9 @@ public static WebArchive createTestArchive() { .withClasses(VerifyingExtension.class, AlphaDecorator.class, Alpha.class, Charlie.class) .withExtension(VerifyingExtension.class) .withBeanLibrary(BravoDecorator.class, Bravo.class) - .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(AlphaDecorator.class.getName(), BravoDecorator.class.getName()).up()) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(AlphaDecorator.class.getName(), BravoDecorator.class.getName()).up()).build(); + .withBeanLibrary(new BeansXml().decorators(AlphaDecorator.class, BravoDecorator.class)) + .withBeansXml(new BeansXml().decorators(AlphaDecorator.class, BravoDecorator.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java index e51f662e30..1ab24a47ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java @@ -24,8 +24,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,12 +44,9 @@ public static WebArchive createTestArchive() { .withClasses(VerifyingExtension.class, AlphaInterceptor.class, AlphaInterceptorBinding.class) .withExtension(VerifyingExtension.class) .withBeanLibrary(BravoInterceptor.class, BravoInterceptorBinding.class) - .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(AlphaInterceptor.class.getName(), BravoInterceptor.class.getName()).up()) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(AlphaInterceptor.class.getName(), BravoInterceptor.class.getName()).up()).build(); + .withBeanLibrary(new BeansXml().interceptors(AlphaInterceptor.class, BravoInterceptor.class)) + .withBeansXml(new BeansXml().interceptors(AlphaInterceptor.class, BravoInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java index 824eb4e82a..2925f79f3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java @@ -33,6 +33,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -53,7 +54,7 @@ public class SetBeanAttributesTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(SetBeanAttributesTest.class) .withExtension(ModifyingExtension.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Cat.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Cat.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java index c891107dd2..8e40809323 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java @@ -32,6 +32,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -53,9 +54,8 @@ public class InjectionPointOverridingTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InjectionPointOverridingTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(AnimalDecorator.class.getName()) - .up()).withExtension(ModifyingExtension.class).build(); + .withBeansXml(new BeansXml().decorators(AnimalDecorator.class)) + .withExtension(ModifyingExtension.class).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ProcessBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ProcessBeanTest.java index 7699673049..74c4b18d19 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ProcessBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ProcessBeanTest.java @@ -41,6 +41,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -59,10 +60,9 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(ProcessBeanTest.class) .withClasses(Cat.class, Cow.class, Cowshed.class, Domestic.class, Chicken.class, ChickenHutch.class, - ProcessBeanObserver.class, CatInterceptor.class, CatInterceptorBinding.class, Animal.class, AnimalDecorator.class). - withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(CatInterceptor.class.getName()) - .up().getOrCreateDecorators().clazz(AnimalDecorator.class.getName()).up()). - withExtension(ProcessBeanObserver.class).build(); + ProcessBeanObserver.class, CatInterceptor.class, CatInterceptorBinding.class, Animal.class, AnimalDecorator.class) + .withBeansXml(new BeansXml().interceptors(CatInterceptor.class).decorators(AnimalDecorator.class)) + .withExtension(ProcessBeanObserver.class).build(); } @SuppressWarnings("unchecked") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/BuiltinMetadataBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/BuiltinMetadataBeanTest.java index a6b53456af..0ac9acbec6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/BuiltinMetadataBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/BuiltinMetadataBeanTest.java @@ -19,27 +19,25 @@ import static org.jboss.cdi.tck.cdi.Sections.BEAN_METADATA; import static org.testng.Assert.assertEquals; -import java.lang.reflect.Type; -import java.util.Collections; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; + /** *

* This test was originally part of Weld test suite. @@ -58,10 +56,7 @@ public class BuiltinMetadataBeanTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(BuiltinMetadataBeanTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(YoghurtInterceptor.class.getName()).up().getOrCreateDecorators() - .clazz(MilkProductDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(YoghurtInterceptor.class).decorators(MilkProductDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java index d9d515c2aa..456a34e6a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java @@ -16,32 +16,30 @@ */ package org.jboss.cdi.tck.tests.implementation.builtin.metadata.session; -import static org.jboss.cdi.tck.cdi.Sections.BEAN_METADATA; import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.cdi.Sections.BEAN_METADATA; import static org.testng.Assert.assertEquals; -import java.lang.reflect.Type; -import java.util.Collections; - import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.implementation.builtin.metadata.Frozen; import org.jboss.cdi.tck.tests.implementation.builtin.metadata.YoghurtInterceptor; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Collections; + /** * @author Tomas Remes */ @@ -55,10 +53,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinMetadataSessionBeanTest.class) .withClasses(YoghurtInterceptor.class, Frozen.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(YoghurtInterceptor.class.getName()).up().getOrCreateDecorators() - .clazz(BakeryProductDecorator.class.getName()) - .up()).build(); + new BeansXml().interceptors(YoghurtInterceptor.class).decorators(BakeryProductDecorator.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java index 5ca5b23ec5..9bba38aae8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_DISPOSER_METHOD; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +37,7 @@ public class DisposerMethodOnDecoratorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DisposerMethodOnDecoratorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(FooDecorator_Broken.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().decorators(FooDecorator_Broken.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java index c9994eef37..88ebfdd173 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +40,7 @@ public class DisposerMethodOnInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DisposerMethodOnInterceptorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SimpleInterceptor_Broken.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(SimpleInterceptor_Broken.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java index b420167316..a8c97102f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java @@ -23,9 +23,6 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import java.lang.reflect.Type; -import java.util.Set; - import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; @@ -33,18 +30,19 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.New; import jakarta.enterprise.inject.spi.Bean; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.reflect.Type; +import java.util.Set; + @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") public class NewEnterpriseBeanTest extends AbstractTest { @@ -57,9 +55,7 @@ public static WebArchive createTestArchive() { Dragon.class.getName(), NewEnterpriseBeanICTest.class.getName(), Hat.class.getName(), Fireball.class.getName()) .withLibrary(Tiger.class, Spell.class, Staff.class, Dragon.class, Hat.class, Fireball.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(OrderInterceptor.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().interceptors(OrderInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java index e5d0b84d00..b8c25a0f24 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +40,7 @@ public class ProducerFieldOnDecoratorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(ProducerFieldOnDecoratorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(FooDecorator_Broken.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().decorators(FooDecorator_Broken.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java index e1e9008aec..c7b516133f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_FIELD; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +37,7 @@ public class ProducerFieldOnInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(ProducerFieldOnInterceptorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SimpleInterceptor_Broken.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(SimpleInterceptor_Broken.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java index a5ebb7c101..d4c88dd7b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_METHOD; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +37,7 @@ public class ProducerMethodOnDecoratorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(ProducerMethodOnDecoratorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(FooDecorator_Broken.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().decorators(FooDecorator_Broken.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java index 8a3c95a598..55746c47d6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_METHOD; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -39,9 +37,7 @@ public class ProducerMethodOnInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(ProducerMethodOnInterceptorTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SimpleInterceptor_Broken.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(SimpleInterceptor_Broken.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java index 68466df41d..5b52584cae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java @@ -17,18 +17,10 @@ package org.jboss.cdi.tck.tests.implementation.simple.newSimpleBean; import static org.jboss.cdi.tck.cdi.Sections.NEW; -import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertEquals; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.TreeSet; +import static org.testng.Assert.assertTrue; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; @@ -37,19 +29,25 @@ import jakarta.enterprise.inject.New; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.TypeLiteral; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.DependentInstance; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.TreeSet; + @SpecVersion(spec = "cdi", version = "2.0") public class NewSimpleBeanTest extends AbstractTest { @@ -57,9 +55,7 @@ public class NewSimpleBeanTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NewSimpleBeanTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Tiger.class.getName()).up() - .getOrCreateInterceptors().clazz(OrderInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().alternatives(Tiger.class).interceptors(OrderInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java index 8ee33e3015..7edcf19d03 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java @@ -27,33 +27,31 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.enterprise.util.AnnotationLiteral; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.HierarchyDiscovery; import org.jboss.cdi.tck.util.ParameterizedTypeImpl; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * Tests related to the definition of interceptors, but not necessarily their execution. * @@ -84,13 +82,9 @@ public class InterceptorDefinitionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorDefinitionTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(AtomicInterceptor.class.getName(), MissileInterceptor.class.getName(), - SecureInterceptor.class.getName(), TransactionalInterceptor.class.getName(), - FileLogger.class.getName(), NetworkLogger.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(AtomicInterceptor.class, MissileInterceptor.class, + SecureInterceptor.class, TransactionalInterceptor.class, FileLogger.class, NetworkLogger.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java index 678194e1e9..6d1ccd4a54 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +38,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(DependentBeanFinalMethodInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, NuclearMissileFinalMethod.class, NuclearMissileIPBean.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java index b5886b413c..7cfc3befad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,9 +46,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(FinalClassClassLevelInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassClassLevelMissile.class, FinalClassClassLevelIPBean.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelInterceptorTest.java index af6993f614..cc19cec991 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,9 +43,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(FinalClassMethodLevelInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassMethodLevelMissile.class, FinalClassMethodLevelIPBean.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodClassLevelInterceptorTest.java index 6873e33230..e7bd354ac4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodClassLevelInterceptorTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -47,9 +48,7 @@ public static WebArchive createTestArchive() { .withTestClassDefinition(FinalMethodClassLevelInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, FinalMethodClassLevelMissile.class, FinalMethodClassLevelMissileLocal.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } //TODO disable due to https://issues.jboss.org/browse/CDI-496 diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodMethodLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodMethodLevelInterceptorTest.java index 76638fa16b..bb7b940fa8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodMethodLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalMethodMethodLevelInterceptorTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -47,9 +48,7 @@ public static WebArchive createTestArchive() { .withTestClassDefinition(FinalMethodMethodLevelInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, FinalMethodMethodLevelMissile.class, FinalMethodMethodLevelMissileLocal.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } //TODO disable due to https://issues.jboss.org/browse/CDI-496 diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java index 23f86a3fb9..03a43ea809 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +38,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(NormalScopedBeanFinalClassInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, AntiAircraftMissileFinalClass.class, AntiAircraftIPBean.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java index cb6cd03d99..80f6c633f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +38,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(NormalScopedBeanFinalMethodInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, SurfaceToAirMissileFinalMethod.class, SurfaceToAirIPBean.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java index 535c12c10f..8607bfbd92 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java @@ -19,14 +19,11 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -38,7 +35,7 @@ public class NonExistantClassInBeansXmlTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(NonExistantClassInBeansXmlTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz("com.acme.Foo").up()) + .withBeansXml("beans.xml") .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java index e78d606dac..c334cc6cc2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -38,7 +39,7 @@ public class NonInterceptorClassInBeansXmlTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(NonInterceptorClassInBeansXmlTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(Foo.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(Foo.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java index d43f9c1a24..763e35c346 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.OBSERVES; import jakarta.enterprise.inject.spi.DefinitionException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -44,9 +42,7 @@ public class InterceptorWithObserverMethodTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorWithObserverMethodTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(TransactionalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(TransactionalInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java index 1b7b777d1a..12cc9dc94b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java @@ -19,14 +19,12 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,8 +38,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SameClassListedTwiceInBeansXmlTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(FordInterceptor.class.getName(), FordInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(FordInterceptor.class, FordInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java index b49060682e..7bd4926a60 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java @@ -21,19 +21,18 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import static org.testng.Assert.assertEquals; -import java.util.List; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; +import java.util.List; + /** * This test was originally part of Weld testsuite * @@ -47,9 +46,10 @@ public class InterceptorConflictingEnablementTest extends AbstractTest { @Deployment public static Archive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(InterceptorConflictingEnablementTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(TransactionalInterceptor.class.getName(), LoggingInterceptor.class.getName()).up().getOrCreateDecorators() - .clazz(TestDecorator.class.getName(), AnotherTestDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml() + .interceptors(TransactionalInterceptor.class, LoggingInterceptor.class) + .decorators(TestDecorator.class, AnotherTestDecorator.class)) + .build(); } @org.testng.annotations.Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java index fb130e22db..cbe46368dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java @@ -23,24 +23,22 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.util.concurrent.TimeUnit; - import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.impl.ConfigurationFactory; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.descriptors.ejb.EjbJarDescriptorBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.ejbjar31.EjbJarDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.concurrent.TimeUnit; + /** * Test that invocations of message listener methods of message-driven beans during message delivery are business method * invocations. @@ -64,9 +62,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(MessageDrivenBeanInterceptorInvocationTest.class) .withEjbJarXml(ejbJarDescriptor) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java index 45f7db02b1..61cd64c656 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java @@ -23,13 +23,11 @@ import static org.testng.Assert.assertTrue; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -42,9 +40,7 @@ public class SessionBeanInterceptorDefinitionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SessionBeanInterceptorDefinitionTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java index a0b556fccb..b17d7c9311 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java @@ -28,8 +28,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -48,8 +47,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorBindingInheritanceTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(SquirrelInterceptor.class.getName(), WoodpeckerInterceptor.class.getName()).up()) + new BeansXml().interceptors(SquirrelInterceptor.class, WoodpeckerInterceptor.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java index 90cf74cc7e..b62d83a9e7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,8 +46,8 @@ public static WebArchive createTestArchive() { .withTestClassDefinition(FinalClassWithInheritedClassLevelInterceptorTest.class) .withClasses(Jumbojet.class, Airbus.class, LandingBinding.class, LandingInterceptor.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(LandingInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(LandingInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java index 8e0ccd09e3..48e2a14219 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,8 +47,8 @@ public static WebArchive createTestArchive() { .withClasses(Fighter.class, FighterStereotype.class, Messerschmitt.class, LandingBinding.class, LandingInterceptor.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(LandingInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(LandingInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java index e78ad9b2da..a8f66eafb3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,8 +46,8 @@ public static WebArchive createTestArchive() { .withTestClassDefinition(FinalMethodWithInheritedClassLevelInterceptorTest.class) .withClasses(Jumbojet.class, Boeing.class, LandingBinding.class, LandingInterceptor.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(LandingInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(LandingInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java index dc3366aeb9..fc625251ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -46,8 +47,8 @@ public static WebArchive createTestArchive() { .withClasses(Fighter.class, FighterStereotype.class, Spitfire.class, LandingBinding.class, LandingInterceptor.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(LandingInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(LandingInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java index cbb593ea02..a8237ffd4a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java @@ -20,20 +20,19 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.List; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.List; + @SpecVersion(spec = "cdi", version = "2.0") public class InterceptorOrderTest extends AbstractTest { @@ -41,12 +40,8 @@ public class InterceptorOrderTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorOrderTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(SecondInterceptor.class.getName(), FirstInterceptor.class.getName(), - TransactionalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(SecondInterceptor.class, FirstInterceptor.class, TransactionalInterceptor.class)) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java index 6e8fb6d4af..bd46a2e746 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java @@ -20,23 +20,21 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import static org.testng.Assert.assertEquals; -import java.util.List; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.List; + @SpecVersion(spec = "cdi", version = "2.0") public class EnterpriseLifecycleInterceptorDefinitionTest extends AbstractTest { @@ -45,8 +43,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnterpriseLifecycleInterceptorDefinitionTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(MissileInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(MissileInterceptor.class)) + .build(); } @Test(groups = INTEGRATION) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java index f3cdbbe74f..704abdab20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java @@ -19,23 +19,21 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import static org.testng.Assert.assertEquals; -import java.util.List; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.List; + @SpecVersion(spec = "cdi", version = "2.0") public class LifecycleInterceptorOrderTest extends AbstractTest { @@ -44,8 +42,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(LifecycleInterceptorOrderTest.class) .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(TransactionalInterceptor.class.getName()).up()).build(); + new BeansXml().interceptors(TransactionalInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java index 0bc83b6fff..a008d5d0f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java @@ -26,8 +26,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -45,12 +44,7 @@ public class InterceptorBindingTypeWithMemberTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorBindingTypeWithMemberTest.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(IncreasingInterceptor.class.getName(), DecreasingInterceptor.class.getName(), - VehicleCountInterceptor.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(IncreasingInterceptor.class, DecreasingInterceptor.class, VehicleCountInterceptor.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java index 6a6e38e9f7..0b9162259c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java @@ -36,6 +36,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -52,9 +53,7 @@ public class InterceptorInvocationTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorInvocationTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(AlmightyInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(AlmightyInterceptor.class)).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java index 4822e83d8e..4add86b87e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java @@ -37,6 +37,7 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -74,8 +75,7 @@ public static EnterpriseArchive createTestArchive() { //A - default test-ejb.jar .withTestClassDefinition(EnterpriseInterceptorOrderingTest.class) .withClasses(Dao.class, LegacyInterceptor2.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class) - .getOrCreateInterceptors().clazz(LegacyInterceptor2.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(LegacyInterceptor2.class)) //B .withBeanLibrary(Transactional.class, GloballyEnabledInterceptor3.class) //C @@ -86,9 +86,7 @@ public static EnterpriseArchive createTestArchive() { JavaArchive ejbArchive = ShrinkWrap .create(JavaArchive.class, ejbJar) .addClasses(DummyDao.class, GloballyEnabledInterceptor2.class, GloballyEnabledInterceptor5.class, LegacyInterceptor3.class) - .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(LegacyInterceptor3.class.getName()).up().exportAsString()), "beans.xml") + .addAsManifestResource(new BeansXml().interceptors(LegacyInterceptor3.class), "beans.xml") .setManifest( new StringAsset(Descriptors.create(ManifestDescriptor.class) .addToClassPath(EnterpriseArchiveBuilder.DEFAULT_EJB_MODULE_NAME) @@ -100,8 +98,7 @@ public static EnterpriseArchive createTestArchive() { .notTestArchive() //F .withClasses(EnterpriseInterceptorOrderingTest.class, GloballyEnabledInterceptor1.class, LegacyInterceptor1.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class) - .getOrCreateInterceptors().clazz(LegacyInterceptor1.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(LegacyInterceptor1.class)) //G .withBeanLibrary(GloballyEnabledInterceptor4.class) .build() diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java index 64180e81f9..6e43f8b222 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java @@ -22,21 +22,20 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.ArrayList; -import java.util.List; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.List; + /** * Test interceptor enablement and ordering. * @@ -52,11 +51,7 @@ public static WebArchive createTestArchive() { // WEB-INF/classes .withClasses(Dao.class, LegacyInterceptor1.class, LegacyInterceptor2.class, LegacyInterceptor3.class, WebApplicationGlobalInterceptor1.class) - .withBeansXml( - Descriptors - .create(BeansDescriptor.class) - .getOrCreateInterceptors().clazz(LegacyInterceptor1.class.getName(), LegacyInterceptor2.class.getName(), - LegacyInterceptor3.class.getName()).clazz().up()) + .withBeansXml(new BeansXml().interceptors(LegacyInterceptor1.class, LegacyInterceptor2.class, LegacyInterceptor3.class)) .withBeanLibrary(Transactional.class, AbstractInterceptor.class, Service.class, GloballyEnabledInterceptor1.class, GloballyEnabledInterceptor3.class, GloballyEnabledInterceptor4.class, GloballyEnabledInterceptor5.class) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java index 04c4209a9f..85da22ed1d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java @@ -31,6 +31,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -42,7 +43,7 @@ public class ResolutionByNameTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(ResolutionByNameTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Sole.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Sole.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java index d865c7a841..8ecf176b42 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java @@ -11,6 +11,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -25,7 +26,8 @@ public class DecoratoredBeanProxyTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratoredBeanProxyTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(MarineDecorator.class.getName()).up()).build(); + .withBeansXml(new BeansXml().decorators(MarineDecorator.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java index 568dec8d40..c0d31736bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java @@ -3,14 +3,12 @@ import static org.jboss.cdi.tck.cdi.Sections.UNPROXYABLE; import jakarta.enterprise.inject.spi.DeploymentException; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -25,10 +23,7 @@ public class InterceptedBeanProxyTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptedBeanProxyTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class) - .getOrCreateInterceptors() - .clazz(FishInterceptor.class.getName()).up()) + .withBeansXml(new BeansXml().interceptors(FishInterceptor.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/AmbiguousDependencyResolutionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/AmbiguousDependencyResolutionTest.java index 0ee657e975..55573b980d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/AmbiguousDependencyResolutionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/AmbiguousDependencyResolutionTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -43,9 +44,8 @@ public class AmbiguousDependencyResolutionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(AmbiguousDependencyResolutionTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives() - .clazz(FooProducer.class.getName(), BarProducer.class.getName()).up()).build(); + .withBeansXml(new BeansXml().alternatives(FooProducer.class, BarProducer.class)) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java index ef715b769a..82e41e668f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java @@ -22,22 +22,20 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import java.util.ArrayList; -import java.util.List; - import jakarta.enterprise.inject.Instance; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.List; + /** * Test for CDI-139. It verifies that Instance.destroy() can be used to destroy a dependent bean instance and bean instances * depending on the bean instance are destroyed as well. @@ -56,9 +54,8 @@ public class DestroyingDependentInstanceTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DestroyingDependentInstanceTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors() - .clazz(TransactionalInterceptor.class.getName()).up()).build(); + .withBeansXml(new BeansXml().interceptors(TransactionalInterceptor.class)) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java index 18ca09d583..ae75e12a8f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java @@ -25,13 +25,11 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.InjectionPoint; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -50,7 +48,8 @@ public class InjectableReferenceTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(InjectableReferenceTest.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateDecorators().clazz(TimestampLogger.class.getName()).up()).build(); + .withBeansXml(new BeansXml().decorators(TimestampLogger.class)) + .build(); } @SuppressWarnings("unchecked") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java index 9cce0f76ef..8cb4653d4b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java @@ -21,15 +21,6 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; -import java.util.Set; - import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.AnnotatedField; @@ -37,18 +28,25 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InjectionPoint; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; +import java.util.Set; + /** * Injection point metadata tests * @@ -62,9 +60,7 @@ public class InjectionPointTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InjectionPointTest.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateDecorators() - .clazz(AnimalDecorator1.class.getName(), AnimalDecorator2.class.getName(), AnimalDecorator3.class.getName()).up()) + .withBeansXml(new BeansXml().decorators(AnimalDecorator1.class, AnimalDecorator2.class, AnimalDecorator3.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java index 76fdb5fd33..ccd72f7a77 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java @@ -24,15 +24,13 @@ import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.extensions.alternative.deployment.Bar; import org.jboss.cdi.tck.tests.extensions.alternative.deployment.Foo; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -59,12 +57,12 @@ public static WebArchive createTestArchive() { .withClasses(Alpha.class, MarkerObtainerWar.class, Foo.class, Marker.class, AfterDeploymentValidationObserver.class) .withExtension(AfterDeploymentValidationObserver.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Alpha.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Alpha.class)) .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Bravo.class.getName()).up(), + new BeansXml().alternatives(Bravo.class), Bravo.class, MarkerObtainerBda1.class, Bar.class) .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Charlie.class.getName()).up(), + new BeansXml().alternatives(Charlie.class), Charlie.class, MarkerObtainerBda2.class, Baz.class) .withLibrary(MarkerObtainerNonBda.class, NonBdaAfterDeploymentValidationObserver.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java index 9035588439..365eff37ed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java @@ -26,13 +26,11 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.CDI; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -55,7 +53,7 @@ public static WebArchive createTestArchive() { .withClasses(Alpha.class, Powerful.class, PowerfulLiteral.class, AlphaLocator.class) // BDA01 .withBeanLibrary( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Bravo.class.getName()).up(), + new BeansXml().alternatives(Bravo.class), Bravo.class, BravoLocator.class, BravoMarker.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java index fbf711e22b..783dbe7cb4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java @@ -19,13 +19,11 @@ import static org.jboss.cdi.tck.cdi.Sections.INTER_MODULE_INJECTION; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.Assert; @@ -38,7 +36,7 @@ public class SelectedAlternativeManagedBeanInjectionAvailability02Test extends A public static WebArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder().withTestClass(SelectedAlternativeManagedBeanInjectionAvailability02Test.class) .withClasses(AlternativeFoo.class).withBeanLibrary(Foo.class, Bar.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeFoo.class.getName()).up(), WebBar.class) + .withBeanLibrary(new BeansXml().alternatives(AlternativeFoo.class), WebBar.class) .build(); return webArchive; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java index 243c4d79ac..076926bcf9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java @@ -20,14 +20,12 @@ import static org.jboss.cdi.tck.cdi.Sections.INTER_MODULE_INJECTION; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.Assert; @@ -57,9 +55,8 @@ public static EnterpriseArchive createTestArchive() { enterpriseArchive.addAsModule(new WebArchiveBuilder() .notTestArchive() .withDefaultEjbModuleDependency() - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeFoo.class.getName()) - .up()).withClasses(SelectedAlternativeManagedBeanInjectionAvailabilityTest.class, WebBar.class) + .withBeansXml(new BeansXml().alternatives(AlternativeFoo.class)) + .withClasses(SelectedAlternativeManagedBeanInjectionAvailabilityTest.class, WebBar.class) .build()); return enterpriseArchive; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java index 4cccc67ee0..79ed9a1a11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java @@ -20,13 +20,11 @@ import static org.jboss.cdi.tck.cdi.Sections.SELECTION_EE; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.Assert; @@ -40,7 +38,7 @@ public static WebArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder().withTestClass(SelectedAlternativeSessionBeanInjectionAvailability02Test.class) .withClasses(AlternativeEjbFoo.class, EjbFooLocal.class).withBeanLibrary(Foo.class, Bar.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeEjbFoo.class.getName()).up(), WebBar.class) + .withBeanLibrary(new BeansXml().alternatives(AlternativeEjbFoo.class), WebBar.class) .build(); return webArchive; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java index ba339f0f00..7dc6fd58c4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java @@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.Assert; @@ -57,9 +58,8 @@ public static EnterpriseArchive createTestArchive() { enterpriseArchive.addAsModule(new WebArchiveBuilder() .withDefaultEjbModuleDependency() .notTestArchive() - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeEjbFoo.class.getName()) - .up()).withClasses(SelectedAlternativeSessionBeanInjectionAvailabilityTest.class, WebBar.class) + .withBeansXml(new BeansXml().alternatives(AlternativeEjbFoo.class)) + .withClasses(SelectedAlternativeSessionBeanInjectionAvailabilityTest.class, WebBar.class) .build()); return enterpriseArchive; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java index fe12594c9c..badf508736 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertTrue; import jakarta.enterprise.inject.Instance; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.Testable; import org.jboss.cdi.tck.AbstractTest; @@ -37,8 +36,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -61,7 +60,7 @@ public static EnterpriseArchive createTestArchive() { EnterpriseArchive enterpriseArchive = new EnterpriseArchiveBuilder() .withTestClassDefinition(InterceptorModularityTest.class) .withClasses(Checker.class, BarBinding.class, Animal.class, Cow.class, BarSuperInterceptor.class) - .withBeansXml(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(Cow.class.getName()).up()) + .withBeansXml(new BeansXml().alternatives(Cow.class)) .noDefaultWebModule().build(); JavaArchive fooArchive = ShrinkWrap.create(JavaArchive.class, TEST1_JAR) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java index 079626557a..52a764ffd0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java @@ -28,13 +28,11 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -56,7 +54,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(Specialization02Test.class) .withBeanLibrary(InjectedBean1.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeSpecializedFactory.class.getName()).up(), + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java index 21bc6b89c4..f846b579cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java @@ -28,13 +28,11 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -64,7 +62,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(Specialization03Test.class) .withBeanLibrary(Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeSpecializedFactory.class.getName()).up(), + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), InjectedBean1.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java index 07add35ec7..47c9fe6087 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java @@ -26,13 +26,11 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -61,9 +59,8 @@ public class Specialization04Test extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(Specialization04Test.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeSpecializedFactory.class.getName()).up(), - Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeSpecializedFactory.class.getName()).up(), + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class) + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), InjectedBean1.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java index d03f7cff6d..6ff1321e2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java @@ -11,14 +11,12 @@ import jakarta.enterprise.event.Event; import jakarta.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -42,8 +40,8 @@ public static EnterpriseArchive createTestArchive() { .withTestClassDefinition(Specialization05Test.class) .noDefaultWebModule() .withBeanLibrary(Factory.class, Product.class, InjectedBean1.class, FactoryEvent.class) - .withBeanLibrary(Descriptors.create(BeansDescriptor.class).getOrCreateAlternatives().clazz(AlternativeSpecializedFactory.class.getName()).up(), - AlternativeSpecializedFactory.class).build(); + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), AlternativeSpecializedFactory.class) + .build(); enterpriseArchive.addAsModule(new WebArchiveBuilder().notTestArchive().withDefaultEjbModuleDependency() .withClasses(InjectedBean2.class,Specialization05Test.class).build()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java index cd68194eeb..f239c005cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java @@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -40,9 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(InterceptorNotResolvedTest.class) .withClasses(Cat.class, CatInterceptor.class, CatInterceptorBinding.class, Foo.class) - .withBeansXml( - Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors().clazz(CatInterceptor.class.getName()) - .up()).build(); + .withBeansXml(new BeansXml().interceptors(CatInterceptor.class)) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java b/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java new file mode 100644 index 0000000000..a4a06796b2 --- /dev/null +++ b/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java @@ -0,0 +1,16 @@ +package org.jboss.shrinkwrap.api; + +public enum BeanDiscoveryMode { + + NONE("none"), ANNOTATED("annotated"), ALL("all"); + + private final String value; + + private BeanDiscoveryMode(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java b/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java new file mode 100644 index 0000000000..34055345a1 --- /dev/null +++ b/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java @@ -0,0 +1,16 @@ +package org.jboss.shrinkwrap.api; + +public enum BeansXmlVersion { + + v30("3.0"), v20("2.0"), v11("1.1"); + + private final String value; + + private BeansXmlVersion(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java b/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java new file mode 100644 index 0000000000..130b915196 --- /dev/null +++ b/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java @@ -0,0 +1,300 @@ +package org.jboss.shrinkwrap.impl; + +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; +import org.jboss.shrinkwrap.api.BeansXmlVersion; +import org.jboss.shrinkwrap.api.asset.Asset; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * Allows to create a beans.xml file programmatically. + * By default it uses discovery mode all and has version 3.0 + */ +public class BeansXml implements Asset { + + public static final BeansXml SUPPRESSOR = new BeansXml(Collections.> emptyList(), Collections.> emptyList(), Collections.> emptyList(), Collections.> emptyList(), Collections. emptyList()) { + @Override + public BeanDiscoveryMode getBeanDiscoveryMode() { + return BeanDiscoveryMode.NONE; + } + }; + + private static final String CLOSING_TAG_PREFIX = ""; + private static final String TAG_SUFFIX_NEW_LINE = ">\n"; + private static final String TAG_SUFFIX_SELF_CLOSE_NEW_LINE = " />\n"; + private static final String ALTERNATIVES_ELEMENT_NAME = "alternatives"; + private static final String CLASS = "class"; + + private static final String SCAN_ELEMENT_NAME = "scan"; + private static final String EXCLUDE_ELEMENT_NAME = "exclude"; + private static final String IF_SYSTEM_PROPERTY_ELEMENT_NAME = "if-system-property"; + private static final String IF_CLASS_AVAILABLE_ELEMENT_NAME = "if-class-available"; + private static final String IF_CLASS_NOT_AVAILABLE_ELEMENT_NAME = "if-class-not-available"; + private static final String NAME_ATTRIBUTE_NAME = "name"; + private static final String VALUE_ATTRIBUTE_NAME = "value"; + + private final List> alternatives; + private final List> interceptors; + private final List> decorators; + private final List> stereotypes; + private final List excludeFilters; + + // defaults + private BeanDiscoveryMode mode = BeanDiscoveryMode.ALL; + private BeansXmlVersion version = BeansXmlVersion.v30; + + public static class Exclude { + + private final String classFilter; + private final List conditions; + + private Exclude(String classFilter) { + this.classFilter = classFilter; + conditions = new ArrayList(); + } + + public static Exclude match(String classFilter) { + return new Exclude(classFilter); + } + + public static Exclude exact(Class clazz) { + return new Exclude(clazz.getName()); + } + + public Exclude ifSystemProperty(String name) { + conditions.add(new IfSystemProperty(name, null)); + return this; + } + + public Exclude ifSystemProperty(String name, String value) { + conditions.add(new IfSystemProperty(name, value)); + return this; + } + + public Exclude ifClassAvailable(Class clazz) { + return ifClassAvailable(clazz.getName()); + } + + public Exclude ifClassAvailable(String className) { + conditions.add(new IfClassAvailable(className)); + return this; + } + + public Exclude ifClassNotAvailable(Class clazz) { + return ifClassNotAvailable(clazz.getName()); + } + + public Exclude ifClassNotAvailable(String className) { + conditions.add(new IfClassNotAvailable(className)); + return this; + } + + public String getClassFilter() { + return this.classFilter; + } + + public List getConditions() { + return this.conditions; + } + + private static class Condition { + private final String nameParam; + private final String tagName; + + public Condition(String tagName, String nameParam) { + this.tagName = tagName; + this.nameParam = nameParam; + } + + public String getName() { + return this.nameParam; + } + + public String getTagName() { + return this.tagName; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(OPENING_TAG_PREFIX).append(getTagName()); + appendAttribute(NAME_ATTRIBUTE_NAME, getName(), sb); + sb.append(TAG_SUFFIX_SELF_CLOSE_NEW_LINE); + return sb.toString(); + } + + } + + private static class IfSystemProperty extends Condition { + + private final String value; + + public IfSystemProperty(String name, String value) { + super(IF_SYSTEM_PROPERTY_ELEMENT_NAME, name); + this.value = value; + } + + public String getValue() { + return this.value; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(OPENING_TAG_PREFIX).append(getTagName()); + appendAttribute(NAME_ATTRIBUTE_NAME, getName(), sb); + if (value != null) { + appendAttribute(VALUE_ATTRIBUTE_NAME, getValue(), sb); + } + sb.append(TAG_SUFFIX_SELF_CLOSE_NEW_LINE); + return sb.toString(); + } + + } + + private static class IfClassAvailable extends Condition { + + public IfClassAvailable(String className) { + super(IF_CLASS_AVAILABLE_ELEMENT_NAME, className); + } + + } + + private static class IfClassNotAvailable extends Condition { + + public IfClassNotAvailable(String className) { + super(IF_CLASS_NOT_AVAILABLE_ELEMENT_NAME, className); + } + } + + } + + public BeansXml() { + this(new ArrayList>(), new ArrayList>(), new ArrayList>(), new ArrayList>(), new ArrayList()); + } + + public BeansXml(BeanDiscoveryMode mode) { + this(); + setBeanDiscoveryMode(mode); + } + + private BeansXml(List> alternatives, List> interceptors, List> decorators, List> stereotypes, List excludeFilters) { + this.alternatives = alternatives; + this.interceptors = interceptors; + this.decorators = decorators; + this.stereotypes = stereotypes; + this.excludeFilters = excludeFilters; + } + + public BeansXml alternatives(Class... alternatives) { + this.alternatives.addAll(Arrays.asList(alternatives)); + return this; + } + + public BeansXml interceptors(Class... interceptors) { + this.interceptors.addAll(Arrays.asList(interceptors)); + return this; + } + + public BeansXml decorators(Class... decorators) { + this.decorators.addAll(Arrays.asList(decorators)); + return this; + } + + public BeansXml stereotype(Class... stereotypes) { + this.stereotypes.addAll(Arrays.asList(stereotypes)); + return this; + } + + public BeansXml excludeFilters(Exclude... filters) { + this.excludeFilters.addAll(Arrays.asList(filters)); + return this; + } + + public BeansXml setBeansXmlVersion(BeansXmlVersion version) { + this.version = version; + return this; + } + + public BeanDiscoveryMode getBeanDiscoveryMode() { + return mode; + } + + public BeansXmlVersion getBeansXmlVersion() { + return version; + } + + public void setBeanDiscoveryMode(BeanDiscoveryMode mode) { + this.mode = mode; + } + + @Override + public InputStream openStream() { + StringBuilder xml = new StringBuilder(); + xml.append("\n"); + appendExcludeFilters(excludeFilters, xml); + appendAlternatives(alternatives, stereotypes, xml); + appendSection("interceptors", CLASS, interceptors, xml); + appendSection("decorators", CLASS, decorators, xml); + xml.append(""); + + return new ByteArrayInputStream(xml.toString().getBytes()); + } + + private void appendExcludeFilters(List filters, StringBuilder xml) { + if (filters.size() > 0) { + xml.append(OPENING_TAG_PREFIX).append(SCAN_ELEMENT_NAME).append(TAG_SUFFIX_NEW_LINE); + for(Exclude ex : filters) { + xml.append(OPENING_TAG_PREFIX).append(EXCLUDE_ELEMENT_NAME); + appendAttribute(NAME_ATTRIBUTE_NAME, ex.getClassFilter(), xml); + List conditions = ex.getConditions(); + if(conditions.isEmpty()) { + xml.append(TAG_SUFFIX_SELF_CLOSE_NEW_LINE); + } else { + xml.append(TAG_SUFFIX_NEW_LINE); + for (Exclude.Condition c : conditions) { + xml.append(c.toString()); + } + xml.append(CLOSING_TAG_PREFIX).append(EXCLUDE_ELEMENT_NAME).append(TAG_SUFFIX_NEW_LINE); + } + } + xml.append(CLOSING_TAG_PREFIX).append(SCAN_ELEMENT_NAME).append(TAG_SUFFIX_NEW_LINE); + } + } + + private static void appendAttribute(String name, String value, StringBuilder xml) { + xml.append(" ").append(name).append("=\"").append(value).append("\""); + } + + private static void appendAlternatives(List> alternatives, List> stereotypes, StringBuilder xml) { + if (alternatives.size() > 0 || stereotypes.size() > 0) { + xml.append(OPENING_TAG_PREFIX).append(ALTERNATIVES_ELEMENT_NAME).append(TAG_SUFFIX_NEW_LINE); + appendClasses(CLASS, alternatives, xml); + appendClasses("stereotype", stereotypes, xml); + xml.append(CLOSING_TAG_PREFIX).append(ALTERNATIVES_ELEMENT_NAME).append(TAG_SUFFIX_NEW_LINE); + } + } + + private static void appendSection(String name, String subName, List> classes, StringBuilder xml) { + if (classes.size() > 0) { + xml.append(OPENING_TAG_PREFIX).append(name).append(TAG_SUFFIX_NEW_LINE); + appendClasses(subName, classes, xml); + xml.append(CLOSING_TAG_PREFIX).append(name).append(TAG_SUFFIX_NEW_LINE); + } + } + + private static void appendClasses(String name, List> classes, StringBuilder xml) { + for (Class clazz : classes) { + xml.append(OPENING_TAG_PREFIX).append(name).append(TAG_SUFFIX).append(clazz.getName()).append(CLOSING_TAG_PREFIX).append(name).append(TAG_SUFFIX_NEW_LINE); + } + } +} diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/beans.xml new file mode 100644 index 0000000000..a15aa1207e --- /dev/null +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/beans.xml @@ -0,0 +1,9 @@ + + + + org.jboss.cdi.tck.tests.alternative.broken.incorrect.name.NonExistingClass + + \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/beans.xml new file mode 100644 index 0000000000..4b54dbfa97 --- /dev/null +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/broken/incorrect/name/stereotype/beans.xml @@ -0,0 +1,9 @@ + + + + org.jboss.cdi.tck.tests.policy.broken.incorrect.name.stereotype.Mock + + \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/enterprise/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/enterprise/beans.xml index 18c3def193..67bee2b091 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/enterprise/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/alternative/enterprise/beans.xml @@ -1,7 +1,7 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.alternative.enterprise.EnabledEjb diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/dependent/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/dependent/beans.xml index 49f1667f21..8eab64fea4 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/dependent/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/dependent/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.dependent.InteriorDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml index d1c40548c4..8028eea61b 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.CityDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml index 91c300a3ec..ff2bb9c509 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.CityDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml index dc77ea8404..46c08b4be2 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor.BrokenInterceptor diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml index 5f6be42793..36f5e2b7b6 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator.BrokenDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml index 9796e9eee8..06b50ae5eb 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.BrokenDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/beans.xml index 94921c005c..11025d4893 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor.BrokenInterceptor diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml index 9caf053ad9..4c045f5978 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter.BrokenInterceptor diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/custom/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/custom/beans.xml index d79792255d..d9a7c4a917 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/custom/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/custom/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.custom.VehicleDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml new file mode 100644 index 0000000000..51e5fdfc16 --- /dev/null +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml @@ -0,0 +1,9 @@ + + + + com.acme.NonExistentDecoratorClass + + \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateConstructor/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateConstructor/beans.xml index d13520d7be..90fa7d9786 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateConstructor/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateConstructor/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.definition.inject.delegateConstructor.TimestampLogger diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateField/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateField/beans.xml index 0b0774a3a1..03f0322adc 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateField/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateField/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.definition.inject.delegateField.TimestampLogger diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateInitializerMethod/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateInitializerMethod/beans.xml index ab23a94237..b14c491da5 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateInitializerMethod/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/definition/inject/delegateInitializerMethod/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.definition.inject.delegateInitializerMethod.TimestampLogger diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/observer/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/observer/beans.xml index 8077e1ad5a..f98d32cd3a 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/observer/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/observer/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.invocation.observer.ObserverDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/producer/method/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/producer/method/beans.xml index 8517f0a0f5..60babfca2c 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/producer/method/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/invocation/producer/method/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.invocation.producer.method.ProducerDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/resolution/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/resolution/beans.xml index 9c521b1737..c8262da092 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/resolution/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/decorators/resolution/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.decorators.resolution.BarDecorator org.jboss.cdi.tck.tests.decorators.resolution.FooDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/beans.xml new file mode 100644 index 0000000000..b91b83da0d --- /dev/null +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/beans.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/beans.xml index 5de4f6f38a..158c128fb3 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/enteprise/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/enteprise/beans.xml index 5de4f6f38a..158c128fb3 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/enteprise/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/trimmed/enteprise/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml new file mode 100644 index 0000000000..b704ce0260 --- /dev/null +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml @@ -0,0 +1,9 @@ + + + + com.acme.Foo + + \ No newline at end of file diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/custom/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/custom/beans.xml index 34d44b8520..9b4eb9f22c 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/custom/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/custom/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.interceptors.definition.custom.SimpleInterceptorWithoutAnnotations diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml index e0891a57ae..2771667998 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.interceptors.definition.enterprise.interceptorOrder.MissileInterceptor diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml index b493352cb7..fb38a6182d 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.interceptors.definition.enterprise.nonContextualReference.MissileInterceptor org.jboss.cdi.tck.tests.interceptors.definition.enterprise.nonContextualReference.AnchorInterceptor diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml index 3c2e68fd24..f784d932b1 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator.FooDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/beans.xml index ea1a01471e..cfd7b28280 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/decorator/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/decorator/beans.xml index ea549948a7..1d22ce18af 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/decorator/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/decorator/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> org.jboss.cdi.tck.tests.lookup.typesafe.resolution.decorator.AnimalDecorator diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/se/discovery/trimmed/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/se/discovery/trimmed/beans.xml index 5de4f6f38a..158c128fb3 100644 --- a/impl/src/main/resources/org/jboss/cdi/tck/tests/se/discovery/trimmed/beans.xml +++ b/impl/src/main/resources/org/jboss/cdi/tck/tests/se/discovery/trimmed/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" version="3.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java index bc46765fc3..0d1e25e994 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java @@ -17,26 +17,35 @@ package org.jboss.cdi.tck.test.shrinkwrap; import static org.testng.Assert.assertEquals; - -import java.io.File; -import java.io.IOException; +import static org.testng.Assert.assertTrue; import org.apache.commons.io.FileUtils; import org.jboss.cdi.tck.shrinkwrap.AssetUtil; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; +import org.jboss.shrinkwrap.api.BeansXmlVersion; +import org.jboss.shrinkwrap.api.asset.Asset; import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; +import org.jboss.shrinkwrap.impl.BeansXml; import org.testng.annotations.Test; +import java.io.File; +import java.io.IOException; + public class AssetUtilTest { @Test public void testReadAssetContentAsString() throws IOException { - String content = Descriptors.create(BeansDescriptor.class).exportAsString(); - StringAsset stringAsset = new StringAsset(content); - assertEquals(AssetUtil.readAssetContent(stringAsset).trim(), content.trim()); + // TODO these are weak assertions because BeansXml cannot be translated to String easily + Asset asset = new BeansXml(BeanDiscoveryMode.ANNOTATED).alternatives(Engine.class).setBeansXmlVersion(BeansXmlVersion.v20); + String content = AssetUtil.readAssetContent(asset); + assertTrue(content != null); + assertTrue(content.length() > 0); + assertTrue(content.contains("bean-discovery-mode=\"annotated\"")); + assertTrue(content.contains("version=\"2.0\"")); + assertTrue(content.contains("")); + assertTrue(content.contains("org.jboss.cdi.tck.test.shrinkwrap.Engine")); + assertTrue(content.contains("")); ClassLoaderAsset classLoaderAsset = new ClassLoaderAsset("beans-01.xml"); assertEquals(AssetUtil.readAssetContent(classLoaderAsset).trim().replaceAll("\\s", ""), diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java new file mode 100644 index 0000000000..0c9ab05910 --- /dev/null +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java @@ -0,0 +1,45 @@ +package org.jboss.cdi.tck.test.shrinkwrap.beansxml; + +import org.jboss.cdi.tck.shrinkwrap.AssetUtil; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; +import org.jboss.shrinkwrap.api.BeansXmlVersion; +import org.jboss.shrinkwrap.impl.BeansXml; +import org.junit.Assert; +import org.junit.Test; + +/** + * A very simple test that checks if {@link BeansXml} API constructs a valid descriptor with certain format. + * Note that {@link BeansXml} doesn't include XML namespace. + */ +public class BeansXmlTest { + + // prepared String representation of expected outcome + private final String expectedBeansXmlFormat = "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "org.jboss.cdi.tck.test.shrinkwrap.beansxml.DummyReferenceClass\n" + + "org.jboss.cdi.tck.test.shrinkwrap.beansxml.DummyReferenceClass\n" + + "\n" + + "\n" + + "org.jboss.cdi.tck.test.shrinkwrap.beansxml.DummyReferenceClass\n" + + "\n" + + "\n" + + "org.jboss.cdi.tck.test.shrinkwrap.beansxml.DummyReferenceClass\n" + + "\n" + + "\n"; + + @Test + public void testGeneratedBeansXml() { + BeansXml asset = new BeansXml(BeanDiscoveryMode.ANNOTATED) + .setBeansXmlVersion(BeansXmlVersion.v11) + .alternatives(DummyReferenceClass.class) + .stereotype(DummyReferenceClass.class) + .decorators(DummyReferenceClass.class) + .interceptors(DummyReferenceClass.class) + .excludeFilters(BeansXml.Exclude.match(BeansXmlTest.class.getPackage().getName() + ".*")); + String stringRepresentation = AssetUtil.readAssetContent(asset); + Assert.assertEquals(expectedBeansXmlFormat, stringRepresentation); + } +} diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/DummyReferenceClass.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/DummyReferenceClass.java new file mode 100644 index 0000000000..8db5e843ba --- /dev/null +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/DummyReferenceClass.java @@ -0,0 +1,4 @@ +package org.jboss.cdi.tck.test.shrinkwrap.beansxml; + +public class DummyReferenceClass { +} diff --git a/impl/src/test/resources/beans-01.xml b/impl/src/test/resources/beans-01.xml index 45cc7c928e..b445ffedcf 100644 --- a/impl/src/test/resources/beans-01.xml +++ b/impl/src/test/resources/beans-01.xml @@ -1,5 +1,5 @@ - + org.jboss.cdi.tck.test.shrinkwrap.descriptors.Foo org.jboss.cdi.tck.test.shrinkwrap.descriptors.Bar diff --git a/impl/src/test/resources/beans-02.xml b/impl/src/test/resources/beans-02.xml index 3f6be59336..805fdc0ec6 100644 --- a/impl/src/test/resources/beans-02.xml +++ b/impl/src/test/resources/beans-02.xml @@ -1,5 +1,5 @@ - + org.jboss.cdi.tck.test.shrinkwrap.descriptors.Bar org.jboss.cdi.tck.test.shrinkwrap.descriptors.Foo diff --git a/impl/src/test/resources/beans-03.xml b/impl/src/test/resources/beans-03.xml index 28708b97ae..5e359d21b9 100644 --- a/impl/src/test/resources/beans-03.xml +++ b/impl/src/test/resources/beans-03.xml @@ -1,5 +1,5 @@ - + org.jboss.cdi.tck.test.shrinkwrap.descriptors.Bar org.jboss.cdi.tck.test.shrinkwrap.descriptors.Foo diff --git a/impl/src/test/resources/beans-04.xml b/impl/src/test/resources/beans-04.xml index 82fabe9b52..42b23ae458 100644 --- a/impl/src/test/resources/beans-04.xml +++ b/impl/src/test/resources/beans-04.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/impl/src/test/resources/beans-05.xml b/impl/src/test/resources/beans-05.xml index fb791c6a8e..47d4cb4ee9 100644 --- a/impl/src/test/resources/beans-05.xml +++ b/impl/src/test/resources/beans-05.xml @@ -1,5 +1,5 @@ - + From 5e937dc85e26df0a883762cd33489598046301fe Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Tue, 16 Mar 2021 17:11:08 +0100 Subject: [PATCH 2/2] Add test for explicit archive bean discovery with beans.xml version 1.1 and 2.0. --- .../tests/deployment/discovery/Alpha2.java | 8 ++++++ .../tests/deployment/discovery/Alpha3.java | 8 ++++++ .../discovery/BeanDiscoveryTest.java | 25 ++++++++++++++++++- impl/src/main/resources/tck-audit-cdi.xml | 2 +- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha2.java create mode 100644 impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha3.java diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha2.java new file mode 100644 index 0000000000..b9853a5ad0 --- /dev/null +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha2.java @@ -0,0 +1,8 @@ +package org.jboss.cdi.tck.tests.deployment.discovery; + +public class Alpha2 implements Ping { + + @Override + public void pong() { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha3.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha3.java new file mode 100644 index 0000000000..d892b43aa5 --- /dev/null +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/Alpha3.java @@ -0,0 +1,8 @@ +package org.jboss.cdi.tck.tests.deployment.discovery; + +public class Alpha3 implements Ping { + + @Override + public void pong() { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java index 6427f3b709..60b2f80464 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/BeanDiscoveryTest.java @@ -30,6 +30,7 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; +import org.jboss.shrinkwrap.api.BeansXmlVersion; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -56,6 +57,16 @@ public static WebArchive createTestArchive() { .create(JavaArchive.class) .addClass(Alpha.class) .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml"); + // beans.xml with version 1.1 and bean-discovery-mode of all + JavaArchive alpha2 = ShrinkWrap + .create(JavaArchive.class) + .addClass(Alpha2.class) + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).setBeansXmlVersion(BeansXmlVersion.v11), "beans.xml"); + // beans.xml with version 2.0 and bean-discovery-mode of all + JavaArchive alpha3 = ShrinkWrap + .create(JavaArchive.class) + .addClass(Alpha3.class) + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).setBeansXmlVersion(BeansXmlVersion.v20), "beans.xml"); // Empty beans.xml JavaArchive bravo = ShrinkWrap.create(JavaArchive.class).addClass(Bravo.class) .addAsManifestResource(new StringAsset(""), "beans.xml"); @@ -87,7 +98,7 @@ public static WebArchive createTestArchive() { .withClasses(VerifyingExtension.class, ScopesExtension.class, Binding.class, MyNormalScope.class, MyPseudoScope.class, MyNormalContext.class, MyPseudoContext.class, MyStereotype.class) .withExtensions(VerifyingExtension.class, ScopesExtension.class).withLibrary(Ping.class) - .withLibraries(alpha, bravo, charlie, delta, echo, foxtrot, legacy).build(); + .withLibraries(alpha, alpha2, alpha3, bravo, charlie, delta, echo, foxtrot, legacy).build(); } @Inject @@ -99,6 +110,18 @@ public void testExplicitBeanArchiveModeAll(Alpha alpha) { assertDiscoveredAndAvailable(alpha, Alpha.class); } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) + public void testExplicitBeanArchiveModeAllVersion11(Alpha2 alpha) { + assertDiscoveredAndAvailable(alpha, Alpha2.class); + } + + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) + public void testExplicitBeanArchiveModeAllVersion20(Alpha3 alpha) { + assertDiscoveredAndAvailable(alpha, Alpha3.class); + } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "bb"), @SpecAssertion(section = BEAN_ARCHIVE, id = "bc"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) diff --git a/impl/src/main/resources/tck-audit-cdi.xml b/impl/src/main/resources/tck-audit-cdi.xml index 5fc625d537..add5cda133 100644 --- a/impl/src/main/resources/tck-audit-cdi.xml +++ b/impl/src/main/resources/tck-audit-cdi.xml @@ -8503,7 +8503,7 @@ |bean-discovery-mode| of |all|, or with no version number, or that is an empty file. - Test an archive which contains a |beans.xml| file with a version number of 1.1, with the |bean-discovery-mode| of |all|. + Test an archive which contains a |beans.xml| file with a version number of 1.1 (or later), with the |bean-discovery-mode| of |all|. Test an archive which contains a |beans.xml| file with no version number.