Merge remote-tracking branch 'pocoproject@github/develop' into develop

Foundation/include/Poco/ListMap.h

@@ -140,19 +140,8 @@ public:
 		/// Returns iterator pointing to the newly inserted value 
 	{
 		Iterator it = find(val.first);
-
-		if (it == _list.end())
-		{
-			_list.push_back(val);
-			it = _list.end();
-			--it;
-		}
-		else
-		{
-			_list.insert(it, 1, val);
-		}
-
-		return it;
+		while (it != _list.end() && isEqual(it->first, val.first)) ++it;
+		return _list.insert(it, val);
 	}
 	
 	void erase(Iterator it)

Foundation/src/Thread_POSIX.cpp

@@ -76,7 +76,7 @@ void setThreadName(pthread_t thread, const std::string& threadName)
 #if (POCO_OS == POCO_OS_MAC_OS_X)
 	pthread_setname_np(threadName.c_str()); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2)
 #else
-	if (pthread_setname_np(thread, threadName.c_str()) != 0 && errno == ERANGE && threadName.size() > 15)
+	if (pthread_setname_np(thread, threadName.c_str()) == ERANGE && threadName.size() > 15)
 	{
 		std::string truncName(threadName, 0, 7);
 		truncName.append("~");

MongoDB/include/Poco/MongoDB/Element.h

@@ -27,6 +27,7 @@
 #include "Poco/Nullable.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/DateTimeFormatter.h"
+#include "Poco/UTF8String.h"
 #include "Poco/MongoDB/MongoDB.h"
 #include "Poco/MongoDB/BSONReader.h"
 #include "Poco/MongoDB/BSONWriter.h"
@@ -79,7 +80,7 @@ inline std::string Element::name() const
 typedef std::list<Element::Ptr> ElementSet;
 
 
-template<typename T> 
+template<typename T>
 struct ElementTraits
 {
 };
@@ -109,51 +110,11 @@ struct ElementTraits<std::string>
 
 	static std::string toString(const std::string& value, int indent = 0)
 	{
-		std::ostringstream oss;
-
-		oss << '"';
-
-		for(std::string::const_iterator it = value.begin(); it != value.end(); ++it)
-		{
-			switch (*it)
-			{
-			case '"':
-				oss << "\\\"";
-				break;
-			case '\\':
-				oss << "\\\\";
-				break;
-			case '\b':
-				oss << "\\b";
-				break;
-			case '\f':
-				oss << "\\f";
-				break;
-			case '\n':
-				oss << "\\n";
-				break;
-			case '\r':
-				oss << "\\r";
-				break;
-			case '\t':
-				oss << "\\t";
-				break;
-			default:
-				{
-					if ( *it > 0 && *it <= 0x1F )
-					{
-						oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*it);
-					}
-					else
-					{
-						oss << *it;
-					}
-					break;
-				}
-			}
-		}
-		oss << '"';
-		return oss.str();
+		std::string result;
+		result.append(1, '"');
+		result.append(UTF8::escape(value));
+		result.append(1, '"');
+		return result;
 	}
 };
 
@@ -231,7 +192,11 @@ struct ElementTraits<Timestamp>
 
 	static std::string toString(const Timestamp& value, int indent = 0)
 	{
-		return DateTimeFormatter::format(value, "%Y-%m-%dT%H:%M:%s%z");
+		std::string result;
+		result.append(1, '"');
+		result.append(DateTimeFormatter::format(value, "%Y-%m-%dT%H:%M:%s%z"));
+		result.append(1, '"');
+		return result;
 	}
 };
 
@@ -308,7 +273,7 @@ public:
 	{
 	}
 
-	
+
 	T value() const
 	{
 		return _value;
@@ -320,7 +285,7 @@ public:
 		return ElementTraits<T>::toString(_value, indent);
 	}
 
