Changeset 2983 for box/trunk/test/basicserver

Timestamp:

27/08/2011 15:06:46 (9 months ago)

Author:

chris

Message:

Combine client and server protocols to make way for an offline/local protocol.

Rename ProtocolObject? to Message.

Location:

box/trunk/test/basicserver

Files:

• Makefile.extra (modified) (1 diff)
• TestCommands.cpp (modified) (5 diffs)
• testbasicserver.cpp (modified) (7 diffs)

box/trunk/test/basicserver/Makefile.extra

@@ -2 +2 @@
 MAKEPROTOCOL = ../../lib/server/makeprotocol.pl
 
-GEN_CMD_SRV = $(MAKEPROTOCOL) Server testprotocol.txt
-GEN_CMD_CLI = $(MAKEPROTOCOL) Client testprotocol.txt
+GEN_CMD = $(MAKEPROTOCOL) testprotocol.txt
 
 # AUTOGEN SEEDING
-autogen_TestProtocolServer.cpp: $(MAKEPROTOCOL) testprotocol.txt
-        $(_PERL) $(GEN_CMD_SRV)
+autogen_TestProtocol.cpp:       $(MAKEPROTOCOL) testprotocol.txt
+        $(_PERL) $(GEN_CMD)
 
 autogen_TestProtocolServer.h:   $(MAKEPROTOCOL) testprotocol.txt
-        $(_PERL) $(GEN_CMD_SRV)
+        $(_PERL) $(GEN_CMD)
 
-
-# AUTOGEN SEEDING
-autogen_TestProtocolClient.cpp: $(MAKEPROTOCOL) testprotocol.txt
-        $(_PERL) $(GEN_CMD_CLI)
-
-autogen_TestProtocolClient.h:   $(MAKEPROTOCOL) testprotocol.txt
-        $(_PERL) $(GEN_CMD_CLI)
-

box/trunk/test/basicserver/TestCommands.cpp

@@ -6 +6 @@
 #endif
 
-#include "autogen_TestProtocolServer.h"
+#include "autogen_TestProtocol.h"
 #include "CollectInBufferStream.h"
 
@@ -12 +12 @@
 
 
-std::auto_ptr<ProtocolObject> TestProtocolServerHello::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolHello::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
         if(mNumber32 != 41 || mNumber16 != 87 || mNumber8 != 11 || mText != "pingu")
         {
-                return std::auto_ptr<ProtocolObject>(new TestProtocolServerError(0, 0));
+                return std::auto_ptr<TestProtocolMessage>(new TestProtocolError(0, 0));
         }
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerHello(12,89,22,std::string("Hello world!")));
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolHello(12,89,22,std::string("Hello world!")));
 }
 
-std::auto_ptr<ProtocolObject> TestProtocolServerLists::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolLists::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerListsReply(mLotsOfText.size()));
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolListsReply(mLotsOfText.size()));
 }
 
-std::auto_ptr<ProtocolObject> TestProtocolServerQuit::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolQuit::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerQuit);
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolQuit);
 }
 
-std::auto_ptr<ProtocolObject> TestProtocolServerSimple::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolSimple::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerSimpleReply(mValue+1));
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolSimpleReply(mValue+1));
 }
 
@@ -46 +46 @@
 };
 
-std::auto_ptr<ProtocolObject> TestProtocolServerGetStream::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolGetStream::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
         // make a new stream object
@@ -69 +69 @@
         rProtocol.SendStreamAfterCommand(pstream);
 
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerGetStream(mStartingValue, mUncertainSize));
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolGetStream(mStartingValue, mUncertainSize));
 }
 
-std::auto_ptr<ProtocolObject> TestProtocolServerSendStream::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolSendStream::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
         if(mValue != 0x73654353298ffLL)
         {
-                return std::auto_ptr<ProtocolObject>(new TestProtocolServerError(0, 0));
+                return std::auto_ptr<TestProtocolMessage>(new TestProtocolError(0, 0));
         }
         
@@ -92 +92 @@
 
         // tell the caller how many bytes there were
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerGetStream(bytes, uncertain));
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolGetStream(bytes, uncertain));
 }
 
-std::auto_ptr<ProtocolObject> TestProtocolServerString::DoCommand(TestProtocolServer &rProtocol, TestContext &rContext)
+std::auto_ptr<TestProtocolMessage> TestProtocolString::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const
 {
-        return std::auto_ptr<ProtocolObject>(new TestProtocolServerString(mTest));
+        return std::auto_ptr<TestProtocolMessage>(new TestProtocolString(mTest));
 }
 

box/trunk/test/basicserver/testbasicserver.cpp

@@ -27 +27 @@
 
 #include "TestContext.h"
-#include "autogen_TestProtocolClient.h"
-#include "autogen_TestProtocolServer.h"
+#include "autogen_TestProtocol.h"
 #include "ServerControl.h"
 
@@ -394 +393 @@
 void TestStreamReceive(TestProtocolClient &protocol, int value, bool uncertainstream)
 {
-        std::auto_ptr<TestProtocolClientGetStream> reply(protocol.QueryGetStream(value, uncertainstream));
+        std::auto_ptr<TestProtocolGetStream> reply(protocol.QueryGetStream(value, uncertainstream));
         TEST_THAT(reply->GetStartingValue() == value);
         
@@ -705 +704 @@
                         // Simple query
                         {
-                                std::auto_ptr<TestProtocolClientSimpleReply> reply(protocol.QuerySimple(41));
+                                std::auto_ptr<TestProtocolSimpleReply> reply(protocol.QuerySimple(41));
                                 TEST_THAT(reply->GetValuePlusOne() == 42);
                         }
                         {
-                                std::auto_ptr<TestProtocolClientSimpleReply> reply(protocol.QuerySimple(809));
+                                std::auto_ptr<TestProtocolSimpleReply> reply(protocol.QuerySimple(809));
                                 TEST_THAT(reply->GetValuePlusOne() == 810);
                         }
@@ -725 +724 @@
                                 s.Write(buf, sizeof(buf));
                                 s.SetForReading();
-                                std::auto_ptr<TestProtocolClientGetStream> reply(protocol.QuerySendStream(0x73654353298ffLL, s));
+                                std::auto_ptr<TestProtocolGetStream> reply(protocol.QuerySendStream(0x73654353298ffLL, s));
                                 TEST_THAT(reply->GetStartingValue() == sizeof(buf));
                         }
@@ -732 +731 @@
                         for(int q = 0; q < 514; q++)
                         {
-                                std::auto_ptr<TestProtocolClientSimpleReply> reply(protocol.QuerySimple(q));
+                                std::auto_ptr<TestProtocolSimpleReply> reply(protocol.QuerySimple(q));
                                 TEST_THAT(reply->GetValuePlusOne() == (q+1));
                         }
@@ -741 +740 @@
                                 strings.push_back(std::string("test2"));
                                 strings.push_back(std::string("test3"));
-                                std::auto_ptr<TestProtocolClientListsReply> reply(protocol.QueryLists(strings));
+                                std::auto_ptr<TestProtocolListsReply> reply(protocol.QueryLists(strings));
                                 TEST_THAT(reply->GetNumberOfStrings() == 3);
                         }
@@ -747 +746 @@
                         // And another
                         {
-                                std::auto_ptr<TestProtocolClientHello> reply(protocol.QueryHello(41,87,11,std::string("pingu")));
+                                std::auto_ptr<TestProtocolHello> reply(protocol.QueryHello(41,87,11,std::string("pingu")));
                                 TEST_THAT(reply->GetNumber32() == 12);
                                 TEST_THAT(reply->GetNumber16() == 89);