Test code updates
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664823 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/cpp/src/TestServer.cc b/test/cpp/src/TestServer.cc
index db41b79..34c9dfb 100644
--- a/test/cpp/src/TestServer.cc
+++ b/test/cpp/src/TestServer.cc
@@ -3,6 +3,7 @@
#include <protocol/TBinaryProtocol.h>
#include <server/TSimpleServer.h>
#include <server/TThreadPoolServer.h>
+#include <server/TNonblockingServer.h>
#include <transport/TServerSocket.h>
#include <transport/TBufferedTransportFactory.h>
#include "ThriftTest.h"
@@ -96,9 +97,9 @@
return thing;
}
- list<int32_t> testList(list<int32_t> thing) {
+ vector<int32_t> testList(vector<int32_t> thing) {
printf("testList({");
- list<int32_t>::const_iterator l_iter;
+ vector<int32_t>::const_iterator l_iter;
bool first = true;
for (l_iter = thing.begin(); l_iter != thing.end(); ++l_iter) {
if (first) {
@@ -192,8 +193,8 @@
}
printf("}, ");
- list<Xtruct> xtructs = i2_iter->second.xtructs;
- list<Xtruct>::const_iterator x;
+ vector<Xtruct> xtructs = i2_iter->second.xtructs;
+ vector<Xtruct>::const_iterator x;
printf("{");
for (x = xtructs.begin(); x != xtructs.end(); ++x) {
printf("{\"%s\", %d, %d, %ld}, ", x->string_thing.c_str(), (int)x->byte_thing, x->i32_thing, x->i64_thing);
@@ -302,6 +303,7 @@
serverType = args["server-type"];
if (serverType == "simple") {
} else if (serverType == "thread-pool") {
+ } else if (serverType == "nonblocking") {
} else {
throw invalid_argument("Unknown server type "+serverType);
}
@@ -375,6 +377,15 @@
printf("Starting the server on port %d...\n", port);
threadPoolServer.serve();
+
+ } else if (serverType == "nonblocking") {
+
+ TNonblockingServer nonblockingServer(testProcessor,
+ serverOptions,
+ port);
+ printf("Starting the nonblocking server on port %d...\n", port);
+ nonblockingServer.serve();
+
}
printf("done.\n");