This commit is for QPID-859

The verify_all script will run all verify scripts under each example
Following is a description of each script type
==============================================
verify             - runs java producer and consumer.
verify_java_python - runs java producer and python consumer
verify_python_java - runs python consumer and java consumer
verify_cpp_java    - runs cpp producer and java consumer
verify_java_cpp    - runs java producer and cpp consumer

The xxx.in file contains the expected output.
It will be compared against the output of the test to determine any failures.



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

11 files changed, 199 insertions, 10 deletions

diff --git a/java/client/example/bin/verify_all b/java/client/example/bin/verify_all
new file mode 100644
index 0000000000..e4bed434c8
--- /dev/null
+++ b/java/client/example/bin/verify_all
@@ -0,0 +1,26 @@
+#!/bin/sh
+# This script assumes QPID_SRC_HOME is set .
+
+if [[ "x$QPID_SRC_HOME" =  "x" ]]; then
+  echo "WARNING >>>  QPID_SRC_HOME needs to be set "  
+  exit
+fi
+
+export CPP=$QPID_SRC_HOME/cpp/examples/examples
+export PYTHON=$QPID_SRC_HOME/python/examples
+export JAVA=$QPID_SRC_HOME/java/client/example/src/main/java/org/apache/qpid/example/jmsexample
+
+QPID_LIBS=`find $QPID_SRC_HOME/java/build/lib -name '*.jar' | tr '\n' ":"`
+export CLASSPATH=$QPID_LIBS:$CLASSPATH
+
+verify=$QPID_SRC_HOME/cpp/examples/verify
+
+for dir in $(find $JAVA/ -maxdepth 1 -type d -not -name '*.svn')
+do
+  #echo "Dir" $dir
+  for script in $(find $dir -maxdepth 1 -type f -name 'verify*' -not -name '*.*')
+  do
+    #echo "Script"  $script
+    $verify $script
+  done
+done
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
index 88aaeda9f9..afcd30af88 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
@@ -1,4 +1,14 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-clients java -cp  "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer  java -cp  "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
-outputs ./direct_consumer.java.out  ./direct_producer.java.out
+# The JMS producer doesn't create qeueues so utilising the c++ declare_queues
+cpp=$CPP/direct
 
+direct_consumer_java(){
+java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+}
+
+direct_producer_java(){
+java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+}
+
+clients $cpp/declare_queues direct_producer_java direct_consumer_java
+outputs $cpp/declare_queues.out ./direct_producer_java.out ./direct_consumer_java.out
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in
new file mode 100644
index 0000000000..c87e5716c8
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify.in
@@ -0,0 +1,35 @@
+==== declare_queues.out
+==== direct_producer_java.out
+Producer: Creating a non-transacted, auto-acknowledged session
+Producer: Creating a Message Producer
+Producer: Creating a TestMessage to send to the destination
+Producer: Sending message: 1
+Producer: Sending message: 2
+Producer: Sending message: 3
+Producer: Sending message: 4
+Producer: Sending message: 5
+Producer: Sending message: 6
+Producer: Sending message: 7
+Producer: Sending message: 8
+Producer: Sending message: 9
+Producer: Sending message: 10
+Producer: Closing connection
+Producer: Closing JNDI context
+==== direct_consumer_java.out
+Consumer: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
+Consumer: Creating a non-transacted, auto-acknowledged session
+Consumer: Creating a MessageConsumer
+Consumer: Starting connection so MessageConsumer can receive messages
+Consumer: Received  message:  Message 1
+Consumer: Received  message:  Message 2
+Consumer: Received  message:  Message 3
+Consumer: Received  message:  Message 4
+Consumer: Received  message:  Message 5
+Consumer: Received  message:  Message 6
+Consumer: Received  message:  Message 7
+Consumer: Received  message:  Message 8
+Consumer: Received  message:  Message 9
+Consumer: Received  message:  Message 10
+Consumer: Received final message That's all, folks!
+Consumer: Closing connection
+Consumer: Closing JNDI context
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
index 0eff17a3a0..85c8a12903 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
@@ -1,5 +1,10 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 cpp=$CPP/direct
-clients java -cp  "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer  cpp/direct_producer
-outputs ./direct_consumer.java.out  ./direct_producer.cpp.out
+
+direct_consumer_java(){
+java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+}
+
+clients $cpp/declare_queues $cpp/direct_producer direct_consumer_java
+outputs $cpp/declare_queues.out $cpp/direct_producer.out ./direct_consumer_java.out
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in
new file mode 100644
index 0000000000..b50692da1f
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java.in
@@ -0,0 +1,20 @@
+==== declare_queues.out
+==== direct_producer.out
+==== direct_consumer_java.out
+Consumer: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
+Consumer: Creating a non-transacted, auto-acknowledged session
+Consumer: Creating a MessageConsumer
+Consumer: Starting connection so MessageConsumer can receive messages
+Consumer: Received  message:  Message 0
+Consumer: Received  message:  Message 1
+Consumer: Received  message:  Message 2
+Consumer: Received  message:  Message 3
+Consumer: Received  message:  Message 4
+Consumer: Received  message:  Message 5
+Consumer: Received  message:  Message 6
+Consumer: Received  message:  Message 7
+Consumer: Received  message:  Message 8
+Consumer: Received  message:  Message 9
+Consumer: Received final message That's all, folks!
+Consumer: Closing connection
+Consumer: Closing JNDI context
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
index bdd5946458..8cea77025e 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
@@ -1,5 +1,10 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 cpp=$CPP/direct
-clients cpp/declare_queues cpp/direct_consumer java -cp  "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
-outputs ./declare_queues.cpp.out ./direct_consumer.cpp.out ./direct_producer.java.out
+
+direct_producer_java(){
+java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+}
+
+clients $cpp/declare_queues direct_producer_java $cpp/listener
+outputs $cpp/declare_queues.out ./direct_producer_java.out $cpp/listener.out
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in
new file mode 100644
index 0000000000..946c19953f
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp.in
@@ -0,0 +1,30 @@
+==== declare_queues.out
+==== direct_producer_java.out
+Producer: Creating a non-transacted, auto-acknowledged session
+Producer: Creating a Message Producer
+Producer: Creating a TestMessage to send to the destination
+Producer: Sending message: 1
+Producer: Sending message: 2
+Producer: Sending message: 3
+Producer: Sending message: 4
+Producer: Sending message: 5
+Producer: Sending message: 6
+Producer: Sending message: 7
+Producer: Sending message: 8
+Producer: Sending message: 9
+Producer: Sending message: 10
+Producer: Closing connection
+Producer: Closing JNDI context
+==== listener.out
+Message: Message 1
+Message: Message 2
+Message: Message 3
+Message: Message 4
+Message: Message 5
+Message: Message 6
+Message: Message 7
+Message: Message 8
+Message: Message 9
+Message: Message 10
+Message: That's all, folks!
+Shutting down listener for message_queue
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
index faff524f65..5fedcb10e5 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
@@ -1,5 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 py=$PYTHON/direct
-clients py/declare_queues.py py/direct_consumer.py java -cp  "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
-outputs ./declare_queues.py.out ./direct_consumer.py.out ./direct_producer.java.out
 
