You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2018/03/01 05:21:59 UTC
deltaspike git commit: DELTASPIKE-1316 fix broken test on Wildfly9
Repository: deltaspike
Updated Branches:
refs/heads/master 7177eda1f -> f06a78939
DELTASPIKE-1316 fix broken test on Wildfly9
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f06a7893
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f06a7893
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f06a7893
Branch: refs/heads/master
Commit: f06a78939a6c448717856db21c8a33565d450402
Parents: 7177eda
Author: Mark Struberg <st...@apache.org>
Authored: Thu Mar 1 06:20:07 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 1 06:20:07 2018 +0100
----------------------------------------------------------------------
.../deltaspike/test/core/impl/interdyn/InterDynTest.java | 9 ++++++++-
.../test/resources/META-INF/apache-deltaspike.properties | 4 ----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f06a7893/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
index 8264a9e..bc100b8 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
@@ -23,6 +23,7 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
@@ -32,13 +33,19 @@ import javax.inject.Inject;
@RunWith(Arquillian.class)
public class InterDynTest {
+ private final static String CONFIG =
+ "# InterDynTest\n" +
+ "deltaspike.interdyn.enabled=true\n" +
+ "deltaspike.interdyn.rule.1.match=org\\\\.apache\\\\.deltaspike\\\\.test\\\\.core\\\\.impl\\\\.interdyn\\\\.Some.*Service\n" +
+ "deltaspike.interdyn.rule.1.annotation=org.apache.deltaspike.core.api.monitoring.InvocationMonitored\n";
@Deployment
public static WebArchive deploy()
{
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "InterDynTest.jar")
.addPackage(SomeTestService.class.getPackage().getName())
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsManifestResource(new StringAsset(CONFIG), "apache-deltaspike.properties");
return ShrinkWrap.create(WebArchive.class, "InterDynTest.war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f06a7893/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
index d979b4c..28e522f 100644
--- a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
+++ b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
@@ -56,7 +56,3 @@ urlListFromProperties = http://127.0.0.2
prefix.suffix = done
-# InterDynTest
-deltaspike.interdyn.enabled=true
-deltaspike.interdyn.rule.1.match=org\\.apache\\.deltaspike\\.test\\.core\\.impl\\.interdyn\\.Some.*Service
-deltaspike.interdyn.rule.1.annotation=org.apache.deltaspike.core.api.monitoring.InvocationMonitored