This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 1e79f8fe6 updated weld excludes
1e79f8fe6 is described below
commit 1e79f8fe6bb3589a338d2c4849e534911729a6ec
Author: Thomas Andraschko <[email protected]>
AuthorDate: Mon Mar 18 15:05:07 2024 +0100
updated weld excludes
---
.../partialbean/uc007/MethodLevelInterceptorTest.java | 16 ++++++++--------
.../api/partialbean/uc008/ClassLevelInterceptorTest.java | 12 ++++++------
.../partialbean/uc013/MethodLevelInterceptorTest.java | 11 ++++++-----
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git
a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc007/MethodLevelInterceptorTest.java
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc007/MethodLevelInterceptorTest.java
index 0ab05b807..3ceacc431 100644
---
a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc007/MethodLevelInterceptorTest.java
+++
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc007/MethodLevelInterceptorTest.java
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
public class MethodLevelInterceptorTest
{
- public static final String CONTAINER_WELD_2_0_0 = "weld-2\\.0\\.0\\..*";
+ public static final String CONTAINER_WELD_5_0 = "weld-5\\.0\\..*";
@Deployment
public static WebArchive war()
@@ -54,7 +54,7 @@ public class MethodLevelInterceptorTest
String archiveName = simpleName.substring(0, 1).toLowerCase() +
simpleName.substring(1);
//don't create a completely empty web-archive
- if (CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0))
+ if (CdiContainerUnderTest.is(CONTAINER_WELD_5_0))
{
return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndPartialBeanArchive());
@@ -74,8 +74,8 @@ public class MethodLevelInterceptorTest
@Test
public void testMethodLevelInterceptor() throws Exception
{
- // this test is known to not work under weld-2.0.0.Final and
weld-2.0.0.SP1
- Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0));
+ // this test is known to not work under weld-5.0.x
+ Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_5_0));
PartialBean partialBean =
BeanProvider.getContextualReference(PartialBean.class);
CustomInterceptorState state =
BeanProvider.getContextualReference(CustomInterceptorState.class);
@@ -88,8 +88,8 @@ public class MethodLevelInterceptorTest
@Test
public void testMethodLevelInterceptorStereotype() throws Exception
{
- // this test is known to not work under weld-2.0.0.Final and
weld-2.0.0.SP1
- Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0));
+ // this test is known to not work under weld-5.0.x
+ Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_5_0));
PartialBean partialBean =
BeanProvider.getContextualReference(PartialBean.class);
CustomInterceptorState state =
BeanProvider.getContextualReference(CustomInterceptorState.class);
@@ -102,8 +102,8 @@ public class MethodLevelInterceptorTest
@Test
public void testMethodLevelInterceptorOnAbstractMethod() throws Exception
{
- // this test is known to not work under weld-2.0.0.Final and
weld-2.0.0.SP1
- Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0));
+ // this test is known to not work under weld-5.0.x
+ Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_5_0));
PartialBean partialBean =
BeanProvider.getContextualReference(PartialBean.class);
CustomInterceptorState state =
BeanProvider.getContextualReference(CustomInterceptorState.class);
diff --git
a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/ClassLevelInterceptorTest.java
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/ClassLevelInterceptorTest.java
index 4e6cf74d8..ba9dbca5c 100644
---
a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/ClassLevelInterceptorTest.java
+++
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc008/ClassLevelInterceptorTest.java
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
public class ClassLevelInterceptorTest
{
- public static final String CONTAINER_WELD_2_0_0 = "weld-2\\.0\\.0\\..*";
+ public static final String CONTAINER_WELD_5_0 = "weld-5\\.0\\..*";
@Deployment
public static WebArchive war()
@@ -54,7 +54,7 @@ public class ClassLevelInterceptorTest
String archiveName = simpleName.substring(0, 1).toLowerCase() +
simpleName.substring(1);
//don't create a completely empty web-archive
- if (CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0))
+ if (CdiContainerUnderTest.is(CONTAINER_WELD_5_0))
{
return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndPartialBeanArchive());
@@ -74,8 +74,8 @@ public class ClassLevelInterceptorTest
@Test
public void testClassLevelInterceptor() throws Exception
{
- // this test is known to not work under weld-2.0.0.Final and
weld-2.0.0.SP1
- Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0));
+ // this test is known to not work under weld-5.0.x
+ Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_5_0));
PartialBean partialBean =
BeanProvider.getContextualReference(PartialBean.class);
CustomInterceptorState state =
BeanProvider.getContextualReference(CustomInterceptorState.class);
@@ -89,8 +89,8 @@ public class ClassLevelInterceptorTest
@Test
public void testClassLevelInterceptorOnAbstractMethod() throws Exception
{
- // this test is known to not work under weld-2.0.0.Final and
weld-2.0.0.SP1
- Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0));
+ // this test is known to not work under weld-5.0.x
+ Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_5_0));
PartialBean partialBean =
BeanProvider.getContextualReference(PartialBean.class);
CustomInterceptorState state =
BeanProvider.getContextualReference(CustomInterceptorState.class);
diff --git
a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc013/MethodLevelInterceptorTest.java
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc013/MethodLevelInterceptorTest.java
index 71af4372a..21aa42275 100644
---
a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc013/MethodLevelInterceptorTest.java
+++
b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc013/MethodLevelInterceptorTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.deltaspike.test.core.api.partialbean.uc013;
-import java.util.List;
import jakarta.enterprise.inject.spi.Extension;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import
org.apache.deltaspike.test.core.api.partialbean.shared.TestPartialBeanBinding;
@@ -36,10 +35,12 @@ import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.List;
+
@RunWith(Arquillian.class)
public class MethodLevelInterceptorTest
{
- public static final String CONTAINER_WELD_2_0_0 = "weld-2\\.0\\.0\\..*";
+ public static final String CONTAINER_WELD = "weld-.*";
@Deployment
public static WebArchive war()
@@ -54,7 +55,7 @@ public class MethodLevelInterceptorTest
String archiveName = simpleName.substring(0, 1).toLowerCase() +
simpleName.substring(1);
//don't create a completely empty web-archive
- if (CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0))
+ if (CdiContainerUnderTest.is(CONTAINER_WELD))
{
return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndPartialBeanArchive());
@@ -75,8 +76,8 @@ public class MethodLevelInterceptorTest
@Test
public void testMethodLevelInterceptor() throws Exception
{
- // this test is known to not work under weld-2.0.0.Final and
weld-2.0.0.SP1
- Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD_2_0_0));
+ // this test is known to not work under weld
+ Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_WELD));
MyRepository myRepository =
BeanProvider.getContextualReference(MyRepository.class);
