diff options
Diffstat (limited to 'test/basicserver/testbasicserver.cpp')
| -rw-r--r-- | test/basicserver/testbasicserver.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/test/basicserver/testbasicserver.cpp b/test/basicserver/testbasicserver.cpp index ebf77979..976bdd92 100644 --- a/test/basicserver/testbasicserver.cpp +++ b/test/basicserver/testbasicserver.cpp @@ -26,12 +26,7 @@ #include "CollectInBufferStream.h" #include "TestContext.h" -<<<<<<< HEAD -#include "autogen_TestProtocolClient.h" -#include "autogen_TestProtocolServer.h" -======= #include "autogen_TestProtocol.h" ->>>>>>> 0.12 #include "ServerControl.h" #include "MemLeakFindOn.h" @@ -335,13 +330,8 @@ void Srv2TestConversations(const std::vector<IOStream *> &conns) bool hadTimeout = false; while(!getline[c]->GetLine(rep, false, COMMS_READ_TIMEOUT)) hadTimeout = true; -<<<<<<< HEAD - TEST_THAT(rep == recieve[q]); - TEST_THAT(hadTimeout) -======= TEST_EQUAL_LINE(rep, recieve[q], "Line " << q); TEST_LINE(hadTimeout, "Line " << q) ->>>>>>> 0.12 } } for(unsigned int c = 0; c < conns.size(); ++c) @@ -402,11 +392,7 @@ void Srv2TestConversations(const std::vector<IOStream *> &conns) void TestStreamReceive(TestProtocolClient &protocol, int value, bool uncertainstream) { -<<<<<<< HEAD - std::auto_ptr<TestProtocolClientGetStream> reply(protocol.QueryGetStream(value, uncertainstream)); -======= std::auto_ptr<TestProtocolGetStream> reply(protocol.QueryGetStream(value, uncertainstream)); ->>>>>>> 0.12 TEST_THAT(reply->GetStartingValue() == value); // Get a stream @@ -717,19 +703,11 @@ int test(int argc, const char *argv[]) // Simple query { -<<<<<<< HEAD - std::auto_ptr<TestProtocolClientSimpleReply> reply(protocol.QuerySimple(41)); - TEST_THAT(reply->GetValuePlusOne() == 42); - } - { - std::auto_ptr<TestProtocolClientSimpleReply> reply(protocol.QuerySimple(809)); -======= std::auto_ptr<TestProtocolSimpleReply> reply(protocol.QuerySimple(41)); TEST_THAT(reply->GetValuePlusOne() == 42); } { std::auto_ptr<TestProtocolSimpleReply> reply(protocol.QuerySimple(809)); ->>>>>>> 0.12 TEST_THAT(reply->GetValuePlusOne() == 810); } @@ -745,22 +723,14 @@ int test(int argc, const char *argv[]) char buf[1663]; s.Write(buf, sizeof(buf)); s.SetForReading(); -<<<<<<< HEAD - std::auto_ptr<TestProtocolClientGetStream> reply(protocol.QuerySendStream(0x73654353298ffLL, s)); -======= std::auto_ptr<TestProtocolGetStream> reply(protocol.QuerySendStream(0x73654353298ffLL, s)); ->>>>>>> 0.12 TEST_THAT(reply->GetStartingValue() == sizeof(buf)); } // Lots of simple queries for(int q = 0; q < 514; q++) { -<<<<<<< HEAD - std::auto_ptr<TestProtocolClientSimpleReply> reply(protocol.QuerySimple(q)); -======= std::auto_ptr<TestProtocolSimpleReply> reply(protocol.QuerySimple(q)); ->>>>>>> 0.12 TEST_THAT(reply->GetValuePlusOne() == (q+1)); } // Send a list of strings to it @@ -769,21 +739,13 @@ int test(int argc, const char *argv[]) strings.push_back(std::string("test1")); strings.push_back(std::string("test2")); strings.push_back(std::string("test3")); -<<<<<<< HEAD - std::auto_ptr<TestProtocolClientListsReply> reply(protocol.QueryLists(strings)); -======= std::auto_ptr<TestProtocolListsReply> reply(protocol.QueryLists(strings)); ->>>>>>> 0.12 TEST_THAT(reply->GetNumberOfStrings() == 3); } // And another { -<<<<<<< HEAD - 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"))); ->>>>>>> 0.12 TEST_THAT(reply->GetNumber32() == 12); TEST_THAT(reply->GetNumber16() == 89); TEST_THAT(reply->GetNumber8() == 22); |