merge from http://hg.secondlife.com/viewer-development

5 files changed, 272 insertions, 12 deletions

diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
index 99b346cff8..47353962e1 100644
--- a/indra/newview/tests/lldateutil_test.cpp
+++ b/indra/newview/tests/lldateutil_test.cpp
@@ -183,4 +183,14 @@ namespace tut
 			LLDateUtil::ageFromDate("12/13/2009", now),
 			"3 weeks old" );
 	}
+
+	//template<> template<>
+	//void dateutil_object_t::test<6>()
+	//{
+	//	set_test_name("ISO dates");
+	//	LLDate now(std::string("2010-01-04T12:00:00Z"));
+	//	ensure_equals("days",
+	//		LLDateUtil::ageFromDateISO("2009-12-13", now),
+	//		"3 weeks old" );
+	//}
 }
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index db50b89620..309e9e9ee3 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -48,6 +48,9 @@ const std::string VIEWERLOGIN_GRIDLABEL("viewerlogin_grid");
 
 const std::string APPVIEWER_SERIALNUMBER("appviewer_serialno");
 
+const std::string VIEWERLOGIN_CHANNEL("invalid_channel");
+const std::string VIEWERLOGIN_VERSION_CHANNEL("invalid_version");
+
 // Link seams.
 
 //-----------------------------------------------------------------------------
@@ -160,7 +163,6 @@ std::string LLGridManager::getAppSLURLBase(const std::string& grid_name)
 //-----------------------------------------------------------------------------
 #include "../llviewercontrol.h"
 LLControlGroup gSavedSettings("Global");
-std::string gCurrentVersion = "invalid_version";
 
 LLControlGroup::LLControlGroup(const std::string& name) :
 	LLInstanceTracker<LLControlGroup, std::string>(name){}
@@ -177,6 +179,10 @@ BOOL LLControlGroup::declareString(const std::string& name, const std::string &i
 #include "lluicolortable.h"
 void LLUIColorTable::saveUserSettings(void)const {}
 
+//-----------------------------------------------------------------------------
+#include "../llversioninfo.h"
+const std::string &LLVersionInfo::getChannelAndVersion() { return VIEWERLOGIN_VERSION_CHANNEL; }
+const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; }
 
 //-----------------------------------------------------------------------------
 #include "llnotifications.h"
@@ -290,7 +296,6 @@ namespace tut
 			gSavedSettings.declareBOOL("UseDebugMenus", FALSE, "", FALSE);
 			gSavedSettings.declareBOOL("ForceMandatoryUpdate", FALSE, "", FALSE);
 			gSavedSettings.declareString("ClientSettingsFile", "test_settings.xml", "", FALSE);
-			gSavedSettings.declareString("VersionChannelName", "test_version_string", "", FALSE);
 			gSavedSettings.declareString("NextLoginLocation", "", "", FALSE);
 			gSavedSettings.declareBOOL("LoginLastLocation", FALSE, "", FALSE);
 
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp
new file mode 100644
index 0000000000..a6c1f69c82
--- /dev/null
+++ b/indra/newview/tests/llremoteparcelrequest_test.cpp
@@ -0,0 +1,134 @@
+/** 

+ * @file llremoteparcelrequest_test.cpp

+ * @author Brad Kittenbrink <brad@lindenlab.com>

+ *

+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ * 

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ * 

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ * 

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ * 

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#include "linden_common.h"

+

+#include "../test/lltut.h"

+

+#include "../llremoteparcelrequest.h"

+

+#include "../llagent.h"

+#include "message.h"

+

+namespace {

+	LLControlGroup s_saved_settings("dummy_settings");

+	const LLUUID TEST_PARCEL_ID("11111111-1111-1111-1111-111111111111");

+}

+

+LLCurl::Responder::Responder() { }

+LLCurl::Responder::~Responder() { }

+void LLCurl::Responder::error(U32,std::string const &) { }

+void LLCurl::Responder::result(LLSD const &) { }

+void LLCurl::Responder::errorWithContent(U32 status,std::string const &,LLSD const &) { }

+void LLCurl::Responder::completedRaw(U32 status, std::string const &, LLChannelDescriptors const &,boost::shared_ptr<LLBufferArray> const &) { }

+void LLCurl::Responder::completed(U32 status, std::string const &, LLSD const &) { }

+void LLCurl::Responder::completedHeader(U32 status, std::string const &, LLSD const &) { }

+void LLMessageSystem::getF32(char const *,char const *,F32 &,S32) { }

+void LLMessageSystem::getU8(char const *,char const *,U8 &,S32) { }

+void LLMessageSystem::getS32(char const *,char const *,S32 &,S32) { }

+void LLMessageSystem::getString(char const *,char const *, std::string &,S32) { }

+void LLMessageSystem::getUUID(char const *,char const *, LLUUID & out_id,S32)

+{

+	out_id = TEST_PARCEL_ID;

+}

+void LLMessageSystem::nextBlock(char const *) { }

+void LLMessageSystem::addUUID(char const *,LLUUID const &) { }

+void LLMessageSystem::addUUIDFast(char const *,LLUUID const &) { }

+void LLMessageSystem::nextBlockFast(char const *) { }

+void LLMessageSystem::newMessage(char const *) { }

+LLMessageSystem * gMessageSystem;

+char * _PREHASH_AgentID;

+char * _PREHASH_AgentData;

+LLAgent gAgent;

+LLAgent::LLAgent() : mAgentAccess(s_saved_settings) { }

+LLAgent::~LLAgent() { }

+void LLAgent::sendReliableMessage(void) { }

+LLUUID gAgentSessionID;

+LLUUID gAgentID;

+LLUIColor::LLUIColor(void) { }

+LLAgentAccess::LLAgentAccess(LLControlGroup & settings) : mSavedSettings(settings) { }

+LLControlGroup::LLControlGroup(std::string const & name) : LLInstanceTracker<LLControlGroup, std::string>(name) { }

+LLControlGroup::~LLControlGroup(void) { }

+

+namespace tut

+{

+	struct TestObserver : public LLRemoteParcelInfoObserver {

+		TestObserver() : mProcessed(false) { }

+

+		virtual void processParcelInfo(const LLParcelData& parcel_data)

+		{

+			mProcessed = true;

+		}

+

+		virtual void setParcelID(const LLUUID& parcel_id) { }

+

+		virtual void setErrorStatus(U32 status, const std::string& reason) { }

+

+		bool mProcessed;

+	};

+

+    struct RemoteParcelRequestData

+    {

+		RemoteParcelRequestData()

+		{

+		}

+    };

+    

+	typedef test_group<RemoteParcelRequestData> remoteparcelrequest_t;

+	typedef remoteparcelrequest_t::object remoteparcelrequest_object_t;

+	tut::remoteparcelrequest_t tut_remoteparcelrequest("LLRemoteParcelRequest");

+

+	template<> template<>

+	void remoteparcelrequest_object_t::test<1>()

+	{

+		set_test_name("observer pointer");

+

+		boost::scoped_ptr<TestObserver> observer(new TestObserver());

+

+		LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();

+		processor.addObserver(LLUUID(TEST_PARCEL_ID), observer.get());

+

+		processor.processParcelInfoReply(gMessageSystem, NULL);

+

+		ensure(observer->mProcessed);

+	}

+

+	template<> template<>

+	void remoteparcelrequest_object_t::test<2>()

+	{

+		set_test_name("CHOP-220: dangling observer pointer");

+

+		LLRemoteParcelInfoObserver * observer = new TestObserver();

+

+		LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();

+		processor.addObserver(LLUUID(TEST_PARCEL_ID), observer);

+

+		delete observer;

+		observer = NULL;

+

+		processor.processParcelInfoReply(gMessageSystem, NULL);

+	}

+}

diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
new file mode 100644
index 0000000000..398d8f16ed
--- /dev/null
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -0,0 +1,114 @@
+/** 
+ * @file llversioninfo_test.cpp
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "../test/lltut.h"
+
+#include "../llversioninfo.h"
+#include "llversionviewer.h"
+
+namespace tut
+{
+    struct versioninfo
+    {
+		versioninfo()
+			: mResetChannel("Reset Channel")
+		{
+			std::ostringstream stream;
+			stream << LL_VERSION_MAJOR << "."
+				   << LL_VERSION_MINOR << "."
+				   << LL_VERSION_PATCH << "."
+				   << LL_VERSION_BUILD;
+			mVersion = stream.str();
+			stream.str("");
+
+			stream << LL_VERSION_MAJOR << "."
+				   << LL_VERSION_MINOR << "."
+				   << LL_VERSION_PATCH;
+			mShortVersion = stream.str();
+			stream.str("");
+
+			stream << LL_CHANNEL
+				   << " "
+				   << mVersion;
+			mVersionAndChannel = stream.str();
+			stream.str("");
+
+			stream << mResetChannel
+				   << " "
+				   << mVersion;
+			mResetVersionAndChannel = stream.str();
+		}
+		std::string mResetChannel;
+		std::string mVersion;
+		std::string mShortVersion;
+		std::string mVersionAndChannel;
+		std::string mResetVersionAndChannel;
+    };
+    
+	typedef test_group<versioninfo> versioninfo_t;
+	typedef versioninfo_t::object versioninfo_object_t;
+	tut::versioninfo_t tut_versioninfo("LLVersionInfo");
+
+	template<> template<>
+	void versioninfo_object_t::test<1>()
+	{
+		ensure_equals("Major version", 
+					  LLVersionInfo::getMajor(), 
+					  LL_VERSION_MAJOR);
+		ensure_equals("Minor version", 
+					  LLVersionInfo::getMinor(), 
+					  LL_VERSION_MINOR);
+		ensure_equals("Patch version", 
+					  LLVersionInfo::getPatch(), 
+					  LL_VERSION_PATCH);
+		ensure_equals("Build version", 
+					  LLVersionInfo::getBuild(), 
+					  LL_VERSION_BUILD);
+		ensure_equals("Channel version", 
+					  LLVersionInfo::getChannel(), 
+					  LL_CHANNEL);
+
+		ensure_equals("Version String", 
+					  LLVersionInfo::getVersion(), 
+					  mVersion);
+		ensure_equals("Short Version String", 
+					  LLVersionInfo::getShortVersion(), 
+					  mShortVersion);
+		ensure_equals("Version and channel String", 
+					  LLVersionInfo::getChannelAndVersion(), 
+					  mVersionAndChannel);
+
+		LLVersionInfo::resetChannel(mResetChannel);
+		ensure_equals("Reset channel version", 
+					  LLVersionInfo::getChannel(), 
+					  mResetChannel);
+
+		ensure_equals("Reset Version and channel String", 
+					  LLVersionInfo::getChannelAndVersion(), 
+					  mResetVersionAndChannel);
+	}
+}
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index a0f1d1c3c3..b425b50c8b 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -72,16 +72,13 @@ static void substitute_string(std::string &input, const std::string &search, con
 	}
 }
 
-class LLAgent
-{
-public:
-	LLAgent() {}
-	~LLAgent() {}
-#ifdef __GNUC__
-	__attribute__ ((noinline))
-#endif
-	bool isGodlike() const { return FALSE; }
-};
+#include "../llagent.h"
+LLAgent::LLAgent() : mAgentAccess(gSavedSettings) { }
+LLAgent::~LLAgent() { }
+bool LLAgent::isGodlike() const { return FALSE; }
+LLAgentAccess::LLAgentAccess(LLControlGroup& settings) : mSavedSettings(settings) { }
+LLUIColor::LLUIColor() {}
+
 LLAgent gAgent;
 
 std::string LLWeb::expandURLSubstitutions(const std::string &url,