svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

3 files changed, 418 insertions, 0 deletions

diff --git a/indra/test/llassetuploadqueue_tut.cpp b/indra/test/llassetuploadqueue_tut.cpp
new file mode 100644
index 0000000000..7c4b8a0c9c
--- /dev/null
+++ b/indra/test/llassetuploadqueue_tut.cpp
@@ -0,0 +1,178 @@
+/** 
+ * @file asset_upload_queue_tut.cpp
+ * @brief Tests for newview/llassetuploadqueue.cpp
+ * Copyright (c) 2007, Linden Research, Inc.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "lltut.h"
+
+#include "mock_http_client.h"
+#include "../newview/llassetuploadqueue.cpp"
+
+// Mock implementation.
+LLAssetUploadResponder::LLAssetUploadResponder(const LLSD& post_data,
+											   const LLUUID& vfile_id,
+											   LLAssetType::EType asset_type)
+{
+}
+
+LLAssetUploadResponder::LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name)
+{
+}
+
+LLAssetUploadResponder::~LLAssetUploadResponder()
+{
+}
+
+void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
+{
+}
+
+void LLAssetUploadResponder::result(const LLSD& content)
+{
+}
+
+void LLAssetUploadResponder::uploadUpload(const LLSD& content)
+{
+}
+
+void LLAssetUploadResponder::uploadComplete(const LLSD& content)
+{
+}
+
+void LLAssetUploadResponder::uploadFailure(const LLSD& content)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const LLUUID& vfile_id,
+															   LLAssetType::EType asset_type) :
+	LLAssetUploadResponder(post_data, vfile_id, asset_type)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const std::string& file_name) :
+	LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const std::string& file_name,
+															   const LLUUID& queue_id) :
+	LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
+{
+}
+
+namespace tut
+{
+	class asset_upload_queue_test_data : public MockHttpClient {};
+	typedef test_group<asset_upload_queue_test_data> asset_upload_queue_test;
+	typedef asset_upload_queue_test::object asset_upload_queue_object;
+	tut::asset_upload_queue_test asset_upload_queue("asset_upload_queue");
+
+	void queue(LLAssetUploadQueue& q, const std::string& filename)
+	{
+		LLUUID task_id;
+		LLUUID item_id;
+		BOOL is_running = FALSE; 
+		BOOL is_target_mono = TRUE; 
+		LLUUID queue_id;
+		q.queue(filename, task_id, item_id, is_running, is_target_mono, queue_id);
+	}
+
+	class LLTestSupplier : public LLAssetUploadQueueSupplier
+	{
+	public:
+
+		void set(LLAssetUploadQueue* queue) {mQueue = queue;}
+		
+		virtual LLAssetUploadQueue* get() const
+			{
+				return mQueue;
+			}
+
+	private:
+		LLAssetUploadQueue* mQueue;  
+	};
+
+	template<> template<>
+	void asset_upload_queue_object::test<1>()
+	{
+		setupTheServer();
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/success", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<2>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/error", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<3>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/timeout", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<4>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/success", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		queue(q, "baz.bar");
+		ensure("upload queue empty before request", !q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<5>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/success", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		runThePump(10);
+		ensure("upload queue not empty before request", q.isEmpty());
+		queue(q, "baz.bar");
+		ensure("upload queue not empty after request", q.isEmpty());
+		runThePump(10);
+		killServer();
+	}
+}
diff --git a/indra/test/mock_http_client.cpp b/indra/test/mock_http_client.cpp
new file mode 100644
index 0000000000..6b273ee7b5
--- /dev/null
+++ b/indra/test/mock_http_client.cpp
@@ -0,0 +1,66 @@
+/** 
+ * @file mock_http_client.cpp
+ * @brief Framework for testing HTTP requests
+ * Copyright (c) 2007, Linden Research, Inc.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "llsdhttpserver.h"
+#include "lliohttpserver.h"
+
+namespace tut
+{
+	class SuccessNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+	   	{ 
+	   		LLSD result;
+			result["state"] = "complete";
+	   		result["test"] = "test";
+	   		r->result(result);
+	   	}
+		void post(ResponsePtr r, const LLSD& context, const LLSD& input) const
+		{
+			LLSD result;
+			result["state"] = "complete";
+			result["test"] = "test";
+			r->result(result);
+		}
+	};
+
+	class ErrorNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+			{ r->status(599, "Intentional error"); }
+		void post(ResponsePtr r, const LLSD& context, const LLSD& input) const
+			{ r->status(input["status"], input["reason"]); }
+	};
+
+	class TimeOutNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+		{
+            /* do nothing, the request will eventually time out */ 
+		}
+	};
+
+	LLSD storage;
+	
+	class LLSDStorageNode : public LLHTTPNode
+	{
+	public:
+		LLSD get() const{ return storage; }
+		LLSD put(const LLSD& value) const{ storage = value; return LLSD(); }
+	};
+
+	LLHTTPRegistration<LLSDStorageNode> gStorageNode("/test/storage");
+	LLHTTPRegistration<SuccessNode>		gSuccessNode("/test/success");
+	LLHTTPRegistration<ErrorNode>		gErrorNode("/test/error");
+	LLHTTPRegistration<TimeOutNode>		gTimeOutNode("/test/timeout");
+}
diff --git a/indra/test/mock_http_client.h b/indra/test/mock_http_client.h
new file mode 100644
index 0000000000..6476ea3783
--- /dev/null
+++ b/indra/test/mock_http_client.h
@@ -0,0 +1,174 @@
+/** 
+ * @file mock_http_client.cpp
+ * @brief Framework for testing HTTP requests
+ * Copyright (c) 2007, Linden Research, Inc.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * $/LicenseInfo$
+ */
+
+#include "llsdhttpserver.h"
+#include "lliohttpserver.h"
+#include "llhttpclient.h"
+#include "llformat.h"
+#include "llpipeutil.h"
+#include "llpumpio.h"
+
+namespace tut
+{
+	struct MockHttpClient
+	{
+	public:
+		MockHttpClient()
+		{
+			apr_pool_create(&mPool, NULL);
+			mServerPump = new LLPumpIO(mPool);
+			mClientPump = new LLPumpIO(mPool);
+			
+			LLHTTPClient::setPump(*mClientPump);
+		}
+		
+		~MockHttpClient()
+		{
+			delete mServerPump;
+			delete mClientPump;
+			apr_pool_destroy(mPool);
+		}
+
+		void setupTheServer()
+		{
+			LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888);
+
+			LLHTTPStandardServices::useServices();
+			LLHTTPRegistrar::buildAllServices(root);
+		}
+		
+		void runThePump(float timeout = 100.0f)
+		{
+			LLTimer timer;
+			timer.setTimerExpirySec(timeout);
+
+			while(!mSawCompleted && !timer.hasExpired())
+			{
+				if (mServerPump)
+				{
+					mServerPump->pump();
+					mServerPump->callback();
+				}
+				if (mClientPump)
+				{
+					mClientPump->pump();
+					mClientPump->callback();
+				}
+			}
+		}
+
+		void killServer()
+		{
+			delete mServerPump;
+			mServerPump = NULL;
+		}
+	
+	private:
+		apr_pool_t* mPool;
+		LLPumpIO* mServerPump;
+		LLPumpIO* mClientPump;
+
+		
+	protected:
+		void ensureStatusOK()
+		{
+			if (mSawError)
+			{
+				std::string msg =
+					llformat("error() called when not expected, status %d",
+						mStatus); 
+				fail(msg);
+			}
+		}
+	
+		void ensureStatusError()
+		{
+			if (!mSawError)
+			{
+				fail("error() wasn't called");
+			}
+		}
+		
+		LLSD getResult()
+		{
+			return mResult;
+		}
+	
+	protected:
+		bool mSawError;
+		U32 mStatus;
+		std::string mReason;
+		bool mSawCompleted;
+		LLSD mResult;
+		bool mResultDeleted;
+
+		class Result : public LLHTTPClient::Responder
+		{
+		protected:
+			Result(MockHttpClient& client)
+				: mClient(client)
+			{
+			}
+		
+		public:
+			static boost::intrusive_ptr<Result> build(MockHttpClient& client)
+			{
+				return boost::intrusive_ptr<Result>(new Result(client));
+			}
+			
+			~Result()
+			{
+				mClient.mResultDeleted = true;
+			}
+			
+			virtual void error(U32 status, const std::string& reason)
+			{
+				mClient.mSawError = true;
+				mClient.mStatus = status;
+				mClient.mReason = reason;
+			}
+
+			virtual void result(const LLSD& content)
+			{
+				mClient.mResult = content;
+			}
+
+			virtual void completed(
+							U32 status, const std::string& reason,
+							const LLSD& content)
+			{
+				LLHTTPClient::Responder::completed(status, reason, content);
+				
+				mClient.mSawCompleted = true;
+			}
+
+		private:
+			MockHttpClient& mClient;
+		};
+
+		friend class Result;
+
+	protected:
+
+		void reset()
+		{
+			mSawError = false;
+			mStatus = 0;
+			mSawCompleted = false;
+			mResult.clear();
+			mResultDeleted = false;
+		}
+
+		LLHTTPClient::ResponderPtr newResult()
+		{
+			reset();
+			return Result::build(*this);
+		}
+	};
+}