Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.

Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry

1 files changed, 159 insertions, 0 deletions

diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
new file mode 100644
index 0000000000..30e39a3bcf
--- /dev/null
+++ b/indra/newview/tests/lldateutil_test.cpp
@@ -0,0 +1,159 @@
+/** 
+ * @file lldateutil_test.cpp
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-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 "../test/lltut.h"
+
+#include "../lldateutil.h"
+
+#include "lldate.h"
+#include "llstring.h"	// LLStringUtil::format()
+#include "lltrans.h"
+#include "llui.h"
+
+#include <map>
+
+
+// Baked-in return values for getString()
+std::map< std::string, std::string > gString;
+
+// Baked-in return values for getCountString()
+// map of pairs of input xml_desc and integer count
+typedef std::pair< std::string, int > count_string_t;
+std::map< count_string_t, std::string > gCountString;
+
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+{
+	std::string text = gString[xml_desc];
+	LLStringUtil::format(text, args);
+	return text;
+}
+
+std::string LLTrans::getCountString(const std::string& language, const std::string& xml_desc, S32 count)
+{
+	return gCountString[ count_string_t(xml_desc, count) ];
+}
+
+std::string LLUI::getLanguage()
+{
+	return "en";
+}
+
+namespace tut
+{
+    struct dateutil
+    {
+		// Hard-code a "now" date so unit test doesn't change with
+		// current time.  Because server strings are in Pacific time
+		// roll this forward 8 hours to compensate.  This represents
+		// 2009-12-31T00:00:00Z UTC.
+		dateutil()
+			:	mNow(std::string("2009-12-31T08:00:00Z"))
+		{
+			// copied from strings.xml
+			gString["YearsMonthsOld"] = "[AGEYEARS] [AGEMONTHS] old";
+			gString["YearsOld"] = "[AGEYEARS] old";
+			gString["MonthsOld"] = "[AGEMONTHS] old";
+			gString["WeeksOld"] = "[AGEWEEKS] old";
+			gString["DaysOld"] = "[AGEDAYS] old";
+			gString["TodayOld"] = "Joined today";
+
+			gCountString[ count_string_t("AgeYears", 1) ]  = "1 year";
+			gCountString[ count_string_t("AgeYears", 2) ]  = "2 years";
+			gCountString[ count_string_t("AgeMonths", 1) ] = "1 month";
+			gCountString[ count_string_t("AgeMonths", 2) ] = "2 months";
+			gCountString[ count_string_t("AgeWeeks", 1) ]  = "1 week";
+			gCountString[ count_string_t("AgeWeeks", 2) ]  = "2 weeks";
+			gCountString[ count_string_t("AgeDays", 1) ]   = "1 day";
+			gCountString[ count_string_t("AgeDays", 2) ]   = "2 days";
+		}
+		LLDate mNow;
+    };
+    
+	typedef test_group<dateutil> dateutil_t;
+	typedef dateutil_t::object dateutil_object_t;
+	tut::dateutil_t tut_dateutil("dateutil");
+
+	template<> template<>
+	void dateutil_object_t::test<1>()
+	{
+		set_test_name("Years");
+		ensure_equals("years + months",
+			LLDateUtil::ageFromDate("10/30/2007", mNow),
+			"2 years 2 months old" );
+		ensure_equals("years",
+			LLDateUtil::ageFromDate("12/31/2007", mNow),
+			"2 years old" );
+		ensure_equals("single year",
+			LLDateUtil::ageFromDate("12/31/2008", mNow),
+			"1 year old" );
+		ensure_equals("single year + a bit",
+			LLDateUtil::ageFromDate("12/12/2008", mNow),
+			"1 year old" );
+    }
+
+	template<> template<>
+	void dateutil_object_t::test<2>()
+	{
+		set_test_name("Months");
+		ensure_equals("months",
+			LLDateUtil::ageFromDate("10/30/2009", mNow),
+			"2 months old" );
+		ensure_equals("single month",
+			LLDateUtil::ageFromDate("11/30/2009", mNow),
+			"1 month old" );
+	}
+
+	template<> template<>
+	void dateutil_object_t::test<3>()
+	{
+		set_test_name("Weeks");
+		ensure_equals("weeks",
+			LLDateUtil::ageFromDate("12/17/2009", mNow),
+			"2 weeks old" );
+		ensure_equals("single week",
+			LLDateUtil::ageFromDate("12/24/2009", mNow),
+			"1 week old" );
+	}
+
+	template<> template<>
+	void dateutil_object_t::test<4>()
+	{
+		set_test_name("Days");
+		ensure_equals("days",
+			LLDateUtil::ageFromDate("12/29/2009", mNow),
+			"2 days old" );
+		ensure_equals("single day",
+			LLDateUtil::ageFromDate("12/30/2009", mNow),
+			"1 day old" );
+		ensure_equals("today",
+			LLDateUtil::ageFromDate("12/31/2009", mNow),
+			"Joined today" );
+	}
+}