This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 4e3ef0419043dd6f58898e99abff556ba7f9dfb7 Author: Mark Struberg <[email protected]> AuthorDate: Thu Jan 26 22:57:57 2023 +0100 OWB-1417 disable more invalid TCK tests --- .../java/org/apache/webbeans/config/BeansDeployer.java | 2 +- webbeans-tck/standalone-suite.xml | 18 +++++++++++++++++- webbeans-tck/testng-dev.xml | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java index 32cbaf146..99e0e8371 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java @@ -2105,7 +2105,7 @@ public class BeansDeployer Set<ObserverMethod<?>> observerMethods; AnnotatedType<T> beanAnnotatedType = bean.getAnnotatedType(); - if(bean.isEnabled()) + if (bean.isEnabled()) { observerMethods = new ObserverMethodsBuilder<>(webBeansContext, beanAnnotatedType).defineObserverMethods(bean, false); } diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 5492700ac..7704c7450 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -65,6 +65,8 @@ <!-- Test wrongly assumes a specific ordering although both interceptors have priority 2000 and thus might get invoked in unspecified order. + The Interceptors Spec explicitly says: + "If more than one interceptor has the same priority, the relative order of those interceptors is undefined." --> <class name="org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct.ConstructorInterceptionTest" > <methods> @@ -77,6 +79,11 @@ <exclude name="testResolveInterceptorsReturnsOrderedList"/> </methods> </class> + <class name="org.jboss.cdi.tck.interceptors.tests.bindings.overriding.InterceptorBindingOverridingTest" > + <methods> + <exclude name="testInterceptorBindingOverriden"/> + </methods> + </class> <!-- This is just the most backward breaking change I've seen in years. @@ -107,7 +114,7 @@ </class> <!-- - Illegal code as they do call reateInjectionTarget(null); and not on the real bean. + Illegal code as they do call createInjectionTarget(null); and not on the real bean. --> <class name="org.jboss.cdi.tck.tests.full.extensions.alternative.metadata.interceptor.AlternativeMetadataInterceptorInjectionTargetTest" > <methods> @@ -124,6 +131,15 @@ </methods> </class> + <!-- + Test assumes wrong Exception. An AssertERROR gets thrown, but they catch an Exception... + --> + <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundConstruct.bindings.AroundConstructTest" > + <methods> + <exclude name="testExceptions"/> + </methods> + </class> + <!-- Tests broken in the CDI-2.0 TCK: --> diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index 66ad653b4..c448d2342 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -19,7 +19,7 @@ <test name="JSR-346 TCK"> <classes> - <class name="org.jboss.cdi.tck.tests.event.observer.method.ObserverMethodTest" > + <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundConstruct.bindings.AroundConstructTest" > <methods> <include name=".*"/> </methods>
