summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-03 12:48:40 -0800
committerJames Cook <james@lindenlab.com>2010-02-03 12:48:40 -0800
commitd489216b6ef41f0d22f3a9062ba6daacc67bc038 (patch)
tree6888acece9d8cbdc358170a4ab69478e09c545d9 /indra/llui/tests
parent146e9d5e4d9a9a4f33d9ccd47a901980972b7ab9 (diff)
Moved LLUrlEntryAgent back into llui library in prep for merge
Diffstat (limited to 'indra/llui/tests')
-rw-r--r--indra/llui/tests/llurlentry_test.cpp36
1 files changed, 17 insertions, 19 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 9200708784..30b59859d3 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -266,30 +266,28 @@ namespace tut
//
// test LLUrlEntryAgent - secondlife://app/agent Urls
//
- // IDEVO - moved temporarily into newview, not available for test
- //LLUrlEntryAgent url;
- //boost::regex r = url.getPattern();
-
- //testRegex("Invalid Agent Url", r,
- // "secondlife:///app/agent/0e346d8b-4433-4d66-XXXX-fd37083abc4c/about",
- // "");
+ LLUrlEntryAgent url;
+ boost::regex r = url.getPattern();
- //testRegex("Agent Url ", r,
- // "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about",
- // "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
+ testRegex("Invalid Agent Url", r,
+ "secondlife:///app/agent/0e346d8b-4433-4d66-XXXX-fd37083abc4c/about",
+ "");
- //testRegex("Agent Url in text", r,
- // "XXX secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about XXX",
- // "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
+ testRegex("Agent Url ", r,
+ "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about",
+ "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
- //testRegex("Agent Url multicase", r,
- // "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About XXX",
- // "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About");
+ testRegex("Agent Url in text", r,
+ "XXX secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about XXX",
+ "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
- //testRegex("Agent Url alternate command", r,
- // "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar",
- // "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar");
+ testRegex("Agent Url multicase", r,
+ "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About XXX",
+ "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About");
+ testRegex("Agent Url alternate command", r,
+ "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar",
+ "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar");
}
template<> template<>