Repository: camel Updated Branches: refs/heads/master 93645b3ca -> 9b93ea51a
Fixed test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b93ea51 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b93ea51 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b93ea51 Branch: refs/heads/master Commit: 9b93ea51a415e23a0728dc0ec7fcbe353eb1f09a Parents: 93645b3 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Feb 19 09:05:33 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Feb 19 09:05:33 2016 +0100 ---------------------------------------------------------------------- .../component/exec/ExecJavaProcessTest.java | 48 ++++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9b93ea51/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java index af1339d..4e75df0 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java @@ -73,12 +73,12 @@ public class ExecJavaProcessTest extends CamelTestSupport { @EndpointInject(uri = "mock:output") MockEndpoint output; - - /** - * Create JndiRegistry and bind custom {@link org.apache.camel.component.exec.ExecCommandExecutor} - * @return - * @throws java.lang.Exception - */ + + @Override + public boolean isUseAdviceWith() { + return true; + } + @Override protected JndiRegistry createRegistry() throws Exception { JndiRegistry registry = super.createRegistry(); @@ -88,6 +88,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testExecJavaProcessExitCode0() throws Exception { + context.start(); + output.setExpectedMessageCount(1); output.expectedHeaderReceived(EXEC_EXIT_VALUE, 0); @@ -97,6 +99,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testExecJavaProcessExitCode1() throws Exception { + context.start(); + output.setExpectedMessageCount(1); output.expectedHeaderReceived(EXEC_EXIT_VALUE, 1); @@ -106,6 +110,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testExecJavaProcessStdout() throws Exception { + context.start(); + String commandArgument = PRINT_IN_STDOUT; output.setExpectedMessageCount(1); output.expectedHeaderReceived(EXEC_EXIT_VALUE, 0); @@ -119,6 +125,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testConvertResultToString() throws Exception { + context.start(); + String commandArgument = PRINT_IN_STDOUT; output.setExpectedMessageCount(1); @@ -130,6 +138,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testByteArrayInputStreamIsResetInConverter() throws Exception { + context.start(); + String commandArgument = PRINT_IN_STDOUT; output.setExpectedMessageCount(1); @@ -146,6 +156,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testIfStdoutIsNullStderrIsReturnedInConverter() throws Exception { + context.start(); + // this will be printed String commandArgument = PRINT_IN_STDERR; output.setExpectedMessageCount(1); @@ -163,6 +175,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testStdoutIsNull() throws Exception { + context.start(); + // this will be printed String commandArgument = PRINT_IN_STDERR; output.setExpectedMessageCount(1); @@ -180,6 +194,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testConvertResultToInputStream() throws Exception { + context.start(); + String commandArgument = PRINT_IN_STDOUT; output.setExpectedMessageCount(1); @@ -191,6 +207,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testConvertResultToByteArray() throws Exception { + context.start(); + String commandArgument = PRINT_IN_STDOUT; output.setExpectedMessageCount(1); @@ -203,6 +221,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { @Test public void testInvalidWorkingDir() throws Exception { + context.start(); + String commandArgument = PRINT_IN_STDOUT; final List<String> args = buildArgs(commandArgument); final String javaAbsolutePath = buildJavaExecutablePath(); @@ -222,6 +242,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaProcessThreads() throws Exception { + context.start(); + output.setExpectedMessageCount(1); Exchange exchange = sendExchange(THREADS, NO_TIMEOUT); @@ -240,6 +262,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaArgsAsString() throws Exception { + context.start(); + output.setExpectedMessageCount(1); Exchange exchange = producerTemplate.send("direct:input", new Processor() { @@ -271,6 +295,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaArgsAsStringWithQuote() throws Exception { + context.start(); + output.setExpectedMessageCount(1); Exchange exchange = producerTemplate.send("direct:input", new Processor() { @@ -302,6 +328,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaArgsAsStringWithoutQuote() throws Exception { + context.start(); + output.setExpectedMessageCount(1); Exchange exchange = producerTemplate.send("direct:input", new Processor() { @@ -334,6 +362,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaProcessTimeout() throws Exception { + context.start(); + int killAfterMillis = 1000; output.setExpectedMessageCount(1); // add some tolerance @@ -350,6 +380,8 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaProcessInputLines() throws Exception { + context.start(); + final StringBuilder builder = new StringBuilder(); int lines = 10; for (int t = 1; t < lines; t++) { @@ -369,17 +401,16 @@ public class ExecJavaProcessTest extends CamelTestSupport { */ @Test public void testExecJavaProcessWithThrownExecException() throws Exception { - //add CustomExecutor context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() { @Override public void configure() throws Exception { weaveByToString(".*java.*").replace().to("exec:java?commandExecutor=#executorMock"); } }); + context.start(); output.setExpectedMessageCount(0); Exchange out = sendFailExchange(EXIT_WITH_VALUE_0, NO_TIMEOUT); - assertEquals(ExecException.class, out.getException().getClass()); //test if exitValue and stderr are accessible through thrown ExecException ExecException ee = (ExecException) out.getException(); @@ -391,7 +422,6 @@ public class ExecJavaProcessTest extends CamelTestSupport { protected Exchange sendExchange(final Object commandArgument, final long timeout) { return sendExchange(commandArgument, buildArgs(commandArgument), timeout, "testBody", false); - } protected Exchange sendFailExchange(final Object commandArgument, final long timeout) {
