QPID-283

Documented topic test
Updated perftests.log4j to include log level in output to make it clear when there is a non test output
Fixed bug in Publisher where batches of 2 would result in a div by zero error.

scripts created and edited to use the amqj.test.logging.level.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495584 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 59 insertions, 3 deletions

diff --git a/java/perftests/bin/serviceRequestReply-QuickTest.sh b/java/perftests/bin/serviceRequestReply-QuickTest.sh
index 667e6c2d87..b79e94e291 100755
--- a/java/perftests/bin/serviceRequestReply-QuickTest.sh
+++ b/java/perftests/bin/serviceRequestReply-QuickTest.sh
@@ -20,7 +20,7 @@
 # args supplied: <brokerdetails> <num messages>
 
 if [[ $# != 2 ]] ; then
- echo "usage: ./serviceQuickTest.sh <brokerdetails> <Number of messages> [<P[ersistent]|N[onPersistent] (default N)> <T[ransacted]|N[onTransacted] (default N)>]"
+ echo "usage: ./serviceRequestReply-QuickTest.sh <brokerdetails> <Number of messages> [<P[ersistent]|N[onPersistent] (default N)> <T[ransacted]|N[onTransacted] (default N)>]"
  exit 1
 fi
 
diff --git a/java/perftests/bin/topic-QuickTest.sh b/java/perftests/bin/topic-QuickTest.sh
new file mode 100755
index 0000000000..931f102893
--- /dev/null
+++ b/java/perftests/bin/topic-QuickTest.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# args supplied: <host> <port> <messages> <clients> <batches>
+
+if [[ $# < 5 ]] ; then
+ echo "usage: ./topic-QuickTest.sh <host> <port> <messages> <clients> <batches> [other params for both listener and publisher]"
+ exit 1
+fi
+
+host=$1
+shift
+
+port=$1
+shift
+
+nomessages=$1
+shift
+
+noclients=$1
+shift
+
+batches=$1
+shift
+
+sleeptime=$(( 2 * $noclients ))
+
+. ./setupclasspath.sh
+echo $CP
+
+./run_many.sh $noclients topic "$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level='warn' -Damqj.test.logging.level='info' -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Listener -host $host -port $port $@" &
+
+echo
+echo "Pausing for $sleeptime seconds to allow clients to connect"
+sleep $sleeptime
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Publisher -host $host -port $port -messages $nomessages -clients $noclients -batch $batches $@ 
+
+
diff --git a/java/perftests/bin/topicListener.sh b/java/perftests/bin/topicListener.sh
index 454efefe7d..757a8c9edb 100755
--- a/java/perftests/bin/topicListener.sh
+++ b/java/perftests/bin/topicListener.sh
@@ -22,4 +22,5 @@
 # XXX -Xmx512m -Xms512m -XX:NewSize=150m
 . ./setupclasspath.sh
 echo $CP
-$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="INFO" org.apache.qpid.topic.Listener $*
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Listener $@
diff --git a/java/perftests/bin/topicPublisher.sh b/java/perftests/bin/topicPublisher.sh
index cc3a8736cc..8bcdaca3c4 100755
--- a/java/perftests/bin/topicPublisher.sh
+++ b/java/perftests/bin/topicPublisher.sh
@@ -20,4 +20,4 @@
 
 # XXX -Xmx512m -Xms512m -XX:NewSize=150m
 . ./setupclasspath.sh
-$JAVA_HOME/bin/java -cp $CP  -Damqj.logging.level="INFO" org.apache.qpid.topic.Publisher $*
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Publisher $@