You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rm...@apache.org on 2014/01/13 22:33:54 UTC
git commit: forcing container to be running in test needing it
Updated Branches:
refs/heads/master 7bbfebfa1 -> 2dacce435
forcing container to be running in test needing it
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/2dacce43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/2dacce43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/2dacce43
Branch: refs/heads/master
Commit: 2dacce435033a8ed0a04d5ae234e01ee46ac389d
Parents: 7bbfebf
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Jan 13 22:34:07 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Jan 13 22:34:07 2014 +0100
----------------------------------------------------------------------
.../test/java/org/apache/batchee/test/cdi/InjectionsTest.java | 3 +++
.../apache/batchee/test/tck/lifecycle/ContainerLifecycle.java | 6 ++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/2dacce43/jbatch/src/test/java/org/apache/batchee/test/cdi/InjectionsTest.java
----------------------------------------------------------------------
diff --git a/jbatch/src/test/java/org/apache/batchee/test/cdi/InjectionsTest.java b/jbatch/src/test/java/org/apache/batchee/test/cdi/InjectionsTest.java
index ca047ee..2c6bbfa 100644
--- a/jbatch/src/test/java/org/apache/batchee/test/cdi/InjectionsTest.java
+++ b/jbatch/src/test/java/org/apache/batchee/test/cdi/InjectionsTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.batchee.test.cdi;
+import org.apache.batchee.test.tck.lifecycle.ContainerLifecycle;
+import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
import javax.batch.operations.JobOperator;
@@ -24,6 +26,7 @@ import javax.batch.runtime.BatchRuntime;
import static org.apache.batchee.util.Batches.waitForEnd;
import static org.testng.Assert.assertEquals;
+@Listeners(ContainerLifecycle.class)
public class InjectionsTest {
@Test
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/2dacce43/jbatch/src/test/java/org/apache/batchee/test/tck/lifecycle/ContainerLifecycle.java
----------------------------------------------------------------------
diff --git a/jbatch/src/test/java/org/apache/batchee/test/tck/lifecycle/ContainerLifecycle.java b/jbatch/src/test/java/org/apache/batchee/test/tck/lifecycle/ContainerLifecycle.java
index d25c0c0..8982b67 100644
--- a/jbatch/src/test/java/org/apache/batchee/test/tck/lifecycle/ContainerLifecycle.java
+++ b/jbatch/src/test/java/org/apache/batchee/test/tck/lifecycle/ContainerLifecycle.java
@@ -17,6 +17,7 @@
package org.apache.batchee.test.tck.lifecycle;
import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.testng.PropertiesBuilder;
import org.testng.ITestContext;
import org.testng.ITestListener;
@@ -62,6 +63,11 @@ public class ContainerLifecycle implements ITestListener {
public void onStart(final ITestContext iTestContext) {
final String loggerName = "test-lifecycle";
+ if (!SystemInstance.isInitialized()) {
+ logger = Logger.getLogger(loggerName);
+ return;
+ }
+
container = EJBContainer.createEJBContainer(new PropertiesBuilder()
.p("openejb.jul.forceReload", Boolean.TRUE.toString())
.p("openejb.log.color", Boolean.toString(!System.getProperty("os.name").toLowerCase().contains("win")))