diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
| commit | e7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch) | |
| tree | 9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/llui/tests | |
| parent | 34fe371bfdeb6fc83818c58660c038c372c0f64a (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
Merge VR
Diffstat (limited to 'indra/llui/tests')
| -rwxr-xr-x | indra/llui/tests/llurlentry_test.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 544f50d15d..50f8b948e0 100755 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -838,17 +838,21 @@ namespace tut "search something https://marketplace.secondlife.com/products/search on marketplace and test the https", "https://marketplace.secondlife.com/products/search"); - testRegex("match urls with port", url, - "let's specify some port http://secondlife.com:888/status", - "http://secondlife.com:888/status"); + testRegex("match HTTPS urls with port", url, + "let's specify some port https://secondlife.com:888/status", + "https://secondlife.com:888/status"); + + testRegex("don't match HTTP urls with port", url, + "let's specify some port for HTTP http://secondlife.com:888/status", + ""); testRegex("don't match urls w/o protocol", url, "looks like an url something www.marketplace.secondlife.com/products but no https prefix", ""); testRegex("but with a protocol www is fine", url, - "so let's add a protocol http://www.marketplace.secondlife.com:8888/products", - "http://www.marketplace.secondlife.com:8888/products"); + "so let's add a protocol https://www.marketplace.secondlife.com:8888/products", + "https://www.marketplace.secondlife.com:8888/products"); testRegex("don't match urls w/o protocol", url, "and even no www something secondlife.com/status", |