svn commit: r580081 - in /incubator/qpid/branches/M2.1: cpp/tests/PubSubMessageSizeTest.cpp cpp/tests/interop_runner.cpp java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java

[rupertlssmith]

Author: rupertlssmith
Date: Thu Sep 27 09:24:57 2007
New Revision: 580081

URL: http://svn.apache.org/viewvc?rev=580081&view=rev
Log:
Interop test case 5 fix.

Modified:
    incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.cpp
    incubator/qpid/branches/M2.1/cpp/tests/interop_runner.cpp
    
incubator/qpid/branches/M2.1/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java

Modified: incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.cpp?rev=580081&r1=580080&r2=580081&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.cpp (original)
+++ incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.cpp Thu Sep 27 
09:24:57 2007
@@ -106,6 +106,8 @@
 
 void PubSubMessageSizeTest::assign(const std::string& role, 
framing::FieldTable& params, TestOptions& options)
 {
+    //std::cout << "void PubSubMessageSizeTest::assign(const std::string& 
role, framing::FieldTable& params, TestOptions& options): called";
+
     std::string key = params.getString("PUBSUB_KEY");
     int messages = params.getInt("PUBSUB_NUM_MESSAGES");
     int receivers = params.getInt("PUBSUB_NUM_RECEIVERS");

Modified: incubator/qpid/branches/M2.1/cpp/tests/interop_runner.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/cpp/tests/interop_runner.cpp?rev=580081&r1=580080&r2=580081&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/cpp/tests/interop_runner.cpp (original)
+++ incubator/qpid/branches/M2.1/cpp/tests/interop_runner.cpp Thu Sep 27 
09:24:57 2007
@@ -94,6 +94,7 @@
 };
 
 /**
+ * TODO: Add clock synching. CLOCK_SYNCH command is currently ignored.
  */
 int main(int argc, char** argv){
     TestOptions options;
@@ -113,8 +114,8 @@
             listener.registerTest("TC1_DummyRun", new DummyRun());
             listener.registerTest("TC2_BasicP2P", new qpid::BasicP2PTest());
             listener.registerTest("TC3_BasicPubSub", new 
qpid::BasicPubSubTest());
-            listener.registerTest("TC4_P2PMessageSizeTest", new 
qpid::P2PMessageSizeTest());
-            listener.registerTest("TC5_PubSubMessageSizeTest", new 
qpid::PubSubMessageSizeTest());
+            listener.registerTest("TC4_P2PMessageSize", new 
qpid::P2PMessageSizeTest());
+            listener.registerTest("TC5_PubSubMessageSize", new 
qpid::PubSubMessageSizeTest());
 
             listener.bindAndConsume();
             
@@ -188,10 +189,12 @@
         std::string name(message.getHeaders().getString("TEST_NAME"));
         if (name.empty() || invite(name)) {
             sendSimpleResponse("ENLIST", message);
+           //std::cout << "Enlisting in test '" << name << "'" << std::endl;
         } else {
             std::cout << "Can't take part in '" << name << "'" << std::endl;
         }
     } else if (type == "ASSIGN_ROLE") {        
+        //std::cout << "Got role assignment request for '" << name << "'" << 
std::endl;
         test->assign(message.getHeaders().getString("ROLE"), 
message.getHeaders(), options);
         sendSimpleResponse("ACCEPT_ROLE", message);
     } else if (type == "START") {        
@@ -206,6 +209,8 @@
     } else if (type == "TERMINATE") {
         if (test != tests.end()) test->stop();
         shutdown();
+    } else if (type == "CLOCK_SYNCH") {
+        // Just ignore for now.
     } else {        
         std::cerr <<"ERROR!: Received unknown control message: " << type << 
std::endl;
         shutdown();

Modified: 
incubator/qpid/branches/M2.1/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java?rev=580081&r1=580080&r2=580081&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
 Thu Sep 27 09:24:57 2007
@@ -78,7 +78,7 @@
     {
         log.debug("public String getName(): called");
 
-        return "TC5_BasicPubSub";
+        return "TC5_PubSubMessageSize";
     }
 
     /**