DEV-41405 convert llxfer test to a llmessage integration test.

3 files changed, 65 insertions, 1 deletions

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index a8a3d4254e..9c2b412a9b 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -242,4 +242,5 @@ LL_ADD_INTEGRATION_TEST(
   )
 
 LL_ADD_INTEGRATION_TEST(llhost "" "${test_libs}")
+LL_ADD_INTEGRATION_TEST(llxfer_file "" "${test_libs}")
 
diff --git a/indra/llmessage/tests/llxfer_file_test.cpp b/indra/llmessage/tests/llxfer_file_test.cpp
new file mode 100644
index 0000000000..59bf1a01bb
--- /dev/null
+++ b/indra/llmessage/tests/llxfer_file_test.cpp
@@ -0,0 +1,64 @@
+/** 
+ * @file llxfer_test.cpp
+ * @author Moss
+ * @date 2007-04-17
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "../llxfer_file.h"
+
+#include "../test/lltut.h"
+
+namespace tut
+{
+	struct llxfer_data
+	{
+	};
+	typedef test_group<llxfer_data> llxfer_test;
+	typedef llxfer_test::object llxfer_object;
+	tut::llxfer_test llxfer("llxfer");
+
+	template<> template<>
+	void llxfer_object::test<1>()
+	{
+		// test that we handle an oversized filename correctly.
+		std::string oversized_filename;
+		U32 i;
+		for (i=0; i<LL_MAX_PATH*2; ++i) // create oversized filename
+		{
+			oversized_filename += 'X';
+		}
+
+		LLXfer_File xff(oversized_filename, FALSE, 1);
+		ensure("oversized local_filename nul-terminated",
+		       xff.getFileName().length() < LL_MAX_PATH);
+	}
+}
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index c26a2fb682..4ace1c9df8 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -54,7 +54,6 @@ set(test_SOURCE_FILES
     lltranscode_tut.cpp
     lltut.cpp
     lluuidhashmap_tut.cpp
-    llxfer_tut.cpp
     message_tut.cpp
     test.cpp
     )