Author: cschneider
Date: Tue Jun 14 11:11:49 2011
New Revision: 1135485
URL: http://svn.apache.org/viewvc?rev=1135485&view=rev
Log:
Make syslog tests use dynamic port numbers
Added:
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/camel.properties
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
Tue Jun 14 11:11:49 2011
@@ -26,17 +26,24 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
public class AutomatedConversionTest extends CamelTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 1;
private final String message =
"<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to
make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK #
Transport:\n" + " Conveyer1=OK, Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ }
+
@Test
public void testSendingRawUDP() throws IOException, InterruptedException {
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
Tue Jun 14 11:11:49 2011
@@ -27,16 +27,23 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
public class MinaDataFormatTest extends CamelTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 1;
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ }
+
@Test
public void testSendingRawUDP() throws IOException, InterruptedException {
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
Tue Jun 14 11:11:49 2011
@@ -26,16 +26,23 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
public class MinaManyUDPMessagesTest extends CamelTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 100;
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ }
+
@Test
public void testSendingManyMessages() throws Exception,
InterruptedException {
MockEndpoint stop1 = getMockEndpoint("mock:stop1");
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
Tue Jun 14 11:11:49 2011
@@ -27,16 +27,23 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
public class NettyDataFormatTest extends CamelTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 1;
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ }
+
@Test
public void testSendingRawUDP() throws IOException, InterruptedException {
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
Tue Jun 14 11:11:49 2011
@@ -26,16 +26,23 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
public class NettyManyUDPMessagesTest extends CamelTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 100;
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ }
+
@Test
public void testSendingManyMessages() throws Exception,
InterruptedException {
MockEndpoint stop1 = getMockEndpoint("mock:stop1");
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
Tue Jun 14 11:11:49 2011
@@ -23,18 +23,26 @@ import java.net.DatagramSocket;
import java.net.InetAddress;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SyslogSpringMinaTest extends CamelSpringTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 1;
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ System.setProperty("server-port", new Integer(serverPort).toString());
+ }
+
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/syslog/applicationContext-Mina.xml");
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
Tue Jun 14 11:11:49 2011
@@ -23,17 +23,25 @@ import java.net.DatagramSocket;
import java.net.InetAddress;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SyslogSpringNettyTest extends CamelSpringTestSupport {
- private final int serverPort = 10514;
+ private static int serverPort;
private final int messageCount = 1;
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
+ @BeforeClass
+ public static void initPort() {
+ serverPort = AvailablePortFinder.getNextAvailable();
+ System.setProperty("server-port", new Integer(serverPort).toString());
+ }
+
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/syslog/applicationContext-Netty.xml");
Modified:
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
(original)
+++
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
Tue Jun 14 11:11:49 2011
@@ -21,6 +21,10 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
+<bean id="propertyConfigurer"
+
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+</bean>
+
<bean id="myMinaFactory"
class="org.apache.camel.component.mina.MinaComponent">
<!-- we must provide a camel context so we refer to it by its id -->
<constructor-arg index="0" ref="myCamel"/>
@@ -37,7 +41,7 @@
<bean id="minaSyslogConfig"
class="org.apache.camel.component.mina.MinaConfiguration">
<property name="protocol" value="udp"/>
<property name="host" value="localhost"/>
- <property name="port" value="10514"/>
+ <property name="port" value="${server-port}"/>
<property name="sync" value="false"/>
</bean>
Modified:
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml?rev=1135485&r1=1135484&r2=1135485&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
(original)
+++
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
Tue Jun 14 11:11:49 2011
@@ -23,13 +23,13 @@
<camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring";>
-
+ <propertyPlaceholder id="properties"
location="org/apache/camel/component/syslog/camel.properties"/>
<dataFormats>
<syslog id="mySyslog"/>
</dataFormats>
<route>
- <from
uri="netty:udp://localhost:10514?sync=false&allowDefaultCodec=false"/>
+ <from
uri="netty:udp://localhost:{{server-port}}?sync=false&allowDefaultCodec=false"/>
<unmarshal ref="mySyslog"/>
<to uri="mock:stop1"/>
<marshal ref="mySyslog"/>
Added:
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/camel.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/camel.properties?rev=1135485&view=auto
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/camel.properties
(added)
+++
camel/trunk/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/camel.properties
Tue Jun 14 11:11:49 2011
@@ -0,0 +1 @@
+# Just an empty file to make the property component work the server port is
configured using System.setProperty
\ No newline at end of file
