Organize connection code / Fix #1051

This commit is contained in:
fbraem 2015-12-08 18:37:41 +01:00
parent 0f7729cbb5
commit 0230ba6450
2 changed files with 34 additions and 104 deletions

View File

@ -30,46 +30,22 @@
using namespace Poco::MongoDB; using namespace Poco::MongoDB;
Poco::MongoDB::Connection::Ptr MongoDBTest::_mongo;
bool MongoDBTest::_connected = false;
Poco::MongoDB::Connection MongoDBTest::_mongo;
MongoDBTest::MongoDBTest(const std::string& name): MongoDBTest::MongoDBTest(const std::string& name):
CppUnit::TestCase("MongoDB"), CppUnit::TestCase("MongoDB")
_host("localhost"),
_port(27017)
{ {
if (!_connected)
{
try
{
_mongo.connect(_host, _port);
_connected = true;
std::cout << "Connected to [" << _host << ':' << _port << ']' << std::endl;
}
catch (Poco::Net::ConnectionRefusedException& e)
{
std::cout << "Couldn't connect to " << e.message() << ". " << std::endl;
}
}
} }
MongoDBTest::~MongoDBTest() MongoDBTest::~MongoDBTest()
{ {
if (_connected)
{
_mongo.disconnect();
_connected = false;
std::cout << "Disconnected from [" << _host << ':' << _port << ']' << std::endl;
}
} }
void MongoDBTest::setUp() void MongoDBTest::setUp()
{ {
} }
@ -80,12 +56,6 @@ void MongoDBTest::tearDown()
void MongoDBTest::testInsertRequest() void MongoDBTest::testInsertRequest()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::Document::Ptr player = new Poco::MongoDB::Document(); Poco::MongoDB::Document::Ptr player = new Poco::MongoDB::Document();
player->add("lastname", std::string("Braem")); player->add("lastname", std::string("Braem"));
player->add("firstname", std::string("Franky")); player->add("firstname", std::string("Franky"));
@ -105,24 +75,18 @@ void MongoDBTest::testInsertRequest()
Poco::MongoDB::InsertRequest request("team.players"); Poco::MongoDB::InsertRequest request("team.players");
request.documents().push_back(player); request.documents().push_back(player);
_mongo.sendRequest(request); _mongo->sendRequest(request);
} }
void MongoDBTest::testQueryRequest() void MongoDBTest::testQueryRequest()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::QueryRequest request("team.players"); Poco::MongoDB::QueryRequest request("team.players");
request.selector().add("lastname" , std::string("Braem")); request.selector().add("lastname" , std::string("Braem"));
request.setNumberToReturn(1); request.setNumberToReturn(1);
Poco::MongoDB::ResponseMessage response; Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(request, response); _mongo->sendRequest(request, response);
if ( response.documents().size() > 0 ) if ( response.documents().size() > 0 )
{ {
@ -158,18 +122,12 @@ void MongoDBTest::testQueryRequest()
void MongoDBTest::testDBQueryRequest() void MongoDBTest::testDBQueryRequest()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Database db("team"); Database db("team");
Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = db.createQueryRequest("players"); Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = db.createQueryRequest("players");
request->selector().add("lastname" , std::string("Braem")); request->selector().add("lastname" , std::string("Braem"));
Poco::MongoDB::ResponseMessage response; Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(*request, response); _mongo->sendRequest(*request, response);
if ( response.documents().size() > 0 ) if ( response.documents().size() > 0 )
{ {
@ -204,25 +162,19 @@ void MongoDBTest::testDBQueryRequest()
void MongoDBTest::testCountCommand() void MongoDBTest::testCountCommand()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::QueryRequest request("team.$cmd"); Poco::MongoDB::QueryRequest request("team.$cmd");
request.setNumberToReturn(1); request.setNumberToReturn(1);
request.selector().add("count", std::string("players")); request.selector().add("count", std::string("players"));
Poco::MongoDB::ResponseMessage response; Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(request, response); _mongo->sendRequest(request, response);
if ( response.documents().size() > 0 ) if ( response.documents().size() > 0 )
{ {
Poco::MongoDB::Document::Ptr doc = response.documents()[0]; Poco::MongoDB::Document::Ptr doc = response.documents()[0];
std::cout << doc->toString() << std::endl; std::cout << doc->toString() << std::endl;
int count = doc->get<int>("n"); double count = doc->get<double>("n");
assert(count == 1); assert(count == 1);
} }
else else
@ -234,22 +186,16 @@ void MongoDBTest::testCountCommand()
void MongoDBTest::testDBCountCommand() void MongoDBTest::testDBCountCommand()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::Database db("team"); Poco::MongoDB::Database db("team");
Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = db.createCountRequest("players"); Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = db.createCountRequest("players");
Poco::MongoDB::ResponseMessage response; Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(*request, response); _mongo->sendRequest(*request, response);
if ( response.documents().size() > 0 ) if ( response.documents().size() > 0 )
{ {
Poco::MongoDB::Document::Ptr doc = response.documents()[0]; Poco::MongoDB::Document::Ptr doc = response.documents()[0];
int count = doc->get<int>("n"); double count = doc->get<double>("n");
assert(count == 1); assert(count == 1);
} }
else else
@ -261,41 +207,23 @@ void MongoDBTest::testDBCountCommand()
void MongoDBTest::testDBCount2Command() void MongoDBTest::testDBCount2Command()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::Database db("team"); Poco::MongoDB::Database db("team");
Poco::Int64 count = db.count(_mongo, "players"); Poco::Int64 count = db.count(*_mongo, "players");
assert(count == 1); assert(count == 1);
} }
void MongoDBTest::testDeleteRequest() void MongoDBTest::testDeleteRequest()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::DeleteRequest request("team.players"); Poco::MongoDB::DeleteRequest request("team.players");
request.selector().add("lastname", std::string("Braem")); request.selector().add("lastname", std::string("Braem"));
_mongo.sendRequest(request); _mongo->sendRequest(request);
} }
void MongoDBTest::testCursorRequest() void MongoDBTest::testCursorRequest()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::Database db("team"); Poco::MongoDB::Database db("team");
Poco::SharedPtr<Poco::MongoDB::InsertRequest> insertRequest = db.createInsertRequest("numbers"); Poco::SharedPtr<Poco::MongoDB::InsertRequest> insertRequest = db.createInsertRequest("numbers");
for(int i = 0; i < 10000; ++i) for(int i = 0; i < 10000; ++i)
@ -304,22 +232,22 @@ void MongoDBTest::testCursorRequest()
doc->add("number", i); doc->add("number", i);
insertRequest->documents().push_back(doc); insertRequest->documents().push_back(doc);
} }
_mongo.sendRequest(*insertRequest); _mongo->sendRequest(*insertRequest);
Poco::Int64 count = db.count(_mongo, "numbers"); Poco::Int64 count = db.count(*_mongo, "numbers");
std::cout << "count= " << count << std::endl; std::cout << "count= " << count << std::endl;
assert(count == 10000); assert(count == 10000);
Poco::MongoDB::Cursor cursor("team", "numbers"); Poco::MongoDB::Cursor cursor("team", "numbers");
int n = 0; int n = 0;
Poco::MongoDB::ResponseMessage& response = cursor.next(_mongo); Poco::MongoDB::ResponseMessage& response = cursor.next(*_mongo);
while(1) while(1)
{ {
n += response.documents().size(); n += response.documents().size();
if ( response.cursorID() == 0 ) if ( response.cursorID() == 0 )
break; break;
response = cursor.next(_mongo); response = cursor.next(*_mongo);
} }
std::cout << "n= " << n << std::endl; std::cout << "n= " << n << std::endl;
assert(n == 10000); assert(n == 10000);
@ -329,7 +257,7 @@ void MongoDBTest::testCursorRequest()
drop.selector().add("drop", std::string("numbers")); drop.selector().add("drop", std::string("numbers"));
Poco::MongoDB::ResponseMessage responseDrop; Poco::MongoDB::ResponseMessage responseDrop;
_mongo.sendRequest(drop, responseDrop); _mongo->sendRequest(drop, responseDrop);
if ( responseDrop.documents().size() > 0 ) if ( responseDrop.documents().size() > 0 )
{ {
@ -340,12 +268,6 @@ void MongoDBTest::testCursorRequest()
void MongoDBTest::testBuildInfo() void MongoDBTest::testBuildInfo()
{ {
if (!_connected)
{
std::cout << "Not connected, test skipped." << std::endl;
return;
}
Poco::MongoDB::QueryRequest request("team.$cmd"); Poco::MongoDB::QueryRequest request("team.$cmd");
request.setNumberToReturn(1); request.setNumberToReturn(1);
request.selector().add("buildInfo", 1); request.selector().add("buildInfo", 1);
@ -354,7 +276,7 @@ void MongoDBTest::testBuildInfo()
try try
{ {
_mongo.sendRequest(request, response); _mongo->sendRequest(request, response);
} }
catch(Poco::NotImplementedException& nie) catch(Poco::NotImplementedException& nie)
{ {
@ -376,7 +298,7 @@ void MongoDBTest::testBuildInfo()
void MongoDBTest::testConnectionPool() void MongoDBTest::testConnectionPool()
{ {
Poco::Net::SocketAddress sa(_host, _port); Poco::Net::SocketAddress sa("localhost", 27017);
Poco::PoolableObjectFactory<Poco::MongoDB::Connection, Poco::MongoDB::Connection::Ptr> factory(sa); Poco::PoolableObjectFactory<Poco::MongoDB::Connection, Poco::MongoDB::Connection::Ptr> factory(sa);
Poco::ObjectPool<Poco::MongoDB::Connection, Poco::MongoDB::Connection::Ptr> pool(factory, 10, 15); Poco::ObjectPool<Poco::MongoDB::Connection, Poco::MongoDB::Connection::Ptr> pool(factory, 10, 15);
@ -392,7 +314,7 @@ void MongoDBTest::testConnectionPool()
if ( response.documents().size() > 0 ) if ( response.documents().size() > 0 )
{ {
Poco::MongoDB::Document::Ptr doc = response.documents()[0]; Poco::MongoDB::Document::Ptr doc = response.documents()[0];
int count = doc->get<int>("n"); double count = doc->get<double>("n");
assert(count == 1); assert(count == 1);
} }
else else
@ -419,7 +341,7 @@ void MongoDBTest::testCommand() {
.add("size", 1024); .add("size", 1024);
Poco::MongoDB::ResponseMessage response; Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(*command, response); _mongo->sendRequest(*command, response);
if ( response.documents().size() > 0 ) if ( response.documents().size() > 0 )
{ {
Poco::MongoDB::Document::Ptr doc = response.documents()[0]; Poco::MongoDB::Document::Ptr doc = response.documents()[0];
@ -427,7 +349,7 @@ void MongoDBTest::testCommand() {
} }
else else
{ {
Poco::MongoDB::Document::Ptr lastError = db.getLastErrorDoc(_mongo); Poco::MongoDB::Document::Ptr lastError = db.getLastErrorDoc(*_mongo);
std::cout << "LastError: " << lastError->toString(2) << std::endl; std::cout << "LastError: " << lastError->toString(2) << std::endl;
fail("Didn't get a response from the command"); fail("Didn't get a response from the command");
} }
@ -435,6 +357,17 @@ void MongoDBTest::testCommand() {
CppUnit::Test* MongoDBTest::suite() CppUnit::Test* MongoDBTest::suite()
{ {
try
{
_mongo = new Poco::MongoDB::Connection("localhost", 27017);
std::cout << "Connected to [localhost:27017]" << std::endl;
}
catch (Poco::Net::ConnectionRefusedException& e)
{
std::cout << "Couldn't connect to " << e.message() << ". " << std::endl;
return 0;
}
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MongoDBTest"); CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MongoDBTest");
CppUnit_addTest(pSuite, MongoDBTest, testInsertRequest); CppUnit_addTest(pSuite, MongoDBTest, testInsertRequest);

View File

@ -49,10 +49,7 @@ public:
private: private:
std::string _host; static Poco::MongoDB::Connection::Ptr _mongo;
unsigned _port;
static bool _connected;
static Poco::MongoDB::Connection _mongo;
}; };