Merge of viewer-development (3.4.1).

1 files changed, 125 insertions, 74 deletions

diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index f96f79006a..09343ef227 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llsecapi_test.cpp
  * @author Roxie
  * @date 2009-02-10
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -31,8 +31,8 @@
 #include "../llslurl.h"
 #include "../../llxml/llcontrol.h"
 #include "llsdserialize.h"
-//----------------------------------------------------------------------------               
-// Mock objects for the dependencies of the code we're testing                               
+//----------------------------------------------------------------------------
+// Mock objects for the dependencies of the code we're testing
 
 LLControlGroup::LLControlGroup(const std::string& name)
 : LLInstanceTracker<LLControlGroup, std::string>(name) {}
@@ -80,6 +80,39 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
 }
 
 LLControlGroup gSavedSettings("test");
+const char *gSampleGridFile =
+	"<?xml version=\"1.0\"?>"
+	"<llsd>"
+	"  <map>"
+	"    <key>foo.bar.com</key>"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://foobar/helpers/</string>"
+	"      <key>label</key><string>Foobar Grid</string>"
+	"      <key>login_page</key><string>foobar/loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>foobar/loginuri</string>"
+	"      </array>"
+	"      <key>keyname</key><string>foo.bar.com</string>"
+	"      <key>credential_type</key><string>agent</string>"
+	"      <key>grid_login_id</key><string>FooBar</string>"
+	"    </map>"
+	"    <key>my.grid.com</key>"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://mygrid/helpers/</string>"
+	"      <key>label</key><string>My Grid</string>"
+	"      <key>login_page</key><string>mygrid/loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>mygrid/loginuri</string>"
+	"      </array>"
+	"      <key>keyname</key><string>my.grid.com</string>"
+	"      <key>credential_type</key><string>agent</string>"
+	"      <key>grid_login_id</key><string>MyGrid</string>"
+	"    </map>"
+	"  </map>"
+	"</llsd>"
+	;
 
 // -------------------------------------------------------------------------------------------
 // TUT
@@ -90,171 +123,189 @@ namespace tut
 	struct slurlTest
 	{
 		slurlTest()
-		{	
+		{
 			LLGridManager::getInstance()->initialize(std::string(""));
 		}
 		~slurlTest()
 		{
 		}
 	};
-	
+
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<slurlTest> slurlTestFactory;
 	typedef slurlTestFactory::object slurlTestObject;
 	tut::slurlTestFactory tut_test("LLSlurl");
-	
+
 	// ---------------------------------------------------------------------------------------
-	// Test functions 
+	// Test functions
 	// ---------------------------------------------------------------------------------------
 	// construction from slurl string
 	template<> template<>
 	void slurlTestObject::test<1>()
 	{
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
+
+		LLGridManager::getInstance()->initialize("grid_test.xml");
+
 		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");
-		
+
 		LLSLURL slurl = LLSLURL("");
 		ensure_equals("null slurl", (int)slurl.getType(), LLSLURL::LAST_LOCATION);
-		
+
 		slurl = LLSLURL("http://slurl.com/secondlife/myregion");
 		ensure_equals("slurl.com slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("slurl.com slurl, region only", slurl.getSLURLString(), 
+		ensure_equals("slurl.com slurl, region only", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/128/128/0");
-		
+
 		slurl = LLSLURL("http://maps.secondlife.com/secondlife/myregion/1/2/3");
 		ensure_equals("maps.secondlife.com slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(), 
+		ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
 
 		slurl = LLSLURL("secondlife://myregion");
 		ensure_equals("secondlife: slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(), 
+		ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/128/128/0");
-		
+
 		slurl = LLSLURL("secondlife://myregion/1/2/3");
 		ensure_equals("secondlife: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("secondlife slurl, region + coords", slurl.getSLURLString(), 
+		ensure_equals("secondlife slurl, region + coords", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
-		
+
 		slurl = LLSLURL("/myregion");
 		ensure_equals("/region slurl, region- type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("/region slurl, region ", slurl.getSLURLString(), 
+		ensure_equals("/region slurl, region ", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/128/128/0");
-		
+
 		slurl = LLSLURL("/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(), 
-					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");	
-		
+		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(),
+					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
+
 		slurl = LLSLURL("my region/1/2/3");
 		ensure_equals(" slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" slurl, region + coords", slurl.getSLURLString(), 
-					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");	
-		
-		LLGridManager::getInstance()->setGridChoice("my.grid.com");		
+		ensure_equals(" slurl, region + coords", slurl.getSLURLString(),
+					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");
+
+		LLGridManager::getInstance()->setGridChoice("my.grid.com");
 		slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3");
 		ensure_equals("grid slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(), 
-					  "https://my.grid.com/region/my%20region/1/2/3");	
-		
+		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/1/2/3");
+
 		slurl = LLSLURL("https://my.grid.com/region/my region");
 		ensure_equals("grid slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(), 
+		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(),
 					  "https://my.grid.com/region/my%20region/128/128/0");
-		
-		LLGridManager::getInstance()->setGridChoice("foo.bar.com");		
+
+		LLGridManager::getInstance()->setGridChoice("foo.bar.com");
 		slurl = LLSLURL("/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(), 
-					  "https://foo.bar.com/region/myregion/1/2/3");		
-		
+		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(),
+					  "https://foo.bar.com/region/myregion/1/2/3");
+
 		slurl = LLSLURL("myregion/1/2/3");
 		ensure_equals(": slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" slurl, region + coords", slurl.getSLURLString(), 
-					  "https://foo.bar.com/region/myregion/1/2/3");		
-		
+		ensure_equals(" slurl, region + coords", slurl.getSLURLString(),
+					  "https://foo.bar.com/region/myregion/1/2/3");
+
 		slurl = LLSLURL(LLSLURL::SIM_LOCATION_HOME);
 		ensure_equals("home", slurl.getType(), LLSLURL::HOME_LOCATION);
 
 		slurl = LLSLURL(LLSLURL::SIM_LOCATION_LAST);
 		ensure_equals("last", slurl.getType(), LLSLURL::LAST_LOCATION);
-		
+
 		slurl = LLSLURL("secondlife:///app/foo/bar?12345");
-		ensure_equals("app", slurl.getType(), LLSLURL::APP);		
+		ensure_equals("app", slurl.getType(), LLSLURL::APP);
 		ensure_equals("appcmd", slurl.getAppCmd(), "foo");
 		ensure_equals("apppath", slurl.getAppPath().size(), 1);
 		ensure_equals("apppath2", slurl.getAppPath()[0].asString(), "bar");
 		ensure_equals("appquery", slurl.getAppQuery(), "12345");
-		ensure_equals("grid1", "foo.bar.com", slurl.getGrid());
-	
+		ensure_equals("grid1", slurl.getGrid(), "FooBar");
+
 		slurl = LLSLURL("secondlife://Aditi/app/foo/bar?12345");
-		ensure_equals("app", slurl.getType(), LLSLURL::APP);		
+		ensure_equals("app", slurl.getType(), LLSLURL::APP);
 		ensure_equals("appcmd", slurl.getAppCmd(), "foo");
 		ensure_equals("apppath", slurl.getAppPath().size(), 1);
 		ensure_equals("apppath2", slurl.getAppPath()[0].asString(), "bar");
 		ensure_equals("appquery", slurl.getAppQuery(), "12345");
-		ensure_equals("grid2", "util.aditi.lindenlab.com", slurl.getGrid());		
+		ensure_equals("grid2",  slurl.getGrid(), "Aditi");
 
-		LLGridManager::getInstance()->setGridChoice("foo.bar.com");			
+		LLGridManager::getInstance()->setGridChoice("foo.bar.com");
 		slurl = LLSLURL("secondlife:///secondlife/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("location", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("region" , "myregion", slurl.getRegion());
-		ensure_equals("grid3", "util.agni.lindenlab.com", slurl.getGrid());
-				
+		ensure_equals("grid3", slurl.getGrid(), "util.agni.lindenlab.com");
+
 		slurl = LLSLURL("secondlife://Aditi/secondlife/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("location", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("region" , "myregion", slurl.getRegion());
-		ensure_equals("grid4", "util.aditi.lindenlab.com", slurl.getGrid());		
-		
+		ensure_equals("grid4", slurl.getGrid(), "Aditi" );
+
 		LLGridManager::getInstance()->setGridChoice("my.grid.com");
 		slurl = LLSLURL("https://my.grid.com/app/foo/bar?12345");
-		ensure_equals("app", slurl.getType(), LLSLURL::APP);		
+		ensure_equals("app", slurl.getType(), LLSLURL::APP);
 		ensure_equals("appcmd", slurl.getAppCmd(), "foo");
 		ensure_equals("apppath", slurl.getAppPath().size(), 1);
 		ensure_equals("apppath2", slurl.getAppPath()[0].asString(), "bar");
-		ensure_equals("appquery", slurl.getAppQuery(), "12345");	
-		
+		ensure_equals("appquery", slurl.getAppQuery(), "12345");
+
 	}
-	
+
 	// construction from grid/region/vector combos
 	template<> template<>
 	void slurlTestObject::test<2>()
 	{
-		LLSLURL slurl = LLSLURL("mygrid.com", "my region");
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
+
+		LLGridManager::getInstance()->initialize("grid_test.xml");
+
+		LLSLURL slurl = LLSLURL("my.grid.com", "my region");
 		ensure_equals("grid/region - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("grid/region", slurl.getSLURLString(), 
-					  "https://mygrid.com/region/my%20region/128/128/0");	
-		
-		slurl = LLSLURL("mygrid.com", "my region", LLVector3(1,2,3));
+		ensure_equals("grid/region", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/128/128/0");
+
+		slurl = LLSLURL("my.grid.com", "my region", LLVector3(1,2,3));
 		ensure_equals("grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" grid/region/vector", slurl.getSLURLString(), 
-					  "https://mygrid.com/region/my%20region/1/2/3");			
+		ensure_equals(" grid/region/vector", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/1/2/3");
 
-		LLGridManager::getInstance()->setGridChoice("foo.bar.com.bar");			
+		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");
 		slurl = LLSLURL("my region", LLVector3(1,2,3));
-		ensure_equals("grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" grid/region/vector", slurl.getSLURLString(), 
-					  "https://foo.bar.com.bar/region/my%20region/1/2/3");	
-		
-		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");	
+		ensure_equals("default grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
+		ensure_equals(" default grid/region/vector", slurl.getSLURLString(),
+					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");
+
+		LLGridManager::getInstance()->setGridChoice("MyGrid");
 		slurl = LLSLURL("my region", LLVector3(1,2,3));
 		ensure_equals("default grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" default grid/region/vector", slurl.getSLURLString(), 
-					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");	
-		
+		ensure_equals(" default grid/region/vector", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/1/2/3");
+
 	}
 	// Accessors
 	template<> template<>
 	void slurlTestObject::test<3>()
 	{
-		LLGridManager::getInstance()->setGridChoice("my.grid.com");		
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
+
+		LLGridManager::getInstance()->initialize("grid_test.xml");
+
+		LLGridManager::getInstance()->setGridChoice("my.grid.com");
 		LLSLURL slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3");
 		ensure_equals("login string", slurl.getLoginString(), "uri:my region&amp;1&amp;2&amp;3");
 		ensure_equals("location string", slurl.getLocationString(), "my region/1/2/3");
 		ensure_equals("grid", slurl.getGrid(), "my.grid.com");
 		ensure_equals("region", slurl.getRegion(), "my region");
 		ensure_equals("position", slurl.getPosition(), LLVector3(1, 2, 3));
-		
+
 	}
 }