diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-26 18:07:34 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-26 18:07:34 +0200 |
| commit | cf53c157fe46eb02568101a51c43a41ee2a4cd18 (patch) | |
| tree | 5d3b9af45f887cf60156832906a23aa589991484 /indra/llui/tests | |
| parent | b0b8d34b15350f44d76f253e6b69f1c4e8ad7f33 (diff) | |
| parent | 7ea4303aa25960a3aa0971999725a0ca1bcfdec4 (diff) | |
Merge
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 96e94c0f80..dde54c78c4 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", |