Author: degenaro Date: Tue Nov 4 19:52:50 2014 New Revision: 1636705 URL: http://svn.apache.org/r1636705 Log: UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
Silence JUnit tests. Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestWiFsm.java uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java?rev=1636705&r1=1636704&r2=1636705&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java Tue Nov 4 19:52:50 2014 @@ -46,6 +46,16 @@ public class ContainerLogger implements setComponent(component); } + private static boolean silentRunning = false; + + public static void setSilentRunning() { + silentRunning = true; + } + + public static void resetSilentRunning() { + silentRunning = false; + } + private String clazz = null; private String component = null; @@ -93,7 +103,9 @@ public class ContainerLogger implements text.append(location); text.append(" "); text.append(format(args)); - System.out.println(text); + if(!silentRunning) { + System.out.println(text); + } } @Override Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java?rev=1636705&r1=1636704&r2=1636705&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java Tue Nov 4 19:52:50 2014 @@ -25,6 +25,7 @@ import java.io.File; import java.net.URL; import java.util.Random; +import org.apache.uima.ducc.container.common.ContainerLogger; import org.apache.uima.ducc.container.jd.JobDriverCommon; import org.apache.uima.ducc.container.jd.mh.Dispatcher; import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo; @@ -56,27 +57,30 @@ public class TestDispatcher { @Before public void setUp() throws Exception { + if(!Testing.isVerbose()) { + ContainerLogger.setSilentRunning(); + } + else { + ContainerLogger.resetSilentRunning(); + } } @After public void tearDown() throws Exception { } - private boolean debug = true; - private boolean asExpected = true; - private void out_println(String message) { System.out.println(message); } private void debug(String message) { - if(debug) { + if(Testing.isDebug()) { out_println(message); } } private void asExpected(String text) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+text; out_println(message); } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java?rev=1636705&r1=1636704&r2=1636705&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java Tue Nov 4 19:52:50 2014 @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.util.concurrent.ConcurrentHashMap; +import org.apache.uima.ducc.container.common.ContainerLogger; import org.apache.uima.ducc.container.common.files.json.JsonConverter; import org.apache.uima.ducc.container.common.files.json.JsonWorkItemState; import org.apache.uima.ducc.container.jd.test.helper.Testing; @@ -44,34 +45,37 @@ public class TestJson { @Before public void setUp() throws Exception { + if(!Testing.isVerbose()) { + ContainerLogger.setSilentRunning(); + } + else { + ContainerLogger.resetSilentRunning(); + } } @After public void tearDown() throws Exception { } - private boolean debug = true; - private boolean asExpected = true; - private void out_println(String message) { System.out.println(message); } private void debug(String message) { - if(debug) { + if(Testing.isDebug()) { out_println(message); } } private void asExpected(String text) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+text; out_println(message); } } private void asExpected(Exception e) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+e.getMessage(); out_println(message); } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1636705&r1=1636704&r2=1636705&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java Tue Nov 4 19:52:50 2014 @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import java.io.File; import java.net.URL; +import org.apache.uima.ducc.container.common.ContainerLogger; import org.apache.uima.ducc.container.jd.JobDriverException; import org.apache.uima.ducc.container.jd.cas.CasManager; import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason; @@ -52,34 +53,37 @@ public class TestSuite { @Before public void setUp() throws Exception { + if(!Testing.isVerbose()) { + ContainerLogger.setSilentRunning(); + } + else { + ContainerLogger.resetSilentRunning(); + } } @After public void tearDown() throws Exception { } - private boolean debug = true; - private boolean asExpected = true; - private void out_println(String message) { System.out.println(message); } private void debug(String message) { - if(debug) { + if(Testing.isDebug()) { out_println(message); } } private void asExpected(String text) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+text; out_println(message); } } private void asExpected(Exception e) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+e.getMessage(); out_println(message); } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestWiFsm.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestWiFsm.java?rev=1636705&r1=1636704&r2=1636705&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestWiFsm.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestWiFsm.java Tue Nov 4 19:52:50 2014 @@ -20,6 +20,7 @@ package org.apache.uima.ducc.container.j import static org.junit.Assert.*; +import org.apache.uima.ducc.container.common.ContainerLogger; import org.apache.uima.ducc.container.common.fsm.Action; import org.apache.uima.ducc.container.common.fsm.Event; import org.apache.uima.ducc.container.common.fsm.Fsm; @@ -50,34 +51,37 @@ public class TestWiFsm { @Before public void setUp() throws Exception { + if(!Testing.isVerbose()) { + ContainerLogger.setSilentRunning(); + } + else { + ContainerLogger.resetSilentRunning(); + } } @After public void tearDown() throws Exception { } - - private boolean debug = false; - private boolean asExpected = true; - + private void out_println(String message) { System.out.println(message); } private void debug(String message) { - if(debug) { + if(Testing.isDebug()) { out_println(message); } } private void asExpected(String text) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+text; out_println(message); } } private void asExpected(Exception e) { - if(asExpected) { + if(Testing.isVerbose()) { String message = "as expected: "+e.getMessage(); out_println(message); } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java?rev=1636705&r1=1636704&r2=1636705&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java Tue Nov 4 19:52:50 2014 @@ -20,9 +20,10 @@ package org.apache.uima.ducc.container.j public class Testing { - private static boolean disabled = true; - + private static boolean disabled = false; + private static boolean verbose = false; private static boolean warned = false; + private static boolean debug = false; public static boolean isDisabled(String name ) { if(disabled) { @@ -33,4 +34,12 @@ public class Testing { } return disabled; } + + public static boolean isVerbose() { + return verbose; + } + + public static boolean isDebug() { + return debug; + } }