http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java index fb87c9a..6087c80 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java @@ -16,18 +16,17 @@ */ package org.apache.camel.component.beanstalk.integration; +import com.surftools.BeanstalkClient.Client; import org.apache.camel.component.beanstalk.ConnectionSettings; import org.apache.camel.component.beanstalk.ConnectionSettingsFactory; -import com.surftools.BeanstalkClient.Client; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Before; public abstract class BeanstalkCamelTestSupport extends CamelTestSupport { - final ConnectionSettingsFactory connFactory = ConnectionSettingsFactory.DEFAULT; - final String tubeName = String.format("test%d", System.currentTimeMillis()); - - protected Client reader = null; - protected Client writer = null; + protected final ConnectionSettingsFactory connFactory = ConnectionSettingsFactory.DEFAULT; + protected final String tubeName = String.format("test%d", System.currentTimeMillis()); + protected Client reader; + protected Client writer; @Before @Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java index 033955e..7223c1a 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java @@ -16,18 +16,18 @@ */ package org.apache.camel.component.beanstalk.integration; -import org.apache.camel.component.beanstalk.Headers; -import com.surftools.BeanstalkClient.Job; import java.io.IOException; + +import com.surftools.BeanstalkClient.Job; import org.apache.camel.CamelExecutionException; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; public class BuryProducerIntegrationTest extends BeanstalkCamelTestSupport { @EndpointInject(uri = "mock:result") @@ -61,7 +61,7 @@ public class BuryProducerIntegrationTest extends BeanstalkCamelTestSupport { assertEquals("Buried job id", jobId, buried.getJobId()); } - @Test(expected=CamelExecutionException.class) + @Test(expected = CamelExecutionException.class) public void testNoJobId() throws InterruptedException, IOException { resultEndpoint.expectedMessageCount(0); direct.sendBody(new byte[0]); @@ -75,7 +75,7 @@ public class BuryProducerIntegrationTest extends BeanstalkCamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("direct:start").to("beanstalk:"+tubeName+"?command=bury").to("mock:result"); + from("direct:start").to("beanstalk:" + tubeName + "?command=bury").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java index 6e2b4de..c0f37df 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java @@ -16,12 +16,13 @@ */ package org.apache.camel.component.beanstalk.integration; -import org.apache.camel.component.beanstalk.Headers; -import org.apache.camel.component.beanstalk.Helper; import java.io.IOException; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.beanstalk.Headers; +import org.apache.camel.component.beanstalk.Helper; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; @@ -33,15 +34,15 @@ public class ConsumerIntegrationTest extends BeanstalkCamelTestSupport { @Test public void testReceive() throws IOException, InterruptedException { - long PRIO = 0; - int TTR = 10; - final long jobId = writer.put(PRIO, 0, TTR, Helper.stringToBytes(testMessage)); + long prio = 0; + int ttr = 10; + final long jobId = writer.put(prio, 0, ttr, Helper.stringToBytes(testMessage)); result.expectedMessageCount(1); result.expectedPropertyReceived(Headers.JOB_ID, jobId); result.message(0).header(Exchange.CREATED_TIMESTAMP).isNotNull(); - result.message(0).header(Headers.JOB_ID).isEqualTo(Long.valueOf(jobId)); - result.message(0).header(Headers.PRIORITY).isEqualTo(Long.valueOf(PRIO)); + result.message(0).header(Headers.JOB_ID).isEqualTo(jobId); + result.message(0).header(Headers.PRIORITY).isEqualTo(prio); result.message(0).header(Headers.TUBE).isEqualTo(tubeName); result.message(0).header(Headers.STATE).isEqualTo("reserved"); result.message(0).header(Headers.AGE).isGreaterThan(0); @@ -59,7 +60,7 @@ public class ConsumerIntegrationTest extends BeanstalkCamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("beanstalk:"+tubeName).to("mock:result"); + from("beanstalk:" + tubeName).to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java index 9d9dc36..07135d1 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java @@ -16,17 +16,17 @@ */ package org.apache.camel.component.beanstalk.integration; -import org.apache.camel.component.beanstalk.Headers; -import com.surftools.BeanstalkClient.Job; import java.io.IOException; + +import com.surftools.BeanstalkClient.Job; import org.apache.camel.CamelExecutionException; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; -import static org.junit.Assert.*; public class DeleteProducerIntegrationTest extends BeanstalkCamelTestSupport { @EndpointInject(uri = "mock:result") @@ -55,7 +55,7 @@ public class DeleteProducerIntegrationTest extends BeanstalkCamelTestSupport { assertNull("Job has been deleted", job); } - @Test(expected=CamelExecutionException.class) + @Test(expected = CamelExecutionException.class) public void testNoJobId() throws InterruptedException, IOException { resultEndpoint.expectedMessageCount(0); direct.sendBody(new byte[0]); @@ -69,7 +69,7 @@ public class DeleteProducerIntegrationTest extends BeanstalkCamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("direct:start").to("beanstalk:"+tubeName+"?command=delete").to("mock:result"); + from("direct:start").to("beanstalk:" + tubeName + "?command=delete").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java index ff96d3e..ec51603 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java @@ -16,24 +16,23 @@ */ package org.apache.camel.component.beanstalk.integration; -import org.apache.camel.component.beanstalk.Headers; -import com.surftools.BeanstalkClient.Job; import java.io.IOException; -import org.apache.camel.EndpointInject; -import org.apache.camel.ExchangePattern; -import org.apache.camel.Produce; + +import com.surftools.BeanstalkClient.Job; import org.apache.camel.Endpoint; +import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; +import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; -import static org.junit.Assert.*; public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { - final String testMessage = "Hello, world!"; @EndpointInject(uri = "mock:result") protected MockEndpoint resultEndpoint; @@ -41,6 +40,8 @@ public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { @Produce(uri = "direct:start") protected ProducerTemplate direct; + private String testMessage = "Hello, world!"; + @Test public void testPut() throws InterruptedException, IOException { resultEndpoint.expectedMessageCount(1); @@ -56,12 +57,12 @@ public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { assertNotNull("Beanstalk client got message", job); assertEquals("Job body from the server", testMessage, new String(job.getData())); assertEquals("Job ID from the server", jobId.longValue(), job.getJobId()); - reader.delete(jobId.longValue()); + reader.delete(jobId); } @Test public void testOut() throws InterruptedException, IOException { - final Endpoint endpoint = context.getEndpoint("beanstalk:"+tubeName); + final Endpoint endpoint = context.getEndpoint("beanstalk:" + tubeName); final Exchange exchange = template.send(endpoint, ExchangePattern.InOut, new Processor() { public void process(Exchange exchange) { exchange.getIn().setBody(testMessage); @@ -78,7 +79,7 @@ public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { assertNotNull("Beanstalk client got message", job); assertEquals("Job body from the server", testMessage, new String(job.getData())); assertEquals("Job ID from the server", jobId.longValue(), job.getJobId()); - reader.delete(jobId.longValue()); + reader.delete(jobId); } @Test @@ -97,7 +98,7 @@ public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { final Job job = reader.reserve(0); assertNull("Beanstalk client has no message", job); - reader.delete(jobId.longValue()); + reader.delete(jobId); } @Override @@ -105,7 +106,7 @@ public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("direct:start").to("beanstalk:"+tubeName+"?jobPriority=1000&jobTimeToRun=5").to("mock:result"); + from("direct:start").to("beanstalk:" + tubeName + "?jobPriority=1000&jobTimeToRun=5").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java index c77dc32..2918037 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java @@ -16,18 +16,18 @@ */ package org.apache.camel.component.beanstalk.integration; -import org.apache.camel.component.beanstalk.Headers; -import com.surftools.BeanstalkClient.Job; import java.io.IOException; + +import com.surftools.BeanstalkClient.Job; import org.apache.camel.CamelExecutionException; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; public class ReleaseProducerIntegrationTest extends BeanstalkCamelTestSupport { @EndpointInject(uri = "mock:result") @@ -61,7 +61,7 @@ public class ReleaseProducerIntegrationTest extends BeanstalkCamelTestSupport { assertEquals("Buried job id", jobId, buried.getJobId()); } - @Test(expected=CamelExecutionException.class) + @Test(expected = CamelExecutionException.class) public void testNoJobId() throws InterruptedException, IOException { resultEndpoint.expectedMessageCount(0); direct.sendBody(new byte[0]); @@ -75,7 +75,7 @@ public class ReleaseProducerIntegrationTest extends BeanstalkCamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("direct:start").to("beanstalk:"+tubeName+"?command=release").to("mock:result"); + from("direct:start").to("beanstalk:" + tubeName + "?command=release").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java index bfb4c45..aa352e3 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java @@ -16,18 +16,18 @@ */ package org.apache.camel.component.beanstalk.integration; -import org.apache.camel.component.beanstalk.Headers; -import com.surftools.BeanstalkClient.Job; import java.io.IOException; + +import com.surftools.BeanstalkClient.Job; import org.apache.camel.CamelExecutionException; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; public class TouchProducerIntegrationTest extends BeanstalkCamelTestSupport { @EndpointInject(uri = "mock:result") @@ -61,7 +61,7 @@ public class TouchProducerIntegrationTest extends BeanstalkCamelTestSupport { assertEquals("Buried job id", jobId, buried.getJobId()); } - @Test(expected=CamelExecutionException.class) + @Test(expected = CamelExecutionException.class) public void testNoJobId() throws InterruptedException, IOException { resultEndpoint.expectedMessageCount(0); direct.sendBody(new byte[0]); @@ -75,7 +75,7 @@ public class TouchProducerIntegrationTest extends BeanstalkCamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("direct:start").to("beanstalk:"+tubeName+"?command=touch").to("mock:result"); + from("direct:start").to("beanstalk:" + tubeName + "?command=touch").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d6361062/components/camel-beanstalk/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/resources/log4j.properties b/components/camel-beanstalk/src/test/resources/log4j.properties new file mode 100644 index 0000000..d6a09a1 --- /dev/null +++ b/components/camel-beanstalk/src/test/resources/log4j.properties @@ -0,0 +1,35 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +# +# The logging properties used during tests.. +# +log4j.rootLogger=INFO, file + +#log4j.logger.org.apache.camel.dataformat.beanio=DEBUG + +# CONSOLE appender not used by default +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d %-5p %c{1} - %m %n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n +log4j.appender.file.file=target/camel-beanstalk-test.log +