-	
+
 	int type() const
 	{
 		return ElementTraits<T>::TypeId;

MongoDB/testsuite/src/MongoDBTest.cpp

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

MongoDB/testsuite/src/MongoDBTest.h

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

Net/testsuite/src/HTMLFormTest.cpp

@@ -163,6 +163,29 @@ void HTMLFormTest::testReadUrlGET()
 }
 
 
+void HTMLFormTest::testReadUrlGETMultiple()
+{
+	HTTPRequest req("GET", "/form.cgi?field1=value1&field1=value%202&field1=value%3D3&field1=value%264");
+	HTMLForm form(req);
+	assert (form.size() == 4);
+	
+	HTMLForm::ConstIterator it = form.find("field1");
+	assert (it != form.end());
+	assert (it->first == "field1" && it->second == "value1");
+	++it;
+	assert (it != form.end());
+	assert (it->first == "field1" && it->second == "value 2");
+	++it;
+	assert (it != form.end());
+	assert (it->first == "field1" && it->second == "value=3");
+	++it;
+	assert (it != form.end());
+	assert (it->first == "field1" && it->second == "value&4");
+	++it;
+	assert (it == form.end());
+}
+
+
 void HTMLFormTest::testReadUrlPOST()
 {
 	HTTPRequest req("POST", "/form.cgi?field0=value0");
@@ -295,6 +318,21 @@ void HTMLFormTest::testSubmit3()
 }
 
 
+void HTMLFormTest::testSubmit4()
+{
+	HTMLForm form;
+	form.add("field1", "value1");
+	form.add("field1", "value 2");
+	form.add("field1", "value=3");
+	form.add("field1", "value&4");
+	
+	HTTPRequest req("GET", "/form.cgi");
+	form.prepareSubmit(req);
+
+	assert (req.getURI() == "/form.cgi?field1=value1&field1=value%202&field1=value%3D3&field1=value%264");
+}
+
+
 void HTMLFormTest::testFieldLimitUrl()
 {
 	HTTPRequest req("GET", "/form.cgi?field1=value1&field2=value%202&field3=value%3D3&field4=value%264");
@@ -371,6 +409,7 @@ CppUnit::Test* HTMLFormTest::suite()
 	CppUnit_addTest(pSuite, HTMLFormTest, testWriteUrl);
 	CppUnit_addTest(pSuite, HTMLFormTest, testWriteMultipart);
 	CppUnit_addTest(pSuite, HTMLFormTest, testReadUrlGET);
+	CppUnit_addTest(pSuite, HTMLFormTest, testReadUrlGETMultiple);
 	CppUnit_addTest(pSuite, HTMLFormTest, testReadUrlPOST);
 	CppUnit_addTest(pSuite, HTMLFormTest, testReadUrlPUT);
 	CppUnit_addTest(pSuite, HTMLFormTest, testReadUrlBOM);
@@ -378,6 +417,7 @@ CppUnit::Test* HTMLFormTest::suite()
 	CppUnit_addTest(pSuite, HTMLFormTest, testSubmit1);
 	CppUnit_addTest(pSuite, HTMLFormTest, testSubmit2);
 	CppUnit_addTest(pSuite, HTMLFormTest, testSubmit3);
+	CppUnit_addTest(pSuite, HTMLFormTest, testSubmit4);
 	CppUnit_addTest(pSuite, HTMLFormTest, testFieldLimitUrl);
 	CppUnit_addTest(pSuite, HTMLFormTest, testFieldLimitMultipart);
 

Net/testsuite/src/HTMLFormTest.h

@@ -29,6 +29,7 @@ public:
 	void testWriteUrl();
 	void testWriteMultipart();
 	void testReadUrlGET();
+	void testReadUrlGETMultiple();
 	void testReadUrlPOST();
 	void testReadUrlPUT();
 	void testReadUrlBOM();
@@ -36,6 +37,7 @@ public:
 	void testSubmit1();
 	void testSubmit2();
 	void testSubmit3();
+	void testSubmit4();
 	void testFieldLimitUrl();
 	void testFieldLimitMultipart();