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

1 files changed, 178 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();
+	}
+}