diff --git a/.gitignore b/.gitignore index c80df7d958..9bfe0ec81b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,8 @@ ebin/ out/ tmp/ junit*.properties +/target/ +/.DS_Store +/.classpath +/.project +/.settings diff --git a/Makefile b/Makefile index 867f7f7f69..3e3f8d0631 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ WEB_URL=http://www.rabbitmq.com/ NEXUS_STAGE_URL=http://oss.sonatype.org/service/local/staging/deploy/maven2 MAVEN_NEXUS_VERSION=1.7 -AMQP_CODEGEN_DIR=$(shell fgrep sibling.codegen.dir build.properties | sed -e 's:sibling\.codegen\.dir=::') +AMQP_CODEGEN_DIR=$(shell fgrep sibling.codegen.dir src/test/resources/build.properties | sed -e 's:sibling\.codegen\.dir=::') MAVEN_RSYNC_DESTINATION=maven@195.224.125.254:/home/maven/rabbitmq-java-client/ diff --git a/README.md b/README.md index fb712fa298..f045113d86 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,14 @@ Maven artifacts are [released to Maven Central](http://search.maven.org/#search% com.rabbitmq amqp-client - 3.5.5 + 3.6.0 ``` ### Gradle ``` groovy -compile 'com.rabbitmq:amqp-client:3.5.5' +compile 'com.rabbitmq:amqp-client:3.6.0' ``` diff --git a/build.xml b/build.xml index b0e0fe931f..847bfef516 100644 --- a/build.xml +++ b/build.xml @@ -2,8 +2,8 @@ - - + + @@ -81,7 +81,7 @@ - @@ -341,6 +341,9 @@ + + + @@ -365,6 +368,9 @@ + + + @@ -381,6 +387,9 @@ + + + @@ -399,6 +408,9 @@ + + + diff --git a/pom.xml b/pom.xml index 5db8422d17..c55190e876 100644 --- a/pom.xml +++ b/pom.xml @@ -1,77 +1,277 @@ - - 4.0.0 - com.rabbitmq - amqp-client - VERSION - jar - RabbitMQ Java Client - RabbitMQ Java client - http://www.rabbitmq.com + + 4.0.0 - - - ASL 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - GPL v2 - http://www.gnu.org/licenses/gpl-2.0.txt - repo - - - MPL 1.1 - http://www.mozilla.org/MPL/MPL-1.1.txt - repo - - + com.rabbitmq + amqp-client + 3.7.0-SNAPSHOT + jar - - https://github.com/rabbitmq/rabbitmq-java-client.git - scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - + RabbitMQ Java Client + RabbitMQ Java client + http://www.rabbitmq.com - - - rabbitmq.team - The RabbitMQ Team - - Developer - - - + + + ASL 2.0 + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + GPL v2 + http://www.gnu.org/licenses/gpl-2.0.txt + repo + + + MPL 1.1 + http://www.mozilla.org/MPL/MPL-1.1.txt + repo + + - + + https://github.com/rabbitmq/rabbitmq-java-client.git + scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git + - - commons-cli - commons-cli - 1.1 - test - + + + rabbitmq.team + The RabbitMQ Team + + Developer + + + - - commons-io - commons-io - 1.2 - test - + + UTF-8 + - - junit - junit - 4.12 - test - + + + commons-cli + commons-cli + 1.1 + test + + + commons-io + commons-io + 1.2 + test + + + junit + junit + 4.12 + test + + - + + + + + maven-clean-plugin + 3.0.0 + + + + ${basedir}/build + + **/* + + false + + + + + + maven-antrun-plugin + 1.7 + + + generate-sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.10 + + + add-source + generate-sources + + add-source + + + + build/gensrc + + + + + + + maven-compiler-plugin + 3.2 + + 1.6 + 1.6 + + -Xlint:deprecation + -Xlint:unchecked + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + + ${project.build.directory} + + true + + **/ClientTests.* + **/FunctionalTests.* + **/SSLTests.* + **/ServerTests.* + **/FunctionalTests.* + **/HATests.* + **/TestMain.* + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + true + + true + true + + true + + + + + + + jar + test-jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + + jar + test-jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + -Xdoclint:none + + + + + jar + test-jar + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.2 + + + - - - sonatype-nexus-staging - Nexus Release Repository - http://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + + sonatype-nexus-staging + Nexus Release Repository + http://oss.sonatype.org/service/local/staging/deploy/maven2/ + + diff --git a/scripts/runperftestMaven.sh b/scripts/runperftestMaven.sh new file mode 100755 index 0000000000..6bca7b6f7f --- /dev/null +++ b/scripts/runperftestMaven.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +cd `dirname $0`/.. +run() { + echo "=== running with '$2'" + mvn -q exec:java -Dexec.classpathScope=test -Dexec.mainClass="com.rabbitmq.examples.PerfTest" -Dexec.args=" -h $1 -z 10 -i 20 $2" + sleep 2 +} + +for sz in "" "-s 1000"; do + for pers in "" "-f persistent"; do + for args in \ + "" \ + "-a" \ + "-m 1" \ + "-m 1 -n 1" \ + "-m 10" \ + "-m 10 -n 10" \ + ; do + run $1 "${args} ${pers} ${sz}" + done + done +done + +for args in "-a -f mandatory" "-a -f mandatory -f immediate"; do + run $1 "$args" +done diff --git a/scripts/stresspersisterMaven.sh b/scripts/stresspersisterMaven.sh new file mode 100755 index 0000000000..a6e1182d04 --- /dev/null +++ b/scripts/stresspersisterMaven.sh @@ -0,0 +1,72 @@ +#!/bin/sh +cd `dirname $0`/.. +commentText=$1 +shift + +if [ -z "$commentText" ]; then + echo "Comment text must be supplied!" + exit 1 +fi + +echo "Comment text: $commentText. Press enter to continue." +read dummy + +function run1 { + (while true; do (date +%s.%N; ps ax -o '%mem rss sz vsz args' | grep "beam.*-s rabbit" | grep -v grep) | tr '\n' ' ' | awk '{print $1,$2/100,$3,$4,$5}'; sleep 1; done) > memlog.txt & + memlogger=$! + echo "STARTED MEMLOGGER $memlogger" + sleep 2 + mvn -q exec:java -Dexec.classpathScope=test -Dexec.mainClass="com.rabbitmq.examples.StressPersister" -Dexec.args=" -B $1 -b $2 -C $commentText "| tee stressoutput.txt + logfile=$(head -1 stressoutput.txt) + sleep 2 + kill $memlogger + echo "STOPPED MEMLOGGER $memlogger" + baselog=$(basename $logfile .out) + mv memlog.txt $baselog.mem + grep -v '^#' $logfile > stressoutput.txt + mv stressoutput.txt $logfile +} + +function run32b { + run1 32b 5000 + run1 32b 10000 + run1 32b 20000 + run1 32b 40000 + run1 32b 80000 +} + +function run1m { + run1 1m 125 + run1 1m 250 + run1 1m 500 + run1 1m 1000 + run1 1m 2000 + run1 1m 4000 +} + +function chartall { + for logfile in *.out + do + echo $logfile + baselog=$(basename $logfile .out) + firsttimestamp=$(cat $baselog.mem | head -1 | awk '{print $1}') + cat > $baselog.gnuplot < $baselog.png + done +} + +run32b +run1m +chartall diff --git a/src/com/rabbitmq/client/Address.java b/src/main/java/com/rabbitmq/client/Address.java similarity index 100% rename from src/com/rabbitmq/client/Address.java rename to src/main/java/com/rabbitmq/client/Address.java diff --git a/src/com/rabbitmq/client/AlreadyClosedException.java b/src/main/java/com/rabbitmq/client/AlreadyClosedException.java similarity index 100% rename from src/com/rabbitmq/client/AlreadyClosedException.java rename to src/main/java/com/rabbitmq/client/AlreadyClosedException.java diff --git a/src/com/rabbitmq/client/AuthenticationFailureException.java b/src/main/java/com/rabbitmq/client/AuthenticationFailureException.java similarity index 100% rename from src/com/rabbitmq/client/AuthenticationFailureException.java rename to src/main/java/com/rabbitmq/client/AuthenticationFailureException.java diff --git a/src/com/rabbitmq/client/BasicProperties.java b/src/main/java/com/rabbitmq/client/BasicProperties.java similarity index 100% rename from src/com/rabbitmq/client/BasicProperties.java rename to src/main/java/com/rabbitmq/client/BasicProperties.java diff --git a/src/com/rabbitmq/client/BlockedListener.java b/src/main/java/com/rabbitmq/client/BlockedListener.java similarity index 100% rename from src/com/rabbitmq/client/BlockedListener.java rename to src/main/java/com/rabbitmq/client/BlockedListener.java diff --git a/src/com/rabbitmq/client/Channel.java b/src/main/java/com/rabbitmq/client/Channel.java similarity index 100% rename from src/com/rabbitmq/client/Channel.java rename to src/main/java/com/rabbitmq/client/Channel.java diff --git a/src/com/rabbitmq/client/Command.java b/src/main/java/com/rabbitmq/client/Command.java similarity index 100% rename from src/com/rabbitmq/client/Command.java rename to src/main/java/com/rabbitmq/client/Command.java diff --git a/src/com/rabbitmq/client/ConfirmListener.java b/src/main/java/com/rabbitmq/client/ConfirmListener.java similarity index 100% rename from src/com/rabbitmq/client/ConfirmListener.java rename to src/main/java/com/rabbitmq/client/ConfirmListener.java diff --git a/src/com/rabbitmq/client/Connection.java b/src/main/java/com/rabbitmq/client/Connection.java similarity index 98% rename from src/com/rabbitmq/client/Connection.java rename to src/main/java/com/rabbitmq/client/Connection.java index e733ce957a..203ae7d73d 100644 --- a/src/com/rabbitmq/client/Connection.java +++ b/src/main/java/com/rabbitmq/client/Connection.java @@ -16,6 +16,7 @@ package com.rabbitmq.client; +import java.io.Closeable; import java.io.IOException; import java.net.InetAddress; import java.util.Map; @@ -50,7 +51,7 @@ * Current implementations are thread-safe for code at the client API level, * and in fact thread-safe internally except for code within RPC calls. */ -public interface Connection extends ShutdownNotifier { // rename to AMQPConnection later, this is a temporary name +public interface Connection extends ShutdownNotifier, Closeable { // rename to AMQPConnection later, this is a temporary name /** * Retrieve the host. * @return the hostname of the peer we're connected to. diff --git a/src/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java similarity index 100% rename from src/com/rabbitmq/client/ConnectionFactory.java rename to src/main/java/com/rabbitmq/client/ConnectionFactory.java diff --git a/src/com/rabbitmq/client/Consumer.java b/src/main/java/com/rabbitmq/client/Consumer.java similarity index 100% rename from src/com/rabbitmq/client/Consumer.java rename to src/main/java/com/rabbitmq/client/Consumer.java diff --git a/src/com/rabbitmq/client/ConsumerCancelledException.java b/src/main/java/com/rabbitmq/client/ConsumerCancelledException.java similarity index 100% rename from src/com/rabbitmq/client/ConsumerCancelledException.java rename to src/main/java/com/rabbitmq/client/ConsumerCancelledException.java diff --git a/src/com/rabbitmq/client/ContentHeader.java b/src/main/java/com/rabbitmq/client/ContentHeader.java similarity index 100% rename from src/com/rabbitmq/client/ContentHeader.java rename to src/main/java/com/rabbitmq/client/ContentHeader.java diff --git a/src/com/rabbitmq/client/DefaultConsumer.java b/src/main/java/com/rabbitmq/client/DefaultConsumer.java similarity index 100% rename from src/com/rabbitmq/client/DefaultConsumer.java rename to src/main/java/com/rabbitmq/client/DefaultConsumer.java diff --git a/src/com/rabbitmq/client/DefaultSaslConfig.java b/src/main/java/com/rabbitmq/client/DefaultSaslConfig.java similarity index 100% rename from src/com/rabbitmq/client/DefaultSaslConfig.java rename to src/main/java/com/rabbitmq/client/DefaultSaslConfig.java diff --git a/src/com/rabbitmq/client/DefaultSocketConfigurator.java b/src/main/java/com/rabbitmq/client/DefaultSocketConfigurator.java similarity index 100% rename from src/com/rabbitmq/client/DefaultSocketConfigurator.java rename to src/main/java/com/rabbitmq/client/DefaultSocketConfigurator.java diff --git a/src/com/rabbitmq/client/Envelope.java b/src/main/java/com/rabbitmq/client/Envelope.java similarity index 100% rename from src/com/rabbitmq/client/Envelope.java rename to src/main/java/com/rabbitmq/client/Envelope.java diff --git a/src/com/rabbitmq/client/ExceptionHandler.java b/src/main/java/com/rabbitmq/client/ExceptionHandler.java similarity index 100% rename from src/com/rabbitmq/client/ExceptionHandler.java rename to src/main/java/com/rabbitmq/client/ExceptionHandler.java diff --git a/src/com/rabbitmq/client/FlowListener.java b/src/main/java/com/rabbitmq/client/FlowListener.java similarity index 100% rename from src/com/rabbitmq/client/FlowListener.java rename to src/main/java/com/rabbitmq/client/FlowListener.java diff --git a/src/com/rabbitmq/client/GetResponse.java b/src/main/java/com/rabbitmq/client/GetResponse.java similarity index 100% rename from src/com/rabbitmq/client/GetResponse.java rename to src/main/java/com/rabbitmq/client/GetResponse.java diff --git a/src/com/rabbitmq/client/JDKSaslConfig.java b/src/main/java/com/rabbitmq/client/JDKSaslConfig.java similarity index 100% rename from src/com/rabbitmq/client/JDKSaslConfig.java rename to src/main/java/com/rabbitmq/client/JDKSaslConfig.java diff --git a/src/com/rabbitmq/client/LongString.java b/src/main/java/com/rabbitmq/client/LongString.java similarity index 100% rename from src/com/rabbitmq/client/LongString.java rename to src/main/java/com/rabbitmq/client/LongString.java diff --git a/src/com/rabbitmq/client/MalformedFrameException.java b/src/main/java/com/rabbitmq/client/MalformedFrameException.java similarity index 100% rename from src/com/rabbitmq/client/MalformedFrameException.java rename to src/main/java/com/rabbitmq/client/MalformedFrameException.java diff --git a/src/com/rabbitmq/client/MapRpcServer.java b/src/main/java/com/rabbitmq/client/MapRpcServer.java similarity index 100% rename from src/com/rabbitmq/client/MapRpcServer.java rename to src/main/java/com/rabbitmq/client/MapRpcServer.java diff --git a/src/com/rabbitmq/client/MessageProperties.java b/src/main/java/com/rabbitmq/client/MessageProperties.java similarity index 100% rename from src/com/rabbitmq/client/MessageProperties.java rename to src/main/java/com/rabbitmq/client/MessageProperties.java diff --git a/src/com/rabbitmq/client/Method.java b/src/main/java/com/rabbitmq/client/Method.java similarity index 100% rename from src/com/rabbitmq/client/Method.java rename to src/main/java/com/rabbitmq/client/Method.java diff --git a/src/com/rabbitmq/client/MissedHeartbeatException.java b/src/main/java/com/rabbitmq/client/MissedHeartbeatException.java similarity index 100% rename from src/com/rabbitmq/client/MissedHeartbeatException.java rename to src/main/java/com/rabbitmq/client/MissedHeartbeatException.java diff --git a/src/com/rabbitmq/client/NullTrustManager.java b/src/main/java/com/rabbitmq/client/NullTrustManager.java similarity index 100% rename from src/com/rabbitmq/client/NullTrustManager.java rename to src/main/java/com/rabbitmq/client/NullTrustManager.java diff --git a/src/com/rabbitmq/client/PossibleAuthenticationFailureException.java b/src/main/java/com/rabbitmq/client/PossibleAuthenticationFailureException.java similarity index 100% rename from src/com/rabbitmq/client/PossibleAuthenticationFailureException.java rename to src/main/java/com/rabbitmq/client/PossibleAuthenticationFailureException.java diff --git a/src/com/rabbitmq/client/ProtocolVersionMismatchException.java b/src/main/java/com/rabbitmq/client/ProtocolVersionMismatchException.java similarity index 100% rename from src/com/rabbitmq/client/ProtocolVersionMismatchException.java rename to src/main/java/com/rabbitmq/client/ProtocolVersionMismatchException.java diff --git a/src/com/rabbitmq/client/QueueingConsumer.java b/src/main/java/com/rabbitmq/client/QueueingConsumer.java similarity index 100% rename from src/com/rabbitmq/client/QueueingConsumer.java rename to src/main/java/com/rabbitmq/client/QueueingConsumer.java diff --git a/src/com/rabbitmq/client/Recoverable.java b/src/main/java/com/rabbitmq/client/Recoverable.java similarity index 100% rename from src/com/rabbitmq/client/Recoverable.java rename to src/main/java/com/rabbitmq/client/Recoverable.java diff --git a/src/com/rabbitmq/client/RecoveryListener.java b/src/main/java/com/rabbitmq/client/RecoveryListener.java similarity index 79% rename from src/com/rabbitmq/client/RecoveryListener.java rename to src/main/java/com/rabbitmq/client/RecoveryListener.java index 88b0ece2e5..756075a55a 100644 --- a/src/com/rabbitmq/client/RecoveryListener.java +++ b/src/main/java/com/rabbitmq/client/RecoveryListener.java @@ -8,4 +8,5 @@ */ public interface RecoveryListener { public void handleRecovery(Recoverable recoverable); + public void handleRecoveryStarted(Recoverable recoverable); } diff --git a/src/com/rabbitmq/client/ReturnListener.java b/src/main/java/com/rabbitmq/client/ReturnListener.java similarity index 100% rename from src/com/rabbitmq/client/ReturnListener.java rename to src/main/java/com/rabbitmq/client/ReturnListener.java diff --git a/src/com/rabbitmq/client/RpcClient.java b/src/main/java/com/rabbitmq/client/RpcClient.java similarity index 87% rename from src/com/rabbitmq/client/RpcClient.java rename to src/main/java/com/rabbitmq/client/RpcClient.java index 379e36178c..230fec93b7 100644 --- a/src/com/rabbitmq/client/RpcClient.java +++ b/src/main/java/com/rabbitmq/client/RpcClient.java @@ -191,7 +191,7 @@ public void handleDelivery(String consumerTag, String replyId = properties.getCorrelationId(); BlockingCell blocker = _continuationMap.get(replyId); _continuationMap.remove(replyId); - blocker.set(body); + blocker.set(new Response(consumerTag, envelope, properties, body)); } } }; @@ -205,16 +205,15 @@ public void publish(AMQP.BasicProperties props, byte[] message) _channel.basicPublish(_exchange, _routingKey, props, message); } - public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message) - throws IOException, ShutdownSignalException, TimeoutException - { + public Response doCall(AMQP.BasicProperties props, byte[] message) + throws IOException, ShutdownSignalException, TimeoutException { checkConsumer(); BlockingCell k = new BlockingCell(); synchronized (_continuationMap) { _correlationId++; String replyId = "" + _correlationId; props = ((props==null) ? new AMQP.BasicProperties.Builder() : props.builder()) - .correlationId(replyId).replyTo(_replyTo).build(); + .correlationId(replyId).replyTo(_replyTo).build(); _continuationMap.put(replyId, k); } publish(props, message); @@ -229,10 +228,16 @@ public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message) wrapper.initCause(sig); throw wrapper; } else { - return (byte[]) reply; + return (Response) reply; } } + public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message) + throws IOException, ShutdownSignalException, TimeoutException + { + return doCall(props, message).getBody(); + } + /** * Perform a simple byte-array-based RPC roundtrip. * @param message the byte array request message to send @@ -246,6 +251,21 @@ public byte[] primitiveCall(byte[] message) return primitiveCall(null, message); } + /** + * Perform a simple byte-array-based RPC roundtrip + * + * Useful if you need to get at more than just the body of the message + * + * @param message the byte array request message to send + * @return The response object is an envelope that contains all of the data provided to the `handleDelivery` consumer + * @throws ShutdownSignalException if the connection dies during our wait + * @throws IOException if an error is encountered + * @throws TimeoutException if a response is not received within the configured timeout + */ + public Response responseCall(byte[] message) throws IOException, ShutdownSignalException, TimeoutException { + return doCall(null, message); + } + /** * Perform a simple string-based RPC roundtrip. * @param message the string request message to send @@ -368,5 +388,43 @@ public int getCorrelationId() { public Consumer getConsumer() { return _consumer; } + + /** + * The response object is an envelope that contains all of the data provided to the `handleDelivery` consumer + */ + public static class Response { + protected String consumerTag; + protected Envelope envelope; + protected AMQP.BasicProperties properties; + protected byte[] body; + + public Response() { + } + + public Response( + final String consumerTag, final Envelope envelope, final AMQP.BasicProperties properties, + final byte[] body) { + this.consumerTag = consumerTag; + this.envelope = envelope; + this.properties = properties; + this.body = body; + } + + public String getConsumerTag() { + return consumerTag; + } + + public Envelope getEnvelope() { + return envelope; + } + + public AMQP.BasicProperties getProperties() { + return properties; + } + + public byte[] getBody() { + return body; + } + } } diff --git a/src/com/rabbitmq/client/RpcServer.java b/src/main/java/com/rabbitmq/client/RpcServer.java similarity index 100% rename from src/com/rabbitmq/client/RpcServer.java rename to src/main/java/com/rabbitmq/client/RpcServer.java diff --git a/src/com/rabbitmq/client/SaslConfig.java b/src/main/java/com/rabbitmq/client/SaslConfig.java similarity index 100% rename from src/com/rabbitmq/client/SaslConfig.java rename to src/main/java/com/rabbitmq/client/SaslConfig.java diff --git a/src/com/rabbitmq/client/SaslMechanism.java b/src/main/java/com/rabbitmq/client/SaslMechanism.java similarity index 100% rename from src/com/rabbitmq/client/SaslMechanism.java rename to src/main/java/com/rabbitmq/client/SaslMechanism.java diff --git a/src/com/rabbitmq/client/ShutdownListener.java b/src/main/java/com/rabbitmq/client/ShutdownListener.java similarity index 100% rename from src/com/rabbitmq/client/ShutdownListener.java rename to src/main/java/com/rabbitmq/client/ShutdownListener.java diff --git a/src/com/rabbitmq/client/ShutdownNotifier.java b/src/main/java/com/rabbitmq/client/ShutdownNotifier.java similarity index 100% rename from src/com/rabbitmq/client/ShutdownNotifier.java rename to src/main/java/com/rabbitmq/client/ShutdownNotifier.java diff --git a/src/com/rabbitmq/client/ShutdownSignalException.java b/src/main/java/com/rabbitmq/client/ShutdownSignalException.java similarity index 100% rename from src/com/rabbitmq/client/ShutdownSignalException.java rename to src/main/java/com/rabbitmq/client/ShutdownSignalException.java diff --git a/src/com/rabbitmq/client/SocketConfigurator.java b/src/main/java/com/rabbitmq/client/SocketConfigurator.java similarity index 100% rename from src/com/rabbitmq/client/SocketConfigurator.java rename to src/main/java/com/rabbitmq/client/SocketConfigurator.java diff --git a/src/com/rabbitmq/client/StringRpcServer.java b/src/main/java/com/rabbitmq/client/StringRpcServer.java similarity index 100% rename from src/com/rabbitmq/client/StringRpcServer.java rename to src/main/java/com/rabbitmq/client/StringRpcServer.java diff --git a/src/com/rabbitmq/client/TopologyRecoveryException.java b/src/main/java/com/rabbitmq/client/TopologyRecoveryException.java similarity index 100% rename from src/com/rabbitmq/client/TopologyRecoveryException.java rename to src/main/java/com/rabbitmq/client/TopologyRecoveryException.java diff --git a/src/com/rabbitmq/client/UnexpectedFrameError.java b/src/main/java/com/rabbitmq/client/UnexpectedFrameError.java similarity index 100% rename from src/com/rabbitmq/client/UnexpectedFrameError.java rename to src/main/java/com/rabbitmq/client/UnexpectedFrameError.java diff --git a/src/com/rabbitmq/client/UnexpectedMethodError.java b/src/main/java/com/rabbitmq/client/UnexpectedMethodError.java similarity index 100% rename from src/com/rabbitmq/client/UnexpectedMethodError.java rename to src/main/java/com/rabbitmq/client/UnexpectedMethodError.java diff --git a/src/com/rabbitmq/client/UnknownClassOrMethodId.java b/src/main/java/com/rabbitmq/client/UnknownClassOrMethodId.java similarity index 100% rename from src/com/rabbitmq/client/UnknownClassOrMethodId.java rename to src/main/java/com/rabbitmq/client/UnknownClassOrMethodId.java diff --git a/src/com/rabbitmq/client/impl/AMQBasicProperties.java b/src/main/java/com/rabbitmq/client/impl/AMQBasicProperties.java similarity index 100% rename from src/com/rabbitmq/client/impl/AMQBasicProperties.java rename to src/main/java/com/rabbitmq/client/impl/AMQBasicProperties.java diff --git a/src/com/rabbitmq/client/impl/AMQChannel.java b/src/main/java/com/rabbitmq/client/impl/AMQChannel.java similarity index 100% rename from src/com/rabbitmq/client/impl/AMQChannel.java rename to src/main/java/com/rabbitmq/client/impl/AMQChannel.java diff --git a/src/com/rabbitmq/client/impl/AMQCommand.java b/src/main/java/com/rabbitmq/client/impl/AMQCommand.java similarity index 100% rename from src/com/rabbitmq/client/impl/AMQCommand.java rename to src/main/java/com/rabbitmq/client/impl/AMQCommand.java diff --git a/src/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java similarity index 100% rename from src/com/rabbitmq/client/impl/AMQConnection.java rename to src/main/java/com/rabbitmq/client/impl/AMQConnection.java diff --git a/src/com/rabbitmq/client/impl/AMQContentHeader.java b/src/main/java/com/rabbitmq/client/impl/AMQContentHeader.java similarity index 100% rename from src/com/rabbitmq/client/impl/AMQContentHeader.java rename to src/main/java/com/rabbitmq/client/impl/AMQContentHeader.java diff --git a/src/com/rabbitmq/client/impl/CRDemoMechanism.java b/src/main/java/com/rabbitmq/client/impl/CRDemoMechanism.java similarity index 100% rename from src/com/rabbitmq/client/impl/CRDemoMechanism.java rename to src/main/java/com/rabbitmq/client/impl/CRDemoMechanism.java diff --git a/src/com/rabbitmq/client/impl/ChannelManager.java b/src/main/java/com/rabbitmq/client/impl/ChannelManager.java similarity index 100% rename from src/com/rabbitmq/client/impl/ChannelManager.java rename to src/main/java/com/rabbitmq/client/impl/ChannelManager.java diff --git a/src/com/rabbitmq/client/impl/ChannelN.java b/src/main/java/com/rabbitmq/client/impl/ChannelN.java similarity index 100% rename from src/com/rabbitmq/client/impl/ChannelN.java rename to src/main/java/com/rabbitmq/client/impl/ChannelN.java diff --git a/src/com/rabbitmq/client/impl/ClientVersion.java.in b/src/main/java/com/rabbitmq/client/impl/ClientVersion.java.in similarity index 100% rename from src/com/rabbitmq/client/impl/ClientVersion.java.in rename to src/main/java/com/rabbitmq/client/impl/ClientVersion.java.in diff --git a/src/com/rabbitmq/client/impl/CommandAssembler.java b/src/main/java/com/rabbitmq/client/impl/CommandAssembler.java similarity index 100% rename from src/com/rabbitmq/client/impl/CommandAssembler.java rename to src/main/java/com/rabbitmq/client/impl/CommandAssembler.java diff --git a/src/com/rabbitmq/client/impl/ConnectionParams.java b/src/main/java/com/rabbitmq/client/impl/ConnectionParams.java similarity index 100% rename from src/com/rabbitmq/client/impl/ConnectionParams.java rename to src/main/java/com/rabbitmq/client/impl/ConnectionParams.java diff --git a/src/com/rabbitmq/client/impl/ConsumerDispatcher.java b/src/main/java/com/rabbitmq/client/impl/ConsumerDispatcher.java similarity index 100% rename from src/com/rabbitmq/client/impl/ConsumerDispatcher.java rename to src/main/java/com/rabbitmq/client/impl/ConsumerDispatcher.java diff --git a/src/com/rabbitmq/client/impl/ConsumerWorkService.java b/src/main/java/com/rabbitmq/client/impl/ConsumerWorkService.java similarity index 100% rename from src/com/rabbitmq/client/impl/ConsumerWorkService.java rename to src/main/java/com/rabbitmq/client/impl/ConsumerWorkService.java diff --git a/src/com/rabbitmq/client/impl/ContentHeaderPropertyReader.java b/src/main/java/com/rabbitmq/client/impl/ContentHeaderPropertyReader.java similarity index 100% rename from src/com/rabbitmq/client/impl/ContentHeaderPropertyReader.java rename to src/main/java/com/rabbitmq/client/impl/ContentHeaderPropertyReader.java diff --git a/src/com/rabbitmq/client/impl/ContentHeaderPropertyWriter.java b/src/main/java/com/rabbitmq/client/impl/ContentHeaderPropertyWriter.java similarity index 100% rename from src/com/rabbitmq/client/impl/ContentHeaderPropertyWriter.java rename to src/main/java/com/rabbitmq/client/impl/ContentHeaderPropertyWriter.java diff --git a/src/com/rabbitmq/client/impl/DefaultExceptionHandler.java b/src/main/java/com/rabbitmq/client/impl/DefaultExceptionHandler.java similarity index 100% rename from src/com/rabbitmq/client/impl/DefaultExceptionHandler.java rename to src/main/java/com/rabbitmq/client/impl/DefaultExceptionHandler.java diff --git a/src/com/rabbitmq/client/impl/Environment.java b/src/main/java/com/rabbitmq/client/impl/Environment.java similarity index 100% rename from src/com/rabbitmq/client/impl/Environment.java rename to src/main/java/com/rabbitmq/client/impl/Environment.java diff --git a/src/com/rabbitmq/client/impl/ExternalMechanism.java b/src/main/java/com/rabbitmq/client/impl/ExternalMechanism.java similarity index 100% rename from src/com/rabbitmq/client/impl/ExternalMechanism.java rename to src/main/java/com/rabbitmq/client/impl/ExternalMechanism.java diff --git a/src/com/rabbitmq/client/impl/ForgivingExceptionHandler.java b/src/main/java/com/rabbitmq/client/impl/ForgivingExceptionHandler.java similarity index 100% rename from src/com/rabbitmq/client/impl/ForgivingExceptionHandler.java rename to src/main/java/com/rabbitmq/client/impl/ForgivingExceptionHandler.java diff --git a/src/com/rabbitmq/client/impl/Frame.java b/src/main/java/com/rabbitmq/client/impl/Frame.java similarity index 100% rename from src/com/rabbitmq/client/impl/Frame.java rename to src/main/java/com/rabbitmq/client/impl/Frame.java diff --git a/src/com/rabbitmq/client/impl/FrameHandler.java b/src/main/java/com/rabbitmq/client/impl/FrameHandler.java similarity index 100% rename from src/com/rabbitmq/client/impl/FrameHandler.java rename to src/main/java/com/rabbitmq/client/impl/FrameHandler.java diff --git a/src/com/rabbitmq/client/impl/FrameHandlerFactory.java b/src/main/java/com/rabbitmq/client/impl/FrameHandlerFactory.java similarity index 100% rename from src/com/rabbitmq/client/impl/FrameHandlerFactory.java rename to src/main/java/com/rabbitmq/client/impl/FrameHandlerFactory.java diff --git a/src/com/rabbitmq/client/impl/HeartbeatSender.java b/src/main/java/com/rabbitmq/client/impl/HeartbeatSender.java similarity index 100% rename from src/com/rabbitmq/client/impl/HeartbeatSender.java rename to src/main/java/com/rabbitmq/client/impl/HeartbeatSender.java diff --git a/src/com/rabbitmq/client/impl/LongStringHelper.java b/src/main/java/com/rabbitmq/client/impl/LongStringHelper.java similarity index 100% rename from src/com/rabbitmq/client/impl/LongStringHelper.java rename to src/main/java/com/rabbitmq/client/impl/LongStringHelper.java diff --git a/src/com/rabbitmq/client/impl/Method.java b/src/main/java/com/rabbitmq/client/impl/Method.java similarity index 100% rename from src/com/rabbitmq/client/impl/Method.java rename to src/main/java/com/rabbitmq/client/impl/Method.java diff --git a/src/com/rabbitmq/client/impl/MethodArgumentReader.java b/src/main/java/com/rabbitmq/client/impl/MethodArgumentReader.java similarity index 100% rename from src/com/rabbitmq/client/impl/MethodArgumentReader.java rename to src/main/java/com/rabbitmq/client/impl/MethodArgumentReader.java diff --git a/src/com/rabbitmq/client/impl/MethodArgumentWriter.java b/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java similarity index 100% rename from src/com/rabbitmq/client/impl/MethodArgumentWriter.java rename to src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java diff --git a/src/com/rabbitmq/client/impl/NetworkConnection.java b/src/main/java/com/rabbitmq/client/impl/NetworkConnection.java similarity index 100% rename from src/com/rabbitmq/client/impl/NetworkConnection.java rename to src/main/java/com/rabbitmq/client/impl/NetworkConnection.java diff --git a/src/com/rabbitmq/client/impl/PlainMechanism.java b/src/main/java/com/rabbitmq/client/impl/PlainMechanism.java similarity index 100% rename from src/com/rabbitmq/client/impl/PlainMechanism.java rename to src/main/java/com/rabbitmq/client/impl/PlainMechanism.java diff --git a/src/com/rabbitmq/client/impl/SetQueue.java b/src/main/java/com/rabbitmq/client/impl/SetQueue.java similarity index 100% rename from src/com/rabbitmq/client/impl/SetQueue.java rename to src/main/java/com/rabbitmq/client/impl/SetQueue.java diff --git a/src/com/rabbitmq/client/impl/ShutdownNotifierComponent.java b/src/main/java/com/rabbitmq/client/impl/ShutdownNotifierComponent.java similarity index 100% rename from src/com/rabbitmq/client/impl/ShutdownNotifierComponent.java rename to src/main/java/com/rabbitmq/client/impl/ShutdownNotifierComponent.java diff --git a/src/com/rabbitmq/client/impl/SocketFrameHandler.java b/src/main/java/com/rabbitmq/client/impl/SocketFrameHandler.java similarity index 100% rename from src/com/rabbitmq/client/impl/SocketFrameHandler.java rename to src/main/java/com/rabbitmq/client/impl/SocketFrameHandler.java diff --git a/src/com/rabbitmq/client/impl/StrictExceptionHandler.java b/src/main/java/com/rabbitmq/client/impl/StrictExceptionHandler.java similarity index 100% rename from src/com/rabbitmq/client/impl/StrictExceptionHandler.java rename to src/main/java/com/rabbitmq/client/impl/StrictExceptionHandler.java diff --git a/src/com/rabbitmq/client/impl/TruncatedInputStream.java b/src/main/java/com/rabbitmq/client/impl/TruncatedInputStream.java similarity index 100% rename from src/com/rabbitmq/client/impl/TruncatedInputStream.java rename to src/main/java/com/rabbitmq/client/impl/TruncatedInputStream.java diff --git a/src/com/rabbitmq/client/impl/UnknownChannelException.java b/src/main/java/com/rabbitmq/client/impl/UnknownChannelException.java similarity index 100% rename from src/com/rabbitmq/client/impl/UnknownChannelException.java rename to src/main/java/com/rabbitmq/client/impl/UnknownChannelException.java diff --git a/src/com/rabbitmq/client/impl/ValueReader.java b/src/main/java/com/rabbitmq/client/impl/ValueReader.java similarity index 100% rename from src/com/rabbitmq/client/impl/ValueReader.java rename to src/main/java/com/rabbitmq/client/impl/ValueReader.java diff --git a/src/com/rabbitmq/client/impl/ValueWriter.java b/src/main/java/com/rabbitmq/client/impl/ValueWriter.java similarity index 100% rename from src/com/rabbitmq/client/impl/ValueWriter.java rename to src/main/java/com/rabbitmq/client/impl/ValueWriter.java diff --git a/src/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java b/src/main/java/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java similarity index 100% rename from src/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java rename to src/main/java/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java diff --git a/src/com/rabbitmq/client/impl/Version.java b/src/main/java/com/rabbitmq/client/impl/Version.java similarity index 100% rename from src/com/rabbitmq/client/impl/Version.java rename to src/main/java/com/rabbitmq/client/impl/Version.java diff --git a/src/com/rabbitmq/client/impl/WorkPool.java b/src/main/java/com/rabbitmq/client/impl/WorkPool.java similarity index 100% rename from src/com/rabbitmq/client/impl/WorkPool.java rename to src/main/java/com/rabbitmq/client/impl/WorkPool.java diff --git a/src/com/rabbitmq/client/impl/package.html b/src/main/java/com/rabbitmq/client/impl/package.html similarity index 100% rename from src/com/rabbitmq/client/impl/package.html rename to src/main/java/com/rabbitmq/client/impl/package.html diff --git a/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java similarity index 98% rename from src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java rename to src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java index a07c78f5f5..5faeefe604 100644 --- a/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java @@ -489,12 +489,13 @@ public void automaticallyRecover(AutorecoveringConnection connection, Connection this.delegate = (RecoveryAwareChannelN) connDelegate.createChannel(this.getChannelNumber()); this.delegate.inheritOffsetFrom(defunctChannel); + this.notifyRecoveryListenersStarted(); this.recoverShutdownListeners(); this.recoverReturnListeners(); this.recoverConfirmListeners(); this.recoverFlowListeners(); this.recoverState(); - this.notifyRecoveryListeners(); + this.notifyRecoveryListenersComplete(); } private void recoverShutdownListeners() { @@ -538,12 +539,18 @@ private void recoverState() throws IOException { } } - private void notifyRecoveryListeners() { + private void notifyRecoveryListenersComplete() { for (RecoveryListener f : this.recoveryListeners) { f.handleRecovery(this); } } + private void notifyRecoveryListenersStarted() { + for (RecoveryListener f : this.recoveryListeners) { + f.handleRecoveryStarted(this); + } + } + private void recordQueueBinding(String queue, String exchange, String routingKey, Map arguments) { this.connection.recordQueueBinding(this, queue, exchange, routingKey, arguments); } diff --git a/src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java similarity index 98% rename from src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java rename to src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java index b559625fb5..aba249d5d4 100644 --- a/src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java @@ -441,6 +441,9 @@ public void removeConsumerRecoveryListener(ConsumerRecoveryListener listener) { synchronized private void beginAutomaticRecovery() throws InterruptedException, IOException, TopologyRecoveryException { Thread.sleep(this.params.getNetworkRecoveryInterval()); + + this.notifyRecoveryListenersStarted(); + if (!this.recoverConnection()) return; @@ -452,7 +455,7 @@ synchronized private void beginAutomaticRecovery() throws InterruptedException, this.recoverConsumers(); } - this.notifyRecoveryListeners(); + this.notifyRecoveryListenersComplete(); } private void recoverShutdownListeners() { @@ -506,12 +509,18 @@ private void recoverChannels() { } } - private void notifyRecoveryListeners() { + private void notifyRecoveryListenersComplete() { for (RecoveryListener f : this.recoveryListeners) { f.handleRecovery(this); } } + private void notifyRecoveryListenersStarted() { + for (RecoveryListener f : this.recoveryListeners) { + f.handleRecoveryStarted(this); + } + } + private void recoverEntities() throws TopologyRecoveryException { // The recovery sequence is the following: // diff --git a/src/com/rabbitmq/client/impl/recovery/ConsumerRecoveryListener.java b/src/main/java/com/rabbitmq/client/impl/recovery/ConsumerRecoveryListener.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/ConsumerRecoveryListener.java rename to src/main/java/com/rabbitmq/client/impl/recovery/ConsumerRecoveryListener.java diff --git a/src/com/rabbitmq/client/impl/recovery/QueueRecoveryListener.java b/src/main/java/com/rabbitmq/client/impl/recovery/QueueRecoveryListener.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/QueueRecoveryListener.java rename to src/main/java/com/rabbitmq/client/impl/recovery/QueueRecoveryListener.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedBinding.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedBinding.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedBinding.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedBinding.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedConsumer.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedConsumer.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedConsumer.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedConsumer.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedEntity.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedEntity.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedEntity.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedEntity.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedExchange.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchange.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedExchange.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchange.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedExchangeBinding.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchangeBinding.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedExchangeBinding.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchangeBinding.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedQueue.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueue.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedQueue.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueue.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnectionFactory.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnectionFactory.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnectionFactory.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnectionFactory.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelManager.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelManager.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelManager.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelManager.java diff --git a/src/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelN.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelN.java similarity index 100% rename from src/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelN.java rename to src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareChannelN.java diff --git a/src/com/rabbitmq/client/package.html b/src/main/java/com/rabbitmq/client/package.html similarity index 100% rename from src/com/rabbitmq/client/package.html rename to src/main/java/com/rabbitmq/client/package.html diff --git a/src/com/rabbitmq/tools/Tracer.java b/src/main/java/com/rabbitmq/tools/Tracer.java similarity index 100% rename from src/com/rabbitmq/tools/Tracer.java rename to src/main/java/com/rabbitmq/tools/Tracer.java diff --git a/src/com/rabbitmq/tools/json/JSONReader.java b/src/main/java/com/rabbitmq/tools/json/JSONReader.java similarity index 100% rename from src/com/rabbitmq/tools/json/JSONReader.java rename to src/main/java/com/rabbitmq/tools/json/JSONReader.java diff --git a/src/com/rabbitmq/tools/json/JSONSerializable.java b/src/main/java/com/rabbitmq/tools/json/JSONSerializable.java similarity index 100% rename from src/com/rabbitmq/tools/json/JSONSerializable.java rename to src/main/java/com/rabbitmq/tools/json/JSONSerializable.java diff --git a/src/com/rabbitmq/tools/json/JSONUtil.java b/src/main/java/com/rabbitmq/tools/json/JSONUtil.java similarity index 100% rename from src/com/rabbitmq/tools/json/JSONUtil.java rename to src/main/java/com/rabbitmq/tools/json/JSONUtil.java diff --git a/src/com/rabbitmq/tools/json/JSONWriter.java b/src/main/java/com/rabbitmq/tools/json/JSONWriter.java similarity index 100% rename from src/com/rabbitmq/tools/json/JSONWriter.java rename to src/main/java/com/rabbitmq/tools/json/JSONWriter.java diff --git a/src/com/rabbitmq/tools/json/package.html b/src/main/java/com/rabbitmq/tools/json/package.html similarity index 100% rename from src/com/rabbitmq/tools/json/package.html rename to src/main/java/com/rabbitmq/tools/json/package.html diff --git a/src/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java b/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java rename to src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java diff --git a/src/com/rabbitmq/tools/jsonrpc/JsonRpcException.java b/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcException.java similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/JsonRpcException.java rename to src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcException.java diff --git a/src/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java b/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java rename to src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java diff --git a/src/com/rabbitmq/tools/jsonrpc/ParameterDescription.java b/src/main/java/com/rabbitmq/tools/jsonrpc/ParameterDescription.java similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/ParameterDescription.java rename to src/main/java/com/rabbitmq/tools/jsonrpc/ParameterDescription.java diff --git a/src/com/rabbitmq/tools/jsonrpc/ProcedureDescription.java b/src/main/java/com/rabbitmq/tools/jsonrpc/ProcedureDescription.java similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/ProcedureDescription.java rename to src/main/java/com/rabbitmq/tools/jsonrpc/ProcedureDescription.java diff --git a/src/com/rabbitmq/tools/jsonrpc/ServiceDescription.java b/src/main/java/com/rabbitmq/tools/jsonrpc/ServiceDescription.java similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/ServiceDescription.java rename to src/main/java/com/rabbitmq/tools/jsonrpc/ServiceDescription.java diff --git a/src/com/rabbitmq/tools/jsonrpc/package.html b/src/main/java/com/rabbitmq/tools/jsonrpc/package.html similarity index 100% rename from src/com/rabbitmq/tools/jsonrpc/package.html rename to src/main/java/com/rabbitmq/tools/jsonrpc/package.html diff --git a/src/com/rabbitmq/tools/package.html b/src/main/java/com/rabbitmq/tools/package.html similarity index 100% rename from src/com/rabbitmq/tools/package.html rename to src/main/java/com/rabbitmq/tools/package.html diff --git a/src/com/rabbitmq/utility/BlockingCell.java b/src/main/java/com/rabbitmq/utility/BlockingCell.java similarity index 100% rename from src/com/rabbitmq/utility/BlockingCell.java rename to src/main/java/com/rabbitmq/utility/BlockingCell.java diff --git a/src/com/rabbitmq/utility/BlockingValueOrException.java b/src/main/java/com/rabbitmq/utility/BlockingValueOrException.java similarity index 100% rename from src/com/rabbitmq/utility/BlockingValueOrException.java rename to src/main/java/com/rabbitmq/utility/BlockingValueOrException.java diff --git a/src/com/rabbitmq/utility/IntAllocator.java b/src/main/java/com/rabbitmq/utility/IntAllocator.java similarity index 100% rename from src/com/rabbitmq/utility/IntAllocator.java rename to src/main/java/com/rabbitmq/utility/IntAllocator.java diff --git a/src/com/rabbitmq/utility/SensibleClone.java b/src/main/java/com/rabbitmq/utility/SensibleClone.java similarity index 100% rename from src/com/rabbitmq/utility/SensibleClone.java rename to src/main/java/com/rabbitmq/utility/SensibleClone.java diff --git a/src/com/rabbitmq/utility/SingleShotLinearTimer.java b/src/main/java/com/rabbitmq/utility/SingleShotLinearTimer.java similarity index 100% rename from src/com/rabbitmq/utility/SingleShotLinearTimer.java rename to src/main/java/com/rabbitmq/utility/SingleShotLinearTimer.java diff --git a/src/com/rabbitmq/utility/Utility.java b/src/main/java/com/rabbitmq/utility/Utility.java similarity index 100% rename from src/com/rabbitmq/utility/Utility.java rename to src/main/java/com/rabbitmq/utility/Utility.java diff --git a/src/com/rabbitmq/utility/ValueOrException.java b/src/main/java/com/rabbitmq/utility/ValueOrException.java similarity index 100% rename from src/com/rabbitmq/utility/ValueOrException.java rename to src/main/java/com/rabbitmq/utility/ValueOrException.java diff --git a/src/com/rabbitmq/utility/package.html b/src/main/java/com/rabbitmq/utility/package.html similarity index 100% rename from src/com/rabbitmq/utility/package.html rename to src/main/java/com/rabbitmq/utility/package.html diff --git a/test/src/com/rabbitmq/client/impl/WorkPoolTests.java b/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java similarity index 100% rename from test/src/com/rabbitmq/client/impl/WorkPoolTests.java rename to src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java diff --git a/test/src/com/rabbitmq/client/test/AMQBuilderApiTest.java b/src/test/java/com/rabbitmq/client/test/AMQBuilderApiTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/AMQBuilderApiTest.java rename to src/test/java/com/rabbitmq/client/test/AMQBuilderApiTest.java diff --git a/test/src/com/rabbitmq/client/test/AMQConnectionTest.java b/src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/AMQConnectionTest.java rename to src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java diff --git a/src/test/java/com/rabbitmq/client/test/AbstractRMQTestSuite.java b/src/test/java/com/rabbitmq/client/test/AbstractRMQTestSuite.java new file mode 100644 index 0000000000..f01e137bc8 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/AbstractRMQTestSuite.java @@ -0,0 +1,112 @@ +package com.rabbitmq.client.test; + +import java.io.File; +import java.io.IOException; +import java.net.Socket; +import java.util.Properties; + +import junit.framework.Test; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +import com.rabbitmq.tools.Host; + +public abstract class AbstractRMQTestSuite extends TestSuite { + private static final String DEFAULT_SSL_HOSTNAME = "localhost"; + private static final int DEFAULT_SSL_PORT = 5671; + + private static boolean buildSSLPropertiesFound = false; + + static { + Properties TESTS_PROPS = new Properties(System.getProperties()); + TESTS_PROPS.setProperty("make.bin", + System.getenv("MAKE") == null ? "make" : System.getenv("MAKE")); + try { + TESTS_PROPS.load(Host.class.getClassLoader().getResourceAsStream("build.properties")); + TESTS_PROPS.load(Host.class.getClassLoader().getResourceAsStream("config.properties")); + } catch (Exception e) { + System.out.println( + "\"build.properties\" or \"config.properties\" not found" + + " in classpath. Please copy \"build.properties\" and" + + " \"config.properties\" into src/test/resources. Ignore" + + " this message if running with ant."); + } finally { + System.setProperties(TESTS_PROPS); + } + } + + public static boolean requiredProperties() { + /* GNU Make. */ + String make = Host.makeCommand(); + boolean isGNUMake = false; + if (make != null) { + try { + Process makeProc = Host.executeCommandIgnoringErrors(make + " --version"); + String makeVersion = Host.capture(makeProc.getInputStream()); + isGNUMake = makeVersion.startsWith("GNU Make"); + } catch (IOException e) {} + } + if (!isGNUMake) { + System.err.println( + "GNU Make required; please set \"make.bin\" system property" + + " or \"$MAKE\" environment variable"); + return false; + } + + /* Path to rabbitmq_test. */ + String rabbitmq_test = Host.rabbitmqTestDir(); + if (rabbitmq_test == null || !new File(rabbitmq_test).isDirectory()) { + System.err.println( + "rabbitmq_test required; please set \"sibling.rabbitmq_test.dir\" system" + + " property"); + return false; + } + + /* Path to rabbitmqctl. */ + String rabbitmqctl = Host.rabbitmqctlCommand(); + if (rabbitmqctl == null || !new File(rabbitmqctl).isFile()) { + System.err.println( + "rabbitmqctl required; please set \"rabbitmqctl.bin\" system" + + " property"); + return false; + } + + return true; + } + + public static boolean isUnderUmbrella() { + return new File("../../UMBRELLA.md").isFile(); + } + + public static boolean isSSLAvailable() { + String SSL_CERTS_DIR = System.getenv("SSL_CERTS_DIR"); + String hostname = System.getProperty("broker.hostname"); + String port = System.getProperty("broker.sslport"); + if (SSL_CERTS_DIR == null || hostname == null || port == null) + return false; + + String sslClientCertsDir = SSL_CERTS_DIR + File.separator + "client"; + // If certificate is present and some server is listening on port 5671 + if (new File(sslClientCertsDir).exists() && + checkServerListening(hostname, Integer.parseInt(port))) { + return true; + } else + return false; + } + + private static boolean checkServerListening(String host, int port) { + Socket s = null; + try { + s = new Socket(host, port); + return true; + } catch (Exception e) { + return false; + } finally { + if (s != null) + try { + s.close(); + } catch (Exception e) { + } + } + } +} diff --git a/test/src/com/rabbitmq/client/test/AmqpUriTest.java b/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/AmqpUriTest.java rename to src/test/java/com/rabbitmq/client/test/AmqpUriTest.java diff --git a/test/src/com/rabbitmq/client/test/BlockingCellTest.java b/src/test/java/com/rabbitmq/client/test/BlockingCellTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/BlockingCellTest.java rename to src/test/java/com/rabbitmq/client/test/BlockingCellTest.java diff --git a/test/src/com/rabbitmq/client/test/BrokenFramesTest.java b/src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/BrokenFramesTest.java rename to src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java diff --git a/test/src/com/rabbitmq/client/test/BrokerTestCase.java b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java similarity index 99% rename from test/src/com/rabbitmq/client/test/BrokerTestCase.java rename to src/test/java/com/rabbitmq/client/test/BrokerTestCase.java index 2f342f0238..4f1dd54ebb 100644 --- a/test/src/com/rabbitmq/client/test/BrokerTestCase.java +++ b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java @@ -24,23 +24,21 @@ import java.util.UUID; import java.util.concurrent.TimeoutException; +import javax.net.ssl.SSLContext; + import junit.framework.TestCase; +import com.rabbitmq.client.AMQP; +import com.rabbitmq.client.AlreadyClosedException; import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Command; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.MessageProperties; import com.rabbitmq.client.Method; import com.rabbitmq.client.ShutdownSignalException; -import com.rabbitmq.client.AlreadyClosedException; -import com.rabbitmq.client.impl.ShutdownNotifierComponent; -import com.rabbitmq.client.AMQP; import com.rabbitmq.tools.Host; -import javax.net.ssl.SSLContext; - public class BrokerTestCase extends TestCase { protected ConnectionFactory connectionFactory = newConnectionFactory(); diff --git a/test/src/com/rabbitmq/client/test/Bug20004Test.java b/src/test/java/com/rabbitmq/client/test/Bug20004Test.java similarity index 100% rename from test/src/com/rabbitmq/client/test/Bug20004Test.java rename to src/test/java/com/rabbitmq/client/test/Bug20004Test.java diff --git a/test/src/com/rabbitmq/client/test/ChannelNumberAllocationTests.java b/src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ChannelNumberAllocationTests.java rename to src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java diff --git a/test/src/com/rabbitmq/client/test/ClientTests.java b/src/test/java/com/rabbitmq/client/test/ClientTests.java similarity index 93% rename from test/src/com/rabbitmq/client/test/ClientTests.java rename to src/test/java/com/rabbitmq/client/test/ClientTests.java index af38902083..ef2bf97710 100644 --- a/test/src/com/rabbitmq/client/test/ClientTests.java +++ b/src/test/java/com/rabbitmq/client/test/ClientTests.java @@ -17,11 +17,11 @@ package com.rabbitmq.client.test; -import junit.framework.TestCase; import junit.framework.TestSuite; -public class ClientTests extends TestCase { - public static TestSuite suite() { +public class ClientTests extends AbstractRMQTestSuite { + + public static TestSuite suite() { TestSuite suite = new TestSuite("client"); suite.addTest(TableTest.suite()); suite.addTest(LongStringTest.suite()); diff --git a/test/src/com/rabbitmq/client/test/ClonePropertiesTest.java b/src/test/java/com/rabbitmq/client/test/ClonePropertiesTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ClonePropertiesTest.java rename to src/test/java/com/rabbitmq/client/test/ClonePropertiesTest.java diff --git a/test/src/com/rabbitmq/client/test/CloseInMainLoop.java b/src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java similarity index 100% rename from test/src/com/rabbitmq/client/test/CloseInMainLoop.java rename to src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java diff --git a/test/src/com/rabbitmq/client/test/ConfirmBase.java b/src/test/java/com/rabbitmq/client/test/ConfirmBase.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ConfirmBase.java rename to src/test/java/com/rabbitmq/client/test/ConfirmBase.java diff --git a/test/src/com/rabbitmq/client/test/JSONReadWriteTest.java b/src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java similarity index 96% rename from test/src/com/rabbitmq/client/test/JSONReadWriteTest.java rename to src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java index b385dc0b13..ad0b143dfa 100644 --- a/test/src/com/rabbitmq/client/test/JSONReadWriteTest.java +++ b/src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java @@ -17,15 +17,10 @@ package com.rabbitmq.client.test; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import junit.framework.TestCase; -import com.rabbitmq.tools.json.JSONWriter; import com.rabbitmq.tools.json.JSONReader; - -import junit.framework.TestCase; +import com.rabbitmq.tools.json.JSONWriter; public class JSONReadWriteTest extends TestCase { diff --git a/test/src/com/rabbitmq/client/test/LongStringTest.java b/src/test/java/com/rabbitmq/client/test/LongStringTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/LongStringTest.java rename to src/test/java/com/rabbitmq/client/test/LongStringTest.java diff --git a/test/src/com/rabbitmq/client/test/MultiThreadedChannel.java b/src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java similarity index 100% rename from test/src/com/rabbitmq/client/test/MultiThreadedChannel.java rename to src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java diff --git a/test/src/com/rabbitmq/client/test/QueueingConsumerShutdownTests.java b/src/test/java/com/rabbitmq/client/test/QueueingConsumerShutdownTests.java similarity index 100% rename from test/src/com/rabbitmq/client/test/QueueingConsumerShutdownTests.java rename to src/test/java/com/rabbitmq/client/test/QueueingConsumerShutdownTests.java diff --git a/test/src/com/rabbitmq/client/test/SharedThreadPoolTest.java b/src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/SharedThreadPoolTest.java rename to src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java diff --git a/test/src/com/rabbitmq/client/test/TableTest.java b/src/test/java/com/rabbitmq/client/test/TableTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/TableTest.java rename to src/test/java/com/rabbitmq/client/test/TableTest.java diff --git a/test/src/com/rabbitmq/client/test/TruncatedInputStreamTest.java b/src/test/java/com/rabbitmq/client/test/TruncatedInputStreamTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/TruncatedInputStreamTest.java rename to src/test/java/com/rabbitmq/client/test/TruncatedInputStreamTest.java diff --git a/test/src/com/rabbitmq/client/test/ValueOrExceptionTest.java b/src/test/java/com/rabbitmq/client/test/ValueOrExceptionTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ValueOrExceptionTest.java rename to src/test/java/com/rabbitmq/client/test/ValueOrExceptionTest.java diff --git a/test/src/com/rabbitmq/client/test/functional/AbstractRejectTest.java b/src/test/java/com/rabbitmq/client/test/functional/AbstractRejectTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/AbstractRejectTest.java rename to src/test/java/com/rabbitmq/client/test/functional/AbstractRejectTest.java diff --git a/test/src/com/rabbitmq/client/test/functional/AlternateExchange.java b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/AlternateExchange.java rename to src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java diff --git a/test/src/com/rabbitmq/client/test/functional/BasicGet.java b/src/test/java/com/rabbitmq/client/test/functional/BasicGet.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/BasicGet.java rename to src/test/java/com/rabbitmq/client/test/functional/BasicGet.java diff --git a/test/src/com/rabbitmq/client/test/functional/BindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/BindingLifecycle.java rename to src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java diff --git a/test/src/com/rabbitmq/client/test/functional/BindingLifecycleBase.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycleBase.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/BindingLifecycleBase.java rename to src/test/java/com/rabbitmq/client/test/functional/BindingLifecycleBase.java diff --git a/test/src/com/rabbitmq/client/test/functional/CcRoutes.java b/src/test/java/com/rabbitmq/client/test/functional/CcRoutes.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/CcRoutes.java rename to src/test/java/com/rabbitmq/client/test/functional/CcRoutes.java diff --git a/test/src/com/rabbitmq/client/test/functional/ClusteredTestBase.java b/src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ClusteredTestBase.java rename to src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java diff --git a/test/src/com/rabbitmq/client/test/functional/Confirm.java b/src/test/java/com/rabbitmq/client/test/functional/Confirm.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Confirm.java rename to src/test/java/com/rabbitmq/client/test/functional/Confirm.java diff --git a/test/src/com/rabbitmq/client/test/functional/ConnectionOpen.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ConnectionOpen.java rename to src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java diff --git a/test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java similarity index 98% rename from test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java rename to src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java index efb944a347..546d7efc6f 100644 --- a/test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java @@ -550,10 +550,14 @@ public void testQueueRecoveryWithManyQueues() throws IOException, InterruptedExc public void testChannelRecoveryCallback() throws IOException, InterruptedException { final CountDownLatch latch = new CountDownLatch(2); + final CountDownLatch startLatch = new CountDownLatch(2); final RecoveryListener listener = new RecoveryListener() { public void handleRecovery(Recoverable recoverable) { latch.countDown(); } + public void handleRecoveryStarted(Recoverable recoverable) { + startLatch.countDown(); + } }; AutorecoveringChannel ch1 = (AutorecoveringChannel) connection.createChannel(); ch1.addRecoveryListener(listener); @@ -566,6 +570,7 @@ public void handleRecovery(Recoverable recoverable) { expectChannelRecovery(ch1); expectChannelRecovery(ch2); wait(latch); + wait(startLatch); } public void testBasicAckAfterChannelRecovery() throws IOException, InterruptedException, TimeoutException { @@ -670,6 +675,9 @@ private CountDownLatch prepareForRecovery(Connection conn) { public void handleRecovery(Recoverable recoverable) { latch.countDown(); } + public void handleRecoveryStarted(Recoverable recoverable) { + // No-op + } }); return latch; } diff --git a/test/src/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java rename to src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java diff --git a/test/src/com/rabbitmq/client/test/functional/ConsumerCount.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerCount.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ConsumerCount.java rename to src/test/java/com/rabbitmq/client/test/functional/ConsumerCount.java diff --git a/test/src/com/rabbitmq/client/test/functional/ConsumerPriorities.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerPriorities.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ConsumerPriorities.java rename to src/test/java/com/rabbitmq/client/test/functional/ConsumerPriorities.java diff --git a/test/src/com/rabbitmq/client/test/functional/DeadLetterExchange.java b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/DeadLetterExchange.java rename to src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java diff --git a/test/src/com/rabbitmq/client/test/functional/DefaultExchange.java b/src/test/java/com/rabbitmq/client/test/functional/DefaultExchange.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/DefaultExchange.java rename to src/test/java/com/rabbitmq/client/test/functional/DefaultExchange.java diff --git a/test/src/com/rabbitmq/client/test/functional/DirectReplyTo.java b/src/test/java/com/rabbitmq/client/test/functional/DirectReplyTo.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/DirectReplyTo.java rename to src/test/java/com/rabbitmq/client/test/functional/DirectReplyTo.java diff --git a/test/src/com/rabbitmq/client/test/functional/DoubleDeletion.java b/src/test/java/com/rabbitmq/client/test/functional/DoubleDeletion.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/DoubleDeletion.java rename to src/test/java/com/rabbitmq/client/test/functional/DoubleDeletion.java diff --git a/test/src/com/rabbitmq/client/test/functional/DurableOnTransient.java b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/DurableOnTransient.java rename to src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExceptionHandling.java b/src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExceptionHandling.java rename to src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExceptionMessages.java b/src/test/java/com/rabbitmq/client/test/functional/ExceptionMessages.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExceptionMessages.java rename to src/test/java/com/rabbitmq/client/test/functional/ExceptionMessages.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExchangeDeclare.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExchangeDeclare.java rename to src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java rename to src/test/java/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java rename to src/test/java/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java rename to src/test/java/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java rename to src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java diff --git a/test/src/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java rename to src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java diff --git a/test/src/com/rabbitmq/client/test/functional/FrameMax.java b/src/test/java/com/rabbitmq/client/test/functional/FrameMax.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/FrameMax.java rename to src/test/java/com/rabbitmq/client/test/functional/FrameMax.java diff --git a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java new file mode 100644 index 0000000000..c44138e940 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java @@ -0,0 +1,93 @@ +// The contents of this file are subject to the Mozilla Public License +// Version 1.1 (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.mozilla.org/MPL/ +// +// Software distributed under the License is distributed on an "AS IS" +// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +// the License for the specific language governing rights and +// limitations under the License. +// +// The Original Code is RabbitMQ. +// +// The Initial Developer of the Original Code is GoPivotal, Inc. +// Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +// + + +package com.rabbitmq.client.test.functional; + +import com.rabbitmq.client.impl.WorkPoolTests; +import com.rabbitmq.client.test.AbstractRMQTestSuite; +import com.rabbitmq.client.test.Bug20004Test; + +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class FunctionalTests extends AbstractRMQTestSuite { + public static TestSuite suite() { + TestSuite suite = new TestSuite("functional"); + if (!requiredProperties()) return suite; + if (!isUnderUmbrella()) return suite; + add(suite); + return suite; + } + + public static void add(TestSuite suite) { + suite.addTestSuite(ConnectionOpen.class); + suite.addTestSuite(Heartbeat.class); + suite.addTestSuite(Tables.class); + suite.addTestSuite(DoubleDeletion.class); + suite.addTestSuite(Routing.class); + suite.addTestSuite(BindingLifecycle.class); + suite.addTestSuite(Recover.class); + suite.addTestSuite(Reject.class); + suite.addTestSuite(Transactions.class); + suite.addTestSuite(RequeueOnConnectionClose.class); + suite.addTestSuite(RequeueOnChannelClose.class); + suite.addTestSuite(DurableOnTransient.class); + suite.addTestSuite(NoRequeueOnCancel.class); + suite.addTestSuite(Bug20004Test.class); + suite.addTestSuite(ExchangeDeleteIfUnused.class); + suite.addTestSuite(QosTests.class); + suite.addTestSuite(AlternateExchange.class); + suite.addTestSuite(ExchangeExchangeBindings.class); + suite.addTestSuite(ExchangeExchangeBindingsAutoDelete.class); + suite.addTestSuite(ExchangeDeclare.class); + suite.addTestSuite(FrameMax.class); + suite.addTestSuite(QueueLifecycle.class); + suite.addTestSuite(QueueLease.class); + suite.addTestSuite(QueueExclusivity.class); + suite.addTestSuite(QueueSizeLimit.class); + suite.addTestSuite(InvalidAcks.class); + suite.addTestSuite(InvalidAcksTx.class); + suite.addTestSuite(DefaultExchange.class); + suite.addTestSuite(UnbindAutoDeleteExchange.class); + suite.addTestSuite(Confirm.class); + suite.addTestSuite(ConsumerCancelNotification.class); + suite.addTestSuite(UnexpectedFrames.class); + suite.addTestSuite(PerQueueTTL.class); + //needs rabbitmqctl + if (isUnderUmbrella()) { + suite.addTestSuite(PerMessageTTL.class); + suite.addTestSuite(PerQueueVsPerMessageTTL.class); + } + suite.addTestSuite(DeadLetterExchange.class); + suite.addTestSuite(SaslMechanisms.class); + //needs rabbitmqctl + if (isUnderUmbrella()) suite.addTestSuite(UserIDHeader.class); + suite.addTestSuite(InternalExchange.class); + suite.addTestSuite(CcRoutes.class); + suite.addTestSuite(WorkPoolTests.class); + suite.addTestSuite(HeadersExchangeValidation.class); + suite.addTestSuite(ConsumerPriorities.class); + //needs rabbitmqctl + if (isUnderUmbrella()) { + suite.addTestSuite(Policies.class); + suite.addTestSuite(ConnectionRecovery.class); + } + suite.addTestSuite(ExceptionHandling.class); + suite.addTestSuite(PerConsumerPrefetch.class); + suite.addTestSuite(DirectReplyTo.class); + } +} diff --git a/test/src/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java rename to src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java diff --git a/test/src/com/rabbitmq/client/test/functional/Heartbeat.java b/src/test/java/com/rabbitmq/client/test/functional/Heartbeat.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Heartbeat.java rename to src/test/java/com/rabbitmq/client/test/functional/Heartbeat.java diff --git a/test/src/com/rabbitmq/client/test/functional/InternalExchange.java b/src/test/java/com/rabbitmq/client/test/functional/InternalExchange.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/InternalExchange.java rename to src/test/java/com/rabbitmq/client/test/functional/InternalExchange.java diff --git a/test/src/com/rabbitmq/client/test/functional/InvalidAcks.java b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcks.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/InvalidAcks.java rename to src/test/java/com/rabbitmq/client/test/functional/InvalidAcks.java diff --git a/test/src/com/rabbitmq/client/test/functional/InvalidAcksBase.java b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksBase.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/InvalidAcksBase.java rename to src/test/java/com/rabbitmq/client/test/functional/InvalidAcksBase.java diff --git a/test/src/com/rabbitmq/client/test/functional/InvalidAcksTx.java b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksTx.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/InvalidAcksTx.java rename to src/test/java/com/rabbitmq/client/test/functional/InvalidAcksTx.java diff --git a/test/src/com/rabbitmq/client/test/functional/MessageCount.java b/src/test/java/com/rabbitmq/client/test/functional/MessageCount.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/MessageCount.java rename to src/test/java/com/rabbitmq/client/test/functional/MessageCount.java diff --git a/test/src/com/rabbitmq/client/test/functional/Nack.java b/src/test/java/com/rabbitmq/client/test/functional/Nack.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Nack.java rename to src/test/java/com/rabbitmq/client/test/functional/Nack.java diff --git a/test/src/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java b/src/test/java/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java rename to src/test/java/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java diff --git a/test/src/com/rabbitmq/client/test/functional/Nowait.java b/src/test/java/com/rabbitmq/client/test/functional/Nowait.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Nowait.java rename to src/test/java/com/rabbitmq/client/test/functional/Nowait.java diff --git a/test/src/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java b/src/test/java/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java rename to src/test/java/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java diff --git a/test/src/com/rabbitmq/client/test/functional/PerMessageTTL.java b/src/test/java/com/rabbitmq/client/test/functional/PerMessageTTL.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/PerMessageTTL.java rename to src/test/java/com/rabbitmq/client/test/functional/PerMessageTTL.java diff --git a/test/src/com/rabbitmq/client/test/functional/PerQueueTTL.java b/src/test/java/com/rabbitmq/client/test/functional/PerQueueTTL.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/PerQueueTTL.java rename to src/test/java/com/rabbitmq/client/test/functional/PerQueueTTL.java diff --git a/test/src/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java b/src/test/java/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java rename to src/test/java/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java diff --git a/test/src/com/rabbitmq/client/test/functional/Policies.java b/src/test/java/com/rabbitmq/client/test/functional/Policies.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Policies.java rename to src/test/java/com/rabbitmq/client/test/functional/Policies.java diff --git a/test/src/com/rabbitmq/client/test/functional/QosTests.java b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/QosTests.java rename to src/test/java/com/rabbitmq/client/test/functional/QosTests.java diff --git a/test/src/com/rabbitmq/client/test/functional/QueueExclusivity.java b/src/test/java/com/rabbitmq/client/test/functional/QueueExclusivity.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/QueueExclusivity.java rename to src/test/java/com/rabbitmq/client/test/functional/QueueExclusivity.java diff --git a/test/src/com/rabbitmq/client/test/functional/QueueLease.java b/src/test/java/com/rabbitmq/client/test/functional/QueueLease.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/QueueLease.java rename to src/test/java/com/rabbitmq/client/test/functional/QueueLease.java diff --git a/test/src/com/rabbitmq/client/test/functional/QueueLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/QueueLifecycle.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/QueueLifecycle.java rename to src/test/java/com/rabbitmq/client/test/functional/QueueLifecycle.java diff --git a/test/src/com/rabbitmq/client/test/functional/QueueSizeLimit.java b/src/test/java/com/rabbitmq/client/test/functional/QueueSizeLimit.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/QueueSizeLimit.java rename to src/test/java/com/rabbitmq/client/test/functional/QueueSizeLimit.java diff --git a/test/src/com/rabbitmq/client/test/functional/Recover.java b/src/test/java/com/rabbitmq/client/test/functional/Recover.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Recover.java rename to src/test/java/com/rabbitmq/client/test/functional/Recover.java diff --git a/test/src/com/rabbitmq/client/test/functional/Reject.java b/src/test/java/com/rabbitmq/client/test/functional/Reject.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Reject.java rename to src/test/java/com/rabbitmq/client/test/functional/Reject.java diff --git a/test/src/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java rename to src/test/java/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java diff --git a/test/src/com/rabbitmq/client/test/functional/RequeueOnClose.java b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnClose.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/RequeueOnClose.java rename to src/test/java/com/rabbitmq/client/test/functional/RequeueOnClose.java diff --git a/test/src/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java rename to src/test/java/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java diff --git a/test/src/com/rabbitmq/client/test/functional/Routing.java b/src/test/java/com/rabbitmq/client/test/functional/Routing.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Routing.java rename to src/test/java/com/rabbitmq/client/test/functional/Routing.java diff --git a/test/src/com/rabbitmq/client/test/functional/SaslMechanisms.java b/src/test/java/com/rabbitmq/client/test/functional/SaslMechanisms.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/SaslMechanisms.java rename to src/test/java/com/rabbitmq/client/test/functional/SaslMechanisms.java diff --git a/test/src/com/rabbitmq/client/test/functional/TTLHandling.java b/src/test/java/com/rabbitmq/client/test/functional/TTLHandling.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/TTLHandling.java rename to src/test/java/com/rabbitmq/client/test/functional/TTLHandling.java diff --git a/test/src/com/rabbitmq/client/test/functional/Tables.java b/src/test/java/com/rabbitmq/client/test/functional/Tables.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Tables.java rename to src/test/java/com/rabbitmq/client/test/functional/Tables.java diff --git a/test/src/com/rabbitmq/client/test/functional/Transactions.java b/src/test/java/com/rabbitmq/client/test/functional/Transactions.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/Transactions.java rename to src/test/java/com/rabbitmq/client/test/functional/Transactions.java diff --git a/test/src/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java b/src/test/java/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java rename to src/test/java/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java diff --git a/test/src/com/rabbitmq/client/test/functional/UnexpectedFrames.java b/src/test/java/com/rabbitmq/client/test/functional/UnexpectedFrames.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/UnexpectedFrames.java rename to src/test/java/com/rabbitmq/client/test/functional/UnexpectedFrames.java diff --git a/test/src/com/rabbitmq/client/test/functional/UserIDHeader.java b/src/test/java/com/rabbitmq/client/test/functional/UserIDHeader.java similarity index 100% rename from test/src/com/rabbitmq/client/test/functional/UserIDHeader.java rename to src/test/java/com/rabbitmq/client/test/functional/UserIDHeader.java diff --git a/test/src/com/rabbitmq/client/test/performance/CLIHelper.java b/src/test/java/com/rabbitmq/client/test/performance/CLIHelper.java similarity index 100% rename from test/src/com/rabbitmq/client/test/performance/CLIHelper.java rename to src/test/java/com/rabbitmq/client/test/performance/CLIHelper.java diff --git a/test/src/com/rabbitmq/client/test/performance/QosScaling.java b/src/test/java/com/rabbitmq/client/test/performance/QosScaling.java similarity index 100% rename from test/src/com/rabbitmq/client/test/performance/QosScaling.java rename to src/test/java/com/rabbitmq/client/test/performance/QosScaling.java diff --git a/test/src/com/rabbitmq/client/test/performance/ScalabilityTest.java b/src/test/java/com/rabbitmq/client/test/performance/ScalabilityTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/performance/ScalabilityTest.java rename to src/test/java/com/rabbitmq/client/test/performance/ScalabilityTest.java diff --git a/test/src/com/rabbitmq/client/test/performance/StressManagement.java b/src/test/java/com/rabbitmq/client/test/performance/StressManagement.java similarity index 100% rename from test/src/com/rabbitmq/client/test/performance/StressManagement.java rename to src/test/java/com/rabbitmq/client/test/performance/StressManagement.java diff --git a/test/src/com/rabbitmq/client/test/server/AbsentQueue.java b/src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java similarity index 99% rename from test/src/com/rabbitmq/client/test/server/AbsentQueue.java rename to src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java index 0aedd45411..d0c586dbb5 100644 --- a/test/src/com/rabbitmq/client/test/server/AbsentQueue.java +++ b/src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java @@ -17,13 +17,12 @@ package com.rabbitmq.client.test.server; -import com.rabbitmq.client.AMQP; -import com.rabbitmq.client.test.functional.ClusteredTestBase; -import com.rabbitmq.tools.Host; - import java.io.IOException; import java.util.concurrent.TimeoutException; +import com.rabbitmq.client.AMQP; +import com.rabbitmq.client.test.functional.ClusteredTestBase; + /** * This tests whether 'absent' queues - durable queues whose home node * is down - are handled properly. diff --git a/test/src/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java b/src/test/java/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java rename to src/test/java/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java diff --git a/test/src/com/rabbitmq/client/test/server/BlockedConnection.java b/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java similarity index 98% rename from test/src/com/rabbitmq/client/test/server/BlockedConnection.java rename to src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java index 45f9652ceb..3880e5ffb0 100644 --- a/test/src/com/rabbitmq/client/test/server/BlockedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java @@ -17,18 +17,17 @@ package com.rabbitmq.client.test.server; +import java.io.IOException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + import com.rabbitmq.client.BlockedListener; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.MessageProperties; import com.rabbitmq.client.test.BrokerTestCase; -import com.rabbitmq.tools.Host; - -import java.io.IOException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; public class BlockedConnection extends BrokerTestCase { protected void releaseResources() throws IOException { diff --git a/test/src/com/rabbitmq/client/test/server/Bug19219Test.java b/src/test/java/com/rabbitmq/client/test/server/Bug19219Test.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/Bug19219Test.java rename to src/test/java/com/rabbitmq/client/test/server/Bug19219Test.java diff --git a/test/src/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java b/src/test/java/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java rename to src/test/java/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java diff --git a/test/src/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java b/src/test/java/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java rename to src/test/java/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java diff --git a/test/src/com/rabbitmq/client/test/server/DurableBindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/DurableBindingLifecycle.java rename to src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java diff --git a/test/src/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java rename to src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java diff --git a/test/src/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java b/src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java similarity index 98% rename from test/src/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java rename to src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java index 202271b15d..93f61199a7 100644 --- a/test/src/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java +++ b/src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java @@ -23,7 +23,6 @@ import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; import com.rabbitmq.client.test.BrokerTestCase; -import com.rabbitmq.tools.Host; /** * This tests whether exclusive, durable queues are deleted when appropriate diff --git a/test/src/com/rabbitmq/client/test/server/Firehose.java b/src/test/java/com/rabbitmq/client/test/server/Firehose.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/Firehose.java rename to src/test/java/com/rabbitmq/client/test/server/Firehose.java diff --git a/test/src/com/rabbitmq/client/test/server/HATests.java b/src/test/java/com/rabbitmq/client/test/server/HATests.java similarity index 90% rename from test/src/com/rabbitmq/client/test/server/HATests.java rename to src/test/java/com/rabbitmq/client/test/server/HATests.java index a6fcc793c7..5a9226addf 100644 --- a/test/src/com/rabbitmq/client/test/server/HATests.java +++ b/src/test/java/com/rabbitmq/client/test/server/HATests.java @@ -16,17 +16,21 @@ package com.rabbitmq.client.test.server; -import com.rabbitmq.client.test.functional.FunctionalTests; -import com.rabbitmq.tools.Host; import junit.framework.TestCase; import junit.framework.TestSuite; -public class HATests extends TestSuite { +import com.rabbitmq.client.test.AbstractRMQTestSuite; +import com.rabbitmq.client.test.functional.FunctionalTests; +import com.rabbitmq.tools.Host; + +public class HATests extends AbstractRMQTestSuite { // this is horrific public static boolean HA_TESTS_RUNNING = false; public static TestSuite suite() { TestSuite suite = new TestSuite("server-tests"); + if (!requiredProperties()) return suite; + if (!isUnderUmbrella()) return suite; suite.addTestSuite(SetUp.class); FunctionalTests.add(suite); ServerTests.add(suite); diff --git a/test/src/com/rabbitmq/client/test/server/LoopbackUsers.java b/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/LoopbackUsers.java rename to src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java diff --git a/test/src/com/rabbitmq/client/test/server/MemoryAlarms.java b/src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java similarity index 99% rename from test/src/com/rabbitmq/client/test/server/MemoryAlarms.java rename to src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java index ca0bde4db8..b44235d9a9 100644 --- a/test/src/com/rabbitmq/client/test/server/MemoryAlarms.java +++ b/src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java @@ -23,7 +23,6 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; import com.rabbitmq.client.test.BrokerTestCase; -import com.rabbitmq.tools.Host; public class MemoryAlarms extends BrokerTestCase { diff --git a/test/src/com/rabbitmq/client/test/server/MessageRecovery.java b/src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java similarity index 98% rename from test/src/com/rabbitmq/client/test/server/MessageRecovery.java rename to src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java index 271c4c3bed..24d5ff01c4 100644 --- a/test/src/com/rabbitmq/client/test/server/MessageRecovery.java +++ b/src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java @@ -15,13 +15,12 @@ package com.rabbitmq.client.test.server; +import java.io.IOException; + import com.rabbitmq.client.AMQP; -import com.rabbitmq.client.Channel; import com.rabbitmq.client.MessageProperties; import com.rabbitmq.client.test.ConfirmBase; -import java.io.IOException; - public class MessageRecovery extends ConfirmBase { diff --git a/test/src/com/rabbitmq/client/test/server/Permissions.java b/src/test/java/com/rabbitmq/client/test/server/Permissions.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/Permissions.java rename to src/test/java/com/rabbitmq/client/test/server/Permissions.java diff --git a/test/src/com/rabbitmq/client/test/server/PersistenceGuarantees.java b/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/PersistenceGuarantees.java rename to src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java diff --git a/test/src/com/rabbitmq/client/test/server/PriorityQueues.java b/src/test/java/com/rabbitmq/client/test/server/PriorityQueues.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/PriorityQueues.java rename to src/test/java/com/rabbitmq/client/test/server/PriorityQueues.java diff --git a/src/test/java/com/rabbitmq/client/test/server/ServerTests.java b/src/test/java/com/rabbitmq/client/test/server/ServerTests.java new file mode 100644 index 0000000000..4e77517cb0 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/server/ServerTests.java @@ -0,0 +1,52 @@ +// The contents of this file are subject to the Mozilla Public License +// Version 1.1 (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.mozilla.org/MPL/ +// +// Software distributed under the License is distributed on an "AS IS" +// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +// the License for the specific language governing rights and +// limitations under the License. +// +// The Original Code is RabbitMQ. +// +// The Initial Developer of the Original Code is GoPivotal, Inc. +// Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +// + +package com.rabbitmq.client.test.server; + +import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +import com.rabbitmq.client.test.AbstractRMQTestSuite; + +public class ServerTests extends AbstractRMQTestSuite { + + public static TestSuite suite() { + TestSuite suite = new TestSuite("server-tests"); + if (!requiredProperties()) return suite; + if (!isUnderUmbrella()) return suite; + add(suite); + return suite; + } + + public static void add(TestSuite suite) { + suite.addTestSuite(Permissions.class); + suite.addTestSuite(DurableBindingLifecycle.class); + suite.addTestSuite(DeadLetterExchangeDurable.class); + suite.addTestSuite(EffectVisibilityCrossNodeTest.class); + suite.addTestSuite(ExclusiveQueueDurability.class); + suite.addTestSuite(AbsentQueue.class); + suite.addTestSuite(AlternateExchangeEquivalence.class); + suite.addTestSuite(MemoryAlarms.class); + suite.addTestSuite(MessageRecovery.class); + suite.addTestSuite(Firehose.class); + suite.addTestSuite(PersistenceGuarantees.class); + suite.addTestSuite(Shutdown.class); + suite.addTestSuite(BlockedConnection.class); + suite.addTestSuite(ChannelLimitNegotiation.class); + suite.addTestSuite(LoopbackUsers.class); + } +} diff --git a/test/src/com/rabbitmq/client/test/server/Shutdown.java b/src/test/java/com/rabbitmq/client/test/server/Shutdown.java similarity index 74% rename from test/src/com/rabbitmq/client/test/server/Shutdown.java rename to src/test/java/com/rabbitmq/client/test/server/Shutdown.java index 7280eb8be8..e077ce0394 100644 --- a/test/src/com/rabbitmq/client/test/server/Shutdown.java +++ b/src/test/java/com/rabbitmq/client/test/server/Shutdown.java @@ -1,11 +1,7 @@ package com.rabbitmq.client.test.server; -import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.AMQP; -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Connection; - -import java.io.IOException; +import com.rabbitmq.client.test.BrokerTestCase; public class Shutdown extends BrokerTestCase { diff --git a/test/src/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java b/src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java similarity index 100% rename from test/src/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java rename to src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java diff --git a/test/src/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java rename to src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java diff --git a/test/src/com/rabbitmq/client/test/ssl/SSLTests.java b/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java similarity index 77% rename from test/src/com/rabbitmq/client/test/ssl/SSLTests.java rename to src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java index 611df1ec40..b3b660dd95 100644 --- a/test/src/com/rabbitmq/client/test/ssl/SSLTests.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java @@ -17,12 +17,16 @@ package com.rabbitmq.client.test.ssl; -import junit.framework.TestCase; import junit.framework.TestSuite; -public class SSLTests extends TestCase { +import com.rabbitmq.client.test.AbstractRMQTestSuite; + +public class SSLTests extends AbstractRMQTestSuite { public static TestSuite suite() { TestSuite suite = new TestSuite("ssl"); + //Skip the tests if not under umbrella and not SSL available + if (!requiredProperties()) return suite; + if (!(isUnderUmbrella() && isSSLAvailable())) return suite; suite.addTestSuite(UnverifiedConnection.class); suite.addTestSuite(VerifiedConnection.class); suite.addTestSuite(BadVerifiedConnection.class); diff --git a/test/src/com/rabbitmq/client/test/ssl/UnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ssl/UnverifiedConnection.java rename to src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java diff --git a/test/src/com/rabbitmq/client/test/ssl/VerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java similarity index 100% rename from test/src/com/rabbitmq/client/test/ssl/VerifiedConnection.java rename to src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java diff --git a/test/src/com/rabbitmq/examples/BufferPerformanceMetrics.java b/src/test/java/com/rabbitmq/examples/BufferPerformanceMetrics.java similarity index 100% rename from test/src/com/rabbitmq/examples/BufferPerformanceMetrics.java rename to src/test/java/com/rabbitmq/examples/BufferPerformanceMetrics.java diff --git a/test/src/com/rabbitmq/examples/ChannelCreationPerformance.java b/src/test/java/com/rabbitmq/examples/ChannelCreationPerformance.java similarity index 100% rename from test/src/com/rabbitmq/examples/ChannelCreationPerformance.java rename to src/test/java/com/rabbitmq/examples/ChannelCreationPerformance.java diff --git a/test/src/com/rabbitmq/examples/ConfirmDontLoseMessages.java b/src/test/java/com/rabbitmq/examples/ConfirmDontLoseMessages.java similarity index 100% rename from test/src/com/rabbitmq/examples/ConfirmDontLoseMessages.java rename to src/test/java/com/rabbitmq/examples/ConfirmDontLoseMessages.java diff --git a/test/src/com/rabbitmq/examples/ConsumerMain.java b/src/test/java/com/rabbitmq/examples/ConsumerMain.java similarity index 100% rename from test/src/com/rabbitmq/examples/ConsumerMain.java rename to src/test/java/com/rabbitmq/examples/ConsumerMain.java diff --git a/test/src/com/rabbitmq/examples/DirectReplyToPerformance.java b/src/test/java/com/rabbitmq/examples/DirectReplyToPerformance.java similarity index 100% rename from test/src/com/rabbitmq/examples/DirectReplyToPerformance.java rename to src/test/java/com/rabbitmq/examples/DirectReplyToPerformance.java diff --git a/test/src/com/rabbitmq/examples/FileConsumer.java b/src/test/java/com/rabbitmq/examples/FileConsumer.java similarity index 100% rename from test/src/com/rabbitmq/examples/FileConsumer.java rename to src/test/java/com/rabbitmq/examples/FileConsumer.java diff --git a/test/src/com/rabbitmq/examples/FileProducer.java b/src/test/java/com/rabbitmq/examples/FileProducer.java similarity index 100% rename from test/src/com/rabbitmq/examples/FileProducer.java rename to src/test/java/com/rabbitmq/examples/FileProducer.java diff --git a/test/src/com/rabbitmq/examples/HelloClient.java b/src/test/java/com/rabbitmq/examples/HelloClient.java similarity index 100% rename from test/src/com/rabbitmq/examples/HelloClient.java rename to src/test/java/com/rabbitmq/examples/HelloClient.java diff --git a/test/src/com/rabbitmq/examples/HelloJsonClient.java b/src/test/java/com/rabbitmq/examples/HelloJsonClient.java similarity index 100% rename from test/src/com/rabbitmq/examples/HelloJsonClient.java rename to src/test/java/com/rabbitmq/examples/HelloJsonClient.java diff --git a/test/src/com/rabbitmq/examples/HelloJsonServer.java b/src/test/java/com/rabbitmq/examples/HelloJsonServer.java similarity index 100% rename from test/src/com/rabbitmq/examples/HelloJsonServer.java rename to src/test/java/com/rabbitmq/examples/HelloJsonServer.java diff --git a/test/src/com/rabbitmq/examples/HelloJsonService.java b/src/test/java/com/rabbitmq/examples/HelloJsonService.java similarity index 100% rename from test/src/com/rabbitmq/examples/HelloJsonService.java rename to src/test/java/com/rabbitmq/examples/HelloJsonService.java diff --git a/test/src/com/rabbitmq/examples/HelloServer.java b/src/test/java/com/rabbitmq/examples/HelloServer.java similarity index 100% rename from test/src/com/rabbitmq/examples/HelloServer.java rename to src/test/java/com/rabbitmq/examples/HelloServer.java diff --git a/test/src/com/rabbitmq/examples/LogTail.java b/src/test/java/com/rabbitmq/examples/LogTail.java similarity index 100% rename from test/src/com/rabbitmq/examples/LogTail.java rename to src/test/java/com/rabbitmq/examples/LogTail.java diff --git a/test/src/com/rabbitmq/examples/MulticastMain.java b/src/test/java/com/rabbitmq/examples/MulticastMain.java similarity index 100% rename from test/src/com/rabbitmq/examples/MulticastMain.java rename to src/test/java/com/rabbitmq/examples/MulticastMain.java diff --git a/test/src/com/rabbitmq/examples/PerQueueTTLGetter.java b/src/test/java/com/rabbitmq/examples/PerQueueTTLGetter.java similarity index 100% rename from test/src/com/rabbitmq/examples/PerQueueTTLGetter.java rename to src/test/java/com/rabbitmq/examples/PerQueueTTLGetter.java diff --git a/test/src/com/rabbitmq/examples/PerQueueTTLPublisher.java b/src/test/java/com/rabbitmq/examples/PerQueueTTLPublisher.java similarity index 100% rename from test/src/com/rabbitmq/examples/PerQueueTTLPublisher.java rename to src/test/java/com/rabbitmq/examples/PerQueueTTLPublisher.java diff --git a/test/src/com/rabbitmq/examples/PerfTest.java b/src/test/java/com/rabbitmq/examples/PerfTest.java similarity index 100% rename from test/src/com/rabbitmq/examples/PerfTest.java rename to src/test/java/com/rabbitmq/examples/PerfTest.java diff --git a/test/src/com/rabbitmq/examples/PerfTestMulti.java b/src/test/java/com/rabbitmq/examples/PerfTestMulti.java similarity index 100% rename from test/src/com/rabbitmq/examples/PerfTestMulti.java rename to src/test/java/com/rabbitmq/examples/PerfTestMulti.java diff --git a/test/src/com/rabbitmq/examples/ProducerMain.java b/src/test/java/com/rabbitmq/examples/ProducerMain.java similarity index 100% rename from test/src/com/rabbitmq/examples/ProducerMain.java rename to src/test/java/com/rabbitmq/examples/ProducerMain.java diff --git a/test/src/com/rabbitmq/examples/SendString.java b/src/test/java/com/rabbitmq/examples/SendString.java similarity index 100% rename from test/src/com/rabbitmq/examples/SendString.java rename to src/test/java/com/rabbitmq/examples/SendString.java diff --git a/test/src/com/rabbitmq/examples/SimpleConsumer.java b/src/test/java/com/rabbitmq/examples/SimpleConsumer.java similarity index 100% rename from test/src/com/rabbitmq/examples/SimpleConsumer.java rename to src/test/java/com/rabbitmq/examples/SimpleConsumer.java diff --git a/test/src/com/rabbitmq/examples/SimpleProducer.java b/src/test/java/com/rabbitmq/examples/SimpleProducer.java similarity index 100% rename from test/src/com/rabbitmq/examples/SimpleProducer.java rename to src/test/java/com/rabbitmq/examples/SimpleProducer.java diff --git a/test/src/com/rabbitmq/examples/SimpleTopicConsumer.java b/src/test/java/com/rabbitmq/examples/SimpleTopicConsumer.java similarity index 100% rename from test/src/com/rabbitmq/examples/SimpleTopicConsumer.java rename to src/test/java/com/rabbitmq/examples/SimpleTopicConsumer.java diff --git a/test/src/com/rabbitmq/examples/SimpleTopicProducer.java b/src/test/java/com/rabbitmq/examples/SimpleTopicProducer.java similarity index 100% rename from test/src/com/rabbitmq/examples/SimpleTopicProducer.java rename to src/test/java/com/rabbitmq/examples/SimpleTopicProducer.java diff --git a/test/src/com/rabbitmq/examples/SpammyTopicProducer.java b/src/test/java/com/rabbitmq/examples/SpammyTopicProducer.java similarity index 100% rename from test/src/com/rabbitmq/examples/SpammyTopicProducer.java rename to src/test/java/com/rabbitmq/examples/SpammyTopicProducer.java diff --git a/test/src/com/rabbitmq/examples/StressPersister.java b/src/test/java/com/rabbitmq/examples/StressPersister.java similarity index 100% rename from test/src/com/rabbitmq/examples/StressPersister.java rename to src/test/java/com/rabbitmq/examples/StressPersister.java diff --git a/test/src/com/rabbitmq/examples/TestMain.java b/src/test/java/com/rabbitmq/examples/TestMain.java similarity index 94% rename from test/src/com/rabbitmq/examples/TestMain.java rename to src/test/java/com/rabbitmq/examples/TestMain.java index 2cd08136c1..cd12760af7 100644 --- a/test/src/com/rabbitmq/examples/TestMain.java +++ b/src/test/java/com/rabbitmq/examples/TestMain.java @@ -42,26 +42,46 @@ import com.rabbitmq.client.impl.FrameHandler; import com.rabbitmq.client.impl.FrameHandlerFactory; import com.rabbitmq.client.impl.SocketFrameHandler; +import com.rabbitmq.client.test.AbstractRMQTestSuite; import com.rabbitmq.utility.BlockingCell; import javax.net.SocketFactory; +import org.junit.Test; +//FIXME needs to get the arguments from System.getProperty +//FIXME this test needs to be transform into Junit public class TestMain { - public static void main(String[] args) throws IOException, URISyntaxException { + //Ugly patch to initialize system properties + static{ + new AbstractRMQTestSuite(){}; + } + + static String URI = "amqp://localhost"; + + public static void main(String[] args) throws IOException, URISyntaxException { + if (args.length > 0) URI = args[0]; + new TestMain().test(); + } + + + @Test + public void test() throws IOException, URISyntaxException { // Show what version this class was compiled with, to check conformance testing Class clazz = TestMain.class; String javaVersion = System.getProperty("java.version"); System.out.println(clazz.getName() + " : javac v" + getCompilerVersion(clazz) + " on " + javaVersion); try { boolean silent = Boolean.getBoolean("silent"); - final String uri = (args.length > 0) ? args[0] : "amqp://localhost"; + final String uri = URI; runConnectionNegotiationTest(uri); final Connection conn = new ConnectionFactory(){{setUri(uri);}}.newConnection(); if (!silent) { System.out.println("Channel 0 fully open."); } - new TestMain(conn, silent).run(); + set_connection(conn); + set_silent(silent); + run(); runProducerConsumerTest(uri, 500); runProducerConsumerTest(uri, 0); @@ -218,19 +238,29 @@ public static void sleep(int ms) { } } - private final Connection _connection; + private Connection _connection; private Channel _ch1; private int _messageId = 0; - private final boolean _silent; + private boolean _silent; private volatile BlockingCell returnCell; - public TestMain(Connection connection, boolean silent) { - _connection = connection; - _silent = silent; + public TestMain() { + } +// public TestMain(Connection connection, boolean silent) { +// _connection = connection; +// _silent = silent; +// } + + public void set_connection(Connection _connection) { + this._connection = _connection; + } + + public void set_silent(boolean _silent) { + this._silent = _silent; } public Channel createChannel() throws IOException { diff --git a/test/src/com/rabbitmq/examples/TracerConcurrencyTest.java b/src/test/java/com/rabbitmq/examples/TracerConcurrencyTest.java similarity index 100% rename from test/src/com/rabbitmq/examples/TracerConcurrencyTest.java rename to src/test/java/com/rabbitmq/examples/TracerConcurrencyTest.java diff --git a/test/src/com/rabbitmq/examples/perf/Broker.java b/src/test/java/com/rabbitmq/examples/perf/Broker.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/Broker.java rename to src/test/java/com/rabbitmq/examples/perf/Broker.java diff --git a/test/src/com/rabbitmq/examples/perf/BrokerValue.java b/src/test/java/com/rabbitmq/examples/perf/BrokerValue.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/BrokerValue.java rename to src/test/java/com/rabbitmq/examples/perf/BrokerValue.java diff --git a/test/src/com/rabbitmq/examples/perf/BrokerVariable.java b/src/test/java/com/rabbitmq/examples/perf/BrokerVariable.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/BrokerVariable.java rename to src/test/java/com/rabbitmq/examples/perf/BrokerVariable.java diff --git a/test/src/com/rabbitmq/examples/perf/Consumer.java b/src/test/java/com/rabbitmq/examples/perf/Consumer.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/Consumer.java rename to src/test/java/com/rabbitmq/examples/perf/Consumer.java diff --git a/test/src/com/rabbitmq/examples/perf/MulticastParams.java b/src/test/java/com/rabbitmq/examples/perf/MulticastParams.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/MulticastParams.java rename to src/test/java/com/rabbitmq/examples/perf/MulticastParams.java diff --git a/test/src/com/rabbitmq/examples/perf/MulticastSet.java b/src/test/java/com/rabbitmq/examples/perf/MulticastSet.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/MulticastSet.java rename to src/test/java/com/rabbitmq/examples/perf/MulticastSet.java diff --git a/test/src/com/rabbitmq/examples/perf/MulticastValue.java b/src/test/java/com/rabbitmq/examples/perf/MulticastValue.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/MulticastValue.java rename to src/test/java/com/rabbitmq/examples/perf/MulticastValue.java diff --git a/test/src/com/rabbitmq/examples/perf/MulticastVariable.java b/src/test/java/com/rabbitmq/examples/perf/MulticastVariable.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/MulticastVariable.java rename to src/test/java/com/rabbitmq/examples/perf/MulticastVariable.java diff --git a/test/src/com/rabbitmq/examples/perf/PerfUtil.java b/src/test/java/com/rabbitmq/examples/perf/PerfUtil.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/PerfUtil.java rename to src/test/java/com/rabbitmq/examples/perf/PerfUtil.java diff --git a/test/src/com/rabbitmq/examples/perf/Producer.java b/src/test/java/com/rabbitmq/examples/perf/Producer.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/Producer.java rename to src/test/java/com/rabbitmq/examples/perf/Producer.java diff --git a/test/src/com/rabbitmq/examples/perf/ProducerConsumerBase.java b/src/test/java/com/rabbitmq/examples/perf/ProducerConsumerBase.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/ProducerConsumerBase.java rename to src/test/java/com/rabbitmq/examples/perf/ProducerConsumerBase.java diff --git a/test/src/com/rabbitmq/examples/perf/RateVsLatencyScenario.java b/src/test/java/com/rabbitmq/examples/perf/RateVsLatencyScenario.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/RateVsLatencyScenario.java rename to src/test/java/com/rabbitmq/examples/perf/RateVsLatencyScenario.java diff --git a/test/src/com/rabbitmq/examples/perf/Scenario.java b/src/test/java/com/rabbitmq/examples/perf/Scenario.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/Scenario.java rename to src/test/java/com/rabbitmq/examples/perf/Scenario.java diff --git a/test/src/com/rabbitmq/examples/perf/ScenarioFactory.java b/src/test/java/com/rabbitmq/examples/perf/ScenarioFactory.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/ScenarioFactory.java rename to src/test/java/com/rabbitmq/examples/perf/ScenarioFactory.java diff --git a/test/src/com/rabbitmq/examples/perf/ScenarioStats.java b/src/test/java/com/rabbitmq/examples/perf/ScenarioStats.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/ScenarioStats.java rename to src/test/java/com/rabbitmq/examples/perf/ScenarioStats.java diff --git a/test/src/com/rabbitmq/examples/perf/SimpleScenario.java b/src/test/java/com/rabbitmq/examples/perf/SimpleScenario.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/SimpleScenario.java rename to src/test/java/com/rabbitmq/examples/perf/SimpleScenario.java diff --git a/test/src/com/rabbitmq/examples/perf/SimpleScenarioStats.java b/src/test/java/com/rabbitmq/examples/perf/SimpleScenarioStats.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/SimpleScenarioStats.java rename to src/test/java/com/rabbitmq/examples/perf/SimpleScenarioStats.java diff --git a/test/src/com/rabbitmq/examples/perf/Stats.java b/src/test/java/com/rabbitmq/examples/perf/Stats.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/Stats.java rename to src/test/java/com/rabbitmq/examples/perf/Stats.java diff --git a/test/src/com/rabbitmq/examples/perf/Variable.java b/src/test/java/com/rabbitmq/examples/perf/Variable.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/Variable.java rename to src/test/java/com/rabbitmq/examples/perf/Variable.java diff --git a/test/src/com/rabbitmq/examples/perf/VariableValue.java b/src/test/java/com/rabbitmq/examples/perf/VariableValue.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/VariableValue.java rename to src/test/java/com/rabbitmq/examples/perf/VariableValue.java diff --git a/test/src/com/rabbitmq/examples/perf/VaryingScenario.java b/src/test/java/com/rabbitmq/examples/perf/VaryingScenario.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/VaryingScenario.java rename to src/test/java/com/rabbitmq/examples/perf/VaryingScenario.java diff --git a/test/src/com/rabbitmq/examples/perf/VaryingScenarioStats.java b/src/test/java/com/rabbitmq/examples/perf/VaryingScenarioStats.java similarity index 100% rename from test/src/com/rabbitmq/examples/perf/VaryingScenarioStats.java rename to src/test/java/com/rabbitmq/examples/perf/VaryingScenarioStats.java diff --git a/test/src/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java similarity index 96% rename from test/src/com/rabbitmq/tools/Host.java rename to src/test/java/com/rabbitmq/tools/Host.java index 2bac5cb01c..e4ea1129ee 100644 --- a/test/src/com/rabbitmq/tools/Host.java +++ b/src/test/java/com/rabbitmq/tools/Host.java @@ -17,20 +17,19 @@ package com.rabbitmq.tools; -import com.rabbitmq.client.impl.NetworkConnection; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import com.rabbitmq.client.impl.NetworkConnection; + public class Host { - private static String capture(InputStream is) + public static String capture(InputStream is) throws IOException { BufferedReader br = new BufferedReader(new InputStreamReader(is)); @@ -109,17 +108,17 @@ public static Process invokeMakeTarget(String command) throws IOException { " " + command); } - private static String makeCommand() + public static String makeCommand() { return System.getProperty("make.bin"); } - private static String rabbitmqctlCommand() + public static String rabbitmqctlCommand() { return System.getProperty("rabbitmqctl.bin"); } - private static String rabbitmqTestDir() + public static String rabbitmqTestDir() { return System.getProperty("sibling.rabbitmq_test.dir"); } diff --git a/test/src/com/rabbitmq/utility/IntAllocatorTests.java b/src/test/java/com/rabbitmq/utility/IntAllocatorTests.java similarity index 100% rename from test/src/com/rabbitmq/utility/IntAllocatorTests.java rename to src/test/java/com/rabbitmq/utility/IntAllocatorTests.java diff --git a/build.properties b/src/test/resources/build.properties similarity index 86% rename from build.properties rename to src/test/resources/build.properties index 21ba4ff08a..acfbd12a33 100644 --- a/build.properties +++ b/src/test/resources/build.properties @@ -7,7 +7,7 @@ bundle.symbolicName=com.rabbitmq.client bundlor.home=bundlor dist.out=${build.out}/dist impl.version=0.0.0 -javac.debug=true +javac.debug=false javac.out=${build.out}/classes javadoc.out=build/doc/api lib.out=${build.out}/lib @@ -20,4 +20,5 @@ src.generated=${build.out}/gensrc standard.javac.source=1.6 standard.javac.target=1.6 test.javac.out=${build.out}/test/classes -test.src.home=test/src +test.src.home=${basedir}/src/test/java +maven.src.home=${basedir}/src/main/java diff --git a/config.properties b/src/test/resources/config.properties similarity index 91% rename from config.properties rename to src/test/resources/config.properties index c9851fb271..1f2f6018a1 100644 --- a/config.properties +++ b/src/test/resources/config.properties @@ -1,5 +1,6 @@ broker.hostname=localhost broker.port=5672 +broker.sslport=5671 test.main=com.rabbitmq.examples.TestMain test.producer.rate-limit=100000 test.producer.message-count=30000 diff --git a/test/src/com/rabbitmq/client/test/functional/FunctionalTests.java b/test/src/com/rabbitmq/client/test/functional/FunctionalTests.java deleted file mode 100644 index a44b44e6f6..0000000000 --- a/test/src/com/rabbitmq/client/test/functional/FunctionalTests.java +++ /dev/null @@ -1,83 +0,0 @@ -// The contents of this file are subject to the Mozilla Public License -// Version 1.1 (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.mozilla.org/MPL/ -// -// Software distributed under the License is distributed on an "AS IS" -// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -// the License for the specific language governing rights and -// limitations under the License. -// -// The Original Code is RabbitMQ. -// -// The Initial Developer of the Original Code is GoPivotal, Inc. -// Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. -// - - -package com.rabbitmq.client.test.functional; - -import com.rabbitmq.client.impl.WorkPoolTests; -import com.rabbitmq.client.test.Bug20004Test; - -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class FunctionalTests extends TestCase { - public static TestSuite suite() { - TestSuite suite = new TestSuite("functional"); - add(suite); - return suite; - } - - public static void add(TestSuite suite) { - suite.addTestSuite(ConnectionOpen.class); - suite.addTestSuite(Heartbeat.class); - suite.addTestSuite(Tables.class); - suite.addTestSuite(DoubleDeletion.class); - suite.addTestSuite(Routing.class); - suite.addTestSuite(BindingLifecycle.class); - suite.addTestSuite(Recover.class); - suite.addTestSuite(Reject.class); - suite.addTestSuite(Transactions.class); - suite.addTestSuite(RequeueOnConnectionClose.class); - suite.addTestSuite(RequeueOnChannelClose.class); - suite.addTestSuite(DurableOnTransient.class); - suite.addTestSuite(NoRequeueOnCancel.class); - suite.addTestSuite(Bug20004Test.class); - suite.addTestSuite(ExchangeDeleteIfUnused.class); - suite.addTestSuite(QosTests.class); - suite.addTestSuite(AlternateExchange.class); - suite.addTestSuite(ExchangeExchangeBindings.class); - suite.addTestSuite(ExchangeExchangeBindingsAutoDelete.class); - suite.addTestSuite(ExchangeDeclare.class); - suite.addTestSuite(FrameMax.class); - suite.addTestSuite(QueueLifecycle.class); - suite.addTestSuite(QueueLease.class); - suite.addTestSuite(QueueExclusivity.class); - suite.addTestSuite(QueueSizeLimit.class); - suite.addTestSuite(InvalidAcks.class); - suite.addTestSuite(InvalidAcksTx.class); - suite.addTestSuite(DefaultExchange.class); - suite.addTestSuite(UnbindAutoDeleteExchange.class); - suite.addTestSuite(Confirm.class); - suite.addTestSuite(ConsumerCancelNotification.class); - suite.addTestSuite(UnexpectedFrames.class); - suite.addTestSuite(PerQueueTTL.class); - suite.addTestSuite(PerMessageTTL.class); - suite.addTestSuite(PerQueueVsPerMessageTTL.class); - suite.addTestSuite(DeadLetterExchange.class); - suite.addTestSuite(SaslMechanisms.class); - suite.addTestSuite(UserIDHeader.class); - suite.addTestSuite(InternalExchange.class); - suite.addTestSuite(CcRoutes.class); - suite.addTestSuite(WorkPoolTests.class); - suite.addTestSuite(HeadersExchangeValidation.class); - suite.addTestSuite(ConsumerPriorities.class); - suite.addTestSuite(Policies.class); - suite.addTestSuite(ConnectionRecovery.class); - suite.addTestSuite(ExceptionHandling.class); - suite.addTestSuite(PerConsumerPrefetch.class); - suite.addTestSuite(DirectReplyTo.class); - } -} diff --git a/test/src/com/rabbitmq/client/test/server/ServerTests.java b/test/src/com/rabbitmq/client/test/server/ServerTests.java deleted file mode 100644 index 7f46efb447..0000000000 --- a/test/src/com/rabbitmq/client/test/server/ServerTests.java +++ /dev/null @@ -1,47 +0,0 @@ -// The contents of this file are subject to the Mozilla Public License -// Version 1.1 (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.mozilla.org/MPL/ -// -// Software distributed under the License is distributed on an "AS IS" -// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -// the License for the specific language governing rights and -// limitations under the License. -// -// The Original Code is RabbitMQ. -// -// The Initial Developer of the Original Code is GoPivotal, Inc. -// Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. -// - - -package com.rabbitmq.client.test.server; - -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class ServerTests extends TestCase { - public static TestSuite suite() { - TestSuite suite = new TestSuite("server-tests"); - add(suite); - return suite; - } - - public static void add(TestSuite suite) { - suite.addTestSuite(Permissions.class); - suite.addTestSuite(DurableBindingLifecycle.class); - suite.addTestSuite(DeadLetterExchangeDurable.class); - suite.addTestSuite(EffectVisibilityCrossNodeTest.class); - suite.addTestSuite(ExclusiveQueueDurability.class); - suite.addTestSuite(AbsentQueue.class); - suite.addTestSuite(AlternateExchangeEquivalence.class); - suite.addTestSuite(MemoryAlarms.class); - suite.addTestSuite(MessageRecovery.class); - suite.addTestSuite(Firehose.class); - suite.addTestSuite(PersistenceGuarantees.class); - suite.addTestSuite(Shutdown.class); - suite.addTestSuite(BlockedConnection.class); - suite.addTestSuite(ChannelLimitNegotiation.class); - suite.addTestSuite(LoopbackUsers.class); - } -}