summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-05-19 15:58:56 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-05-19 15:58:56 -0700
commitac17ec0c287246dbb00d21a6b4994949eac69737 (patch)
tree3da999db2b63dbaa74a8c7ce2572e3f17df454dd /indra/newview/tests
parent77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff)
parent61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff)
Merge pull from dessie/viewer-public
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/llviewernetwork_test.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 025b570be2..d819b44564 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -143,7 +143,7 @@ namespace tut
manager->initialize("grid_test.xml");
// validate that some of the defaults are available.
std::map<std::string, std::string> known_grids = manager->getKnownGrids();
- ensure_equals("Known grids is a string-string map of size 18", known_grids.size(), 18);
+ ensure_equals("Known grids is a string-string map of size 23", known_grids.size(), 23);
ensure_equals("Agni has the right name and label",
known_grids[std::string("util.agni.lindenlab.com")], std::string("Agni"));
ensure_equals("None exists", known_grids[""], "None");
@@ -184,7 +184,7 @@ namespace tut
LLGridManager::getInstance()->initialize("grid_test.xml");
std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
ensure_equals("adding a grid via a grid file increases known grid size",
- known_grids.size(), 19);
+ known_grids.size(), 24);
ensure_equals("Agni is still there after we've added a grid via a grid file",
known_grids["util.agni.lindenlab.com"], std::string("Agni"));
@@ -250,7 +250,7 @@ namespace tut
// with single login uri specified.
std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
ensure_equals("adding a command line grid increases known grid size",
- known_grids.size(), 19);
+ known_grids.size(), 24);
ensure_equals("Command line grid is added to the list of grids",
known_grids["my.login.uri"], std::string("my.login.uri"));
LLSD grid = LLGridManager::getInstance()->getGridInfo("my.login.uri");
@@ -279,7 +279,7 @@ namespace tut
LLGridManager::getInstance()->initialize("grid_test.xml");
known_grids = LLGridManager::getInstance()->getKnownGrids();
ensure_equals("adding a command line grid with custom name increases known grid size",
- known_grids.size(), 19);
+ known_grids.size(), 24);
ensure_equals("Custom Command line grid is added to the list of grids",
known_grids["mycustomgridchoice"], std::string("mycustomgridchoice"));
grid = LLGridManager::getInstance()->getGridInfo("mycustomgridchoice");