修复所有test

1.RpcClient.cc由于callback没有注册上导致无法回调
2.MessageField.cc由于index加1导致test fail了

Cpp/Platform/Orm/MessageFieldTest.cc

@@ -174,7 +174,7 @@ TEST_F(MessageFieldTest, GetField_FieldIsMessage)
 TEST_F(MessageFieldTest, SetField_FieldIsBool)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getBoolean(7))
+	EXPECT_CALL(*resultSetMock, getBoolean(8))
 		.WillOnce(Return(true))
 		.WillOnce(Return(false));
 	Person person;
@@ -193,7 +193,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsBool)
 TEST_F(MessageFieldTest, SetField_FieldIsDouble)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getDouble(5))
+	EXPECT_CALL(*resultSetMock, getDouble(6))
 		.WillOnce(Return(1.00))
 		.WillOnce(Return(12345.6789));
 	Person person;
@@ -212,7 +212,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsDouble)
 TEST_F(MessageFieldTest, SetField_FieldIsInt32)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getInt(1))
+	EXPECT_CALL(*resultSetMock, getInt(2))
 		.WillOnce(Return(1))
 		.WillOnce(Return(0xFFFFFFFF));
 	Person person;
@@ -231,7 +231,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsInt32)
 TEST_F(MessageFieldTest, SetField_FieldIsInt64)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getInt64(0))
+	EXPECT_CALL(*resultSetMock, getInt64(1))
 		.WillOnce(Return(1))
 		.WillOnce(Return(0xFFFFFFFFFFFFFFFF));
 	Person person;
@@ -250,7 +250,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsInt64)
 TEST_F(MessageFieldTest, SetField_FieldIsUInt32)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getUInt(2))
+	EXPECT_CALL(*resultSetMock, getUInt(3))
 		.WillOnce(Return(1))
 		.WillOnce(Return(0xFFFFFFFF));
 	Person person;
@@ -269,7 +269,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsUInt32)
 TEST_F(MessageFieldTest, SetField_FieldIsUInt64)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getUInt64(3))
+	EXPECT_CALL(*resultSetMock, getUInt64(4))
 		.WillOnce(Return(1))
 		.WillOnce(Return(0xFFFFFFFFFFFFFFFF));
 	Person person;
@@ -288,7 +288,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsUInt64)
 TEST_F(MessageFieldTest, SetField_FieldIsString)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getString(4))
+	EXPECT_CALL(*resultSetMock, getString(5))
 		.WillOnce(Return("1"))
 		.WillOnce(Return("tanghai"));
 	Person person;
@@ -307,7 +307,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsString)
 TEST_F(MessageFieldTest, SetField_FieldIsBytes)
 {
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getString(6))
+	EXPECT_CALL(*resultSetMock, getString(7))
 		.WillOnce(Return("1"))
 		.WillOnce(Return("tanghai is a good student"));
 	Person person;
@@ -328,7 +328,7 @@ TEST_F(MessageFieldTest, SetField_FieldIsMessage)
 	std::istringstream is;
 	is.str("id: 123 name: \"pen\"");
 	ResultSetMockPtr resultSetMock = make_shared<ResultSetMock>();
-	EXPECT_CALL(*resultSetMock, getBlob(8))
+	EXPECT_CALL(*resultSetMock, getBlob(9))
 		.WillOnce(Return(&is));
 	Person person;
 	const google::protobuf::Descriptor* descriptor = person.GetDescriptor();

Cpp/Platform/Rpc/RpcClient.cc

@@ -3,6 +3,7 @@
 #include <boost/make_shared.hpp>
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>
+#include <glog/logging.h>
 #include "Rpc/RpcCommunicator.h"
 #include "Rpc/RpcClient.h"
 #include "Rpc/RequestHandler.h"
@@ -69,7 +70,7 @@ void RpcClient::CallMethod(
 		google::protobuf::Message* response,
 		google::protobuf::Closure* done)
 {
-	if (!done)
+	if (done)
 	{
 		RequestHandlerPtr request_handler = boost::make_shared<RequestHandler>(response, done);
 		requestHandlers[++id] = request_handler;

Cpp/Platform/Rpc/RpcServerTest.cc

@@ -84,7 +84,7 @@ TEST_F(RpcServerTest, ClientAndServer)
 	// server和client分别在两个不同的线程
 	threadPool.schedule(boost::bind(&IOServiceRun, &ioServer));
 	// 等待server OK
-	boost::this_thread::sleep(boost::posix_time::milliseconds(10000));
+	boost::this_thread::sleep(boost::posix_time::milliseconds(100));
 	threadPool.schedule(boost::bind(&IOServiceRun, &ioClient));
 
 	CountBarrier barrier;