Merge branch 'master' into DRTVWR-522-maint

1 files changed, 34 insertions, 0 deletions

diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 3c34fd269e..4a4fdb72e3 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -903,4 +903,38 @@ namespace tut
 				  "and even no www something lindenlab.com",
 				  "");
 	}
+
+	template<> template<>
+	void object::test<16>()
+	{
+		//
+		// test LLUrlEntryIPv6
+		//
+		LLUrlEntryIPv6 url;
+
+		// Regex tests.
+		testRegex("match urls with a protocol", url,
+			"this url should match http://[::1]",
+			"http://[::1]");
+
+		testRegex("match urls with a protocol and query", url,
+			"this url should match http://[::1]/file.mp3",
+			"http://[::1]/file.mp3");
+
+		testRegex("match urls with a protocol", url,
+			"this url should match http://[2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d]",
+			"http://[2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d]");
+
+		testRegex("match urls with port", url,
+			"let's specify some port http://[2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d]:8080",
+			"http://[2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d]:8080");
+
+		testRegex("don't match urls w/o protocol", url,
+			"looks like an url something [2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d] but no https prefix",
+			"");
+
+		testRegex("don't match incorrect urls", url,
+			"http://[ 2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d ]",
+			"");
+	}
 }