+direct_producer_java(){
+java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+}
+
+clients $py/declare_queues.py direct_producer_java $py/direct_consumer.py
+outputs $py/declare_queues.py.out ./direct_producer_java.out  $py/direct_consumer.py.out
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in
new file mode 100644
index 0000000000..e012405352
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python.in
@@ -0,0 +1,29 @@
+==== declare_queues.py.out
+==== direct_producer_java.out
+Producer: Creating a non-transacted, auto-acknowledged session
+Producer: Creating a Message Producer
+Producer: Creating a TestMessage to send to the destination
+Producer: Sending message: 1
+Producer: Sending message: 2
+Producer: Sending message: 3
+Producer: Sending message: 4
+Producer: Sending message: 5
+Producer: Sending message: 6
+Producer: Sending message: 7
+Producer: Sending message: 8
+Producer: Sending message: 9
+Producer: Sending message: 10
+Producer: Closing connection
+Producer: Closing JNDI context
+==== direct_consumer.py.out
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+Message 10
+That's all, folks!
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
index 370623f4ce..7914665baf 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
@@ -1,5 +1,10 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 py=$PYTHON/direct
-clients java -cp  "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer  py/direct_producer.py
-outputs ./direct_consumer.java.out  ./direct_producer.py.out
+
+direct_consumer_java(){
+java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+}
+
+clients $py/declare_queues.py  $py/direct_producer.py direct_consumer_java
+outputs $py/declare_queues.py.out $py/direct_producer.py.out ./direct_consumer_java.out
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in
new file mode 100644
index 0000000000..6a9c9fdd10
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java.in
@@ -0,0 +1,20 @@
+==== declare_queues.py.out
+==== direct_producer.py.out
+==== direct_consumer_java.out
+Consumer: Setting an ExceptionListener on the connection as sample uses a MessageConsumer
+Consumer: Creating a non-transacted, auto-acknowledged session
+Consumer: Creating a MessageConsumer
+Consumer: Starting connection so MessageConsumer can receive messages
+Consumer: Received  message:  message 0
+Consumer: Received  message:  message 1
+Consumer: Received  message:  message 2
+Consumer: Received  message:  message 3
+Consumer: Received  message:  message 4
+Consumer: Received  message:  message 5
+Consumer: Received  message:  message 6
+Consumer: Received  message:  message 7
+Consumer: Received  message:  message 8
+Consumer: Received  message:  message 9
+Consumer: Received final message That's all, folks!
+Consumer: Closing connection
+Consumer: Closing JNDI context