summaryrefslogtreecommitdiff
path: root/indra/llprimitive/tests/llmediaentry_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llprimitive/tests/llmediaentry_test.cpp')
-rw-r--r--indra/llprimitive/tests/llmediaentry_test.cpp210
1 files changed, 105 insertions, 105 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index b072ce3964..e8f40d1ffd 100644
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -1,27 +1,27 @@
-/**
+/**
* @file llmediaentry_test.cpp
* @brief llmediaentry unit tests
*
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
+ * $/LicenseInfo$
*/
#include "linden_common.h"
@@ -154,7 +154,7 @@ namespace tut
defaultMediaEntryStr = DEFAULT_MEDIA_ENTRY;
std::istringstream d(DEFAULT_MEDIA_ENTRY);
LLSDSerialize::fromXML(defaultMediaEntryLLSD, d);
- }
+ }
std::string emptyMediaEntryStr;
LLSD emptyMediaEntryLLSD;
std::string defaultMediaEntryStr;
@@ -164,7 +164,7 @@ namespace tut
typedef test_group<MediaEntry_test, 55> factory;
typedef factory::object object;
}
-
+
namespace
{
@@ -211,7 +211,7 @@ namespace tut
void whitelist_test(int num, bool enable, const char *whitelist, const char *candidate_url, bool expected_pass)
{
- std::string message = "Whitelist test " + boost::lexical_cast<std::string>(num);
+ std::string message = "Whitelist test " + std::to_string(num);
LLMediaEntry entry;
entry.setWhiteListEnable(enable);
set_whitelist(entry, whitelist);
@@ -237,18 +237,18 @@ namespace tut
whitelist_test(num, true, whitelist, candidate_url, true);
}
- template<> template<>
- void object::test<1>()
- {
- set_test_name("Test LLMediaEntry Instantiation");
- LLMediaEntry entry;
+ template<> template<>
+ void object::test<1>()
+ {
+ set_test_name("Test LLMediaEntry Instantiation");
+ LLMediaEntry entry;
ensure_llsd_equals(get_test_name() + " failed", defaultMediaEntryLLSD, entry.asLLSD());
- }
+ }
- template<> template<>
- void object::test<2>()
- {
- set_test_name("Test LLMediaEntry Instantiation from LLSD");
+ template<> template<>
+ void object::test<2>()
+ {
+ set_test_name("Test LLMediaEntry Instantiation from LLSD");
LLMediaEntry entry;
LLSD sd;
entry.fromLLSD(sd);
@@ -275,33 +275,33 @@ namespace tut
set_test_name("Test LLMediaEntry::asLLSD()");
LLMediaEntry entry;
LLSD sd;
- // Put some cruft in the LLSD
+ // Put some cruft in the LLSD
sd[LLMediaEntry::CURRENT_URL_KEY] = "http://www.example.com";
- LLSD whitelist;
- whitelist.append("*.example.com");
+ LLSD whitelist;
+ whitelist.append("*.example.com");
sd[LLMediaEntry::WHITELIST_KEY] = whitelist;
entry.asLLSD(sd);
ensure_llsd_equals(get_test_name() + " failed", defaultMediaEntryLLSD, sd);
}
-
+
template<> template<>
void object::test<5>()
{
set_test_name("Test LLMediaEntry::asLLSD() -> LLMediaEntry::fromLLSD()");
LLMediaEntry entry1, entry2;
- // Add a whitelist to entry2
- std::vector<std::string> whitelist;
- whitelist.push_back("*.example.com");
+ // Add a whitelist to entry2
+ std::vector<std::string> whitelist;
+ whitelist.push_back("*.example.com");
entry2.setWhiteList(whitelist);
- // Render entry1 (which has no whitelist) as an LLSD
+ // Render entry1 (which has no whitelist) as an LLSD
LLSD sd;
- entry1.asLLSD(sd);
- // "read" that LLSD into entry 2
- entry2.fromLLSD(sd);
+ entry1.asLLSD(sd);
+ // "read" that LLSD into entry 2
+ entry2.fromLLSD(sd);
ensure_llsd_equals(get_test_name() + " failed", defaultMediaEntryLLSD, entry2.asLLSD());
}
-
+
// limit tests
const char *URL_OK = "http://www.example.com";
const char *URL_TOO_BIG = "http://www.example.com.qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq";
@@ -315,7 +315,7 @@ namespace tut
ensure(get_test_name() + " ok failed", status == LSL_STATUS_OK);
status = entry.setCurrentURL(URL_TOO_BIG);
ensure(get_test_name() + " ok failed", status == LSL_STATUS_BOUNDS_ERROR);
- }
+ }
template<> template<>
void object::test<7>()
@@ -332,7 +332,7 @@ namespace tut
void object::test<8>()
{
set_test_name("Test Limits on setting whitelist");
-
+
// Test a valid list
LLMediaEntry entry;
std::vector<std::string> whitelist;
@@ -346,7 +346,7 @@ namespace tut
void object::test<9>()
{
set_test_name("Test Limits on setting whitelist too big");
-
+
// Test an invalid list
LLMediaEntry entry;
std::vector<std::string> whitelist, empty;
@@ -361,7 +361,7 @@ namespace tut
void object::test<10>()
{
set_test_name("Test Limits on setting whitelist too many");
-
+
// Test an invalid list
LLMediaEntry entry;
std::vector<std::string> whitelist, empty;
@@ -377,7 +377,7 @@ namespace tut
void object::test<11>()
{
set_test_name("Test to make sure both setWhiteList() functions behave the same");
-
+
// Test a valid list
std::vector<std::string> whitelist, empty;
LLSD whitelist_llsd;
@@ -387,10 +387,10 @@ namespace tut
ensure(get_test_name() + " setWhiteList(s) don't match",
entry1.setWhiteList(whitelist) == LSL_STATUS_OK &&
entry2.setWhiteList(whitelist_llsd)== LSL_STATUS_OK );
- ensure(get_test_name() + " failed",
+ ensure(get_test_name() + " failed",
entry1.getWhiteList() == entry2.getWhiteList());
}
-
+
template<> template<>
void object::test<12>()
{
@@ -407,7 +407,7 @@ namespace tut
ensure(get_test_name() + " setWhiteList(s) don't match",
entry1.setWhiteList(whitelist) == LSL_STATUS_BOUNDS_ERROR &&
entry2.setWhiteList(whitelist_llsd) == LSL_STATUS_BOUNDS_ERROR);
- ensure(get_test_name() + " failed",
+ ensure(get_test_name() + " failed",
empty == entry1.getWhiteList() &&
empty == entry2.getWhiteList());
}
@@ -425,78 +425,78 @@ namespace tut
whitelist_llsd.append("Q");
}
LLMediaEntry entry1, entry2;
- ensure(get_test_name() + " invalid result",
+ ensure(get_test_name() + " invalid result",
entry1.setWhiteList(whitelist) == LSL_STATUS_BOUNDS_ERROR &&
entry2.setWhiteList(whitelist_llsd) == LSL_STATUS_BOUNDS_ERROR);
- ensure(get_test_name() + " failed",
+ ensure(get_test_name() + " failed",
empty == entry1.getWhiteList() &&
empty == entry2.getWhiteList());
}
-
+
template<> template<>
- void object::test<14>()
- {
- // Whitelist check tests
- int n=0;
-
- // Check the "empty whitelist" case
- whitelist_test(++n, "", "http://www.example.com", true);
-
- // Check the "missing scheme" case
- whitelist_test(++n, "www.example.com", "http://www.example.com", true);
-
- // Check the "exactly the same" case
- whitelist_test(++n, "http://example.com", "http://example.com", true);
-
- // Check the enable flag
- whitelist_test(++n, false, "www.example.com", "http://www.secondlife.com", true);
- whitelist_test(++n, true, "www.example.com", "http://www.secondlife.com", false);
-
- // Check permutations of trailing slash:
- whitelist_test(++n, "http://www.example.com", "http://www.example.com/", true);
- whitelist_test(++n, "http://www.example.com/", "http://www.example.com/", true);
- whitelist_test(++n, "http://www.example.com/", "http://www.example.com", false);
- whitelist_test(++n, "http://www.example.com", "http://www.example.com/foobar", true);
- whitelist_test(++n, "http://www.example.com/", "http://www.example.com/foobar", false);
-
-
- // More cases...
- whitelist_test(++n, "http://example.com", "http://example.com/wiki", true);
- whitelist_test(++n, "www.example.com", "http://www.example.com/help", true);
- whitelist_test(++n, "http://www.example.com", "http://wwwexample.com", false);
- whitelist_test(++n, "http://www.example.com", "http://www.example.com/wiki", true);
- whitelist_test(++n, "example.com", "http://wwwexample.com", false);
- whitelist_test(++n, "http://www.example.com/", "http://www.amazon.com/wiki", false);
- whitelist_test(++n, "www.example.com", "http://www.amazon.com", false);
-
- // regexp cases
- whitelist_test(++n, "*.example.com", "http://www.example.com", true);
- whitelist_test(++n, "*.example.com", "http://www.amazon.com", false);
- whitelist_test(++n, "*.example.com", "http://www.example.com/foo/bar", true);
- whitelist_test(++n, "*.example.com", "http:/example.com/foo/bar", false);
- whitelist_test(++n, "*example.com", "http://example.com/foo/bar", true);
- whitelist_test(++n, "*example.com", "http://my.virus.com/foo/bar?example.com", false);
- whitelist_test(++n, "example.com", "http://my.virus.com/foo/bar?example.com", false);
- whitelist_test(++n, "*example.com", "http://my.virus.com/foo/bar?*example.com", false);
- whitelist_test(++n, "http://*example.com", "http://www.example.com", true);
- whitelist_test(++n, "http://*.example.com", "http://www.example.com", true);
- whitelist_test(++n, "http://*.e$?^.com", "http://www.e$?^.com", true);
- whitelist_test(++n, "*.example.com/foo/bar", "http://www.example.com/", false);
- whitelist_test(++n, "*.example.com/foo/bar", "http://example.com/foo/bar", false);
- whitelist_test(++n, "http://*.example.com/foo/bar", "http://www.example.com", false);
- whitelist_test(++n, "http://*.example.com", "https://www.example.com", false);
- whitelist_test(++n, "http*://*.example.com", "rtsp://www.example.com", false);
- whitelist_test(++n, "http*://*.example.com", "https://www.example.com", true);
- whitelist_test(++n, "example.com", "http://www.example.com", false);
- whitelist_test(++n, "www.example.com", "http://www.example.com:80", false);
- whitelist_test(++n, "www.example.com", "http://www.example.com", true);
- whitelist_test(++n, "www.example.com/", "http://www.example.com", false);
- whitelist_test(++n, "www.example.com/foo/bar/*", "http://www.example.com/foo/bar/baz", true);
+ void object::test<14>()
+ {
+ // Whitelist check tests
+ int n=0;
+
+ // Check the "empty whitelist" case
+ whitelist_test(++n, "", "http://www.example.com", true);
+
+ // Check the "missing scheme" case
+ whitelist_test(++n, "www.example.com", "http://www.example.com", true);
+
+ // Check the "exactly the same" case
+ whitelist_test(++n, "http://example.com", "http://example.com", true);
+
+ // Check the enable flag
+ whitelist_test(++n, false, "www.example.com", "http://www.secondlife.com", true);
+ whitelist_test(++n, true, "www.example.com", "http://www.secondlife.com", false);
+
+ // Check permutations of trailing slash:
+ whitelist_test(++n, "http://www.example.com", "http://www.example.com/", true);
+ whitelist_test(++n, "http://www.example.com/", "http://www.example.com/", true);
+ whitelist_test(++n, "http://www.example.com/", "http://www.example.com", false);
+ whitelist_test(++n, "http://www.example.com", "http://www.example.com/foobar", true);
+ whitelist_test(++n, "http://www.example.com/", "http://www.example.com/foobar", false);
+
+
+ // More cases...
+ whitelist_test(++n, "http://example.com", "http://example.com/wiki", true);
+ whitelist_test(++n, "www.example.com", "http://www.example.com/help", true);
+ whitelist_test(++n, "http://www.example.com", "http://wwwexample.com", false);
+ whitelist_test(++n, "http://www.example.com", "http://www.example.com/wiki", true);
+ whitelist_test(++n, "example.com", "http://wwwexample.com", false);
+ whitelist_test(++n, "http://www.example.com/", "http://www.amazon.com/wiki", false);
+ whitelist_test(++n, "www.example.com", "http://www.amazon.com", false);
+
+ // regexp cases
+ whitelist_test(++n, "*.example.com", "http://www.example.com", true);
+ whitelist_test(++n, "*.example.com", "http://www.amazon.com", false);
+ whitelist_test(++n, "*.example.com", "http://www.example.com/foo/bar", true);
+ whitelist_test(++n, "*.example.com", "http:/example.com/foo/bar", false);
+ whitelist_test(++n, "*example.com", "http://example.com/foo/bar", true);
+ whitelist_test(++n, "*example.com", "http://my.virus.com/foo/bar?example.com", false);
+ whitelist_test(++n, "example.com", "http://my.virus.com/foo/bar?example.com", false);
+ whitelist_test(++n, "*example.com", "http://my.virus.com/foo/bar?*example.com", false);
+ whitelist_test(++n, "http://*example.com", "http://www.example.com", true);
+ whitelist_test(++n, "http://*.example.com", "http://www.example.com", true);
+ whitelist_test(++n, "http://*.e$?^.com", "http://www.e$?^.com", true);
+ whitelist_test(++n, "*.example.com/foo/bar", "http://www.example.com/", false);
+ whitelist_test(++n, "*.example.com/foo/bar", "http://example.com/foo/bar", false);
+ whitelist_test(++n, "http://*.example.com/foo/bar", "http://www.example.com", false);
+ whitelist_test(++n, "http://*.example.com", "https://www.example.com", false);
+ whitelist_test(++n, "http*://*.example.com", "rtsp://www.example.com", false);
+ whitelist_test(++n, "http*://*.example.com", "https://www.example.com", true);
+ whitelist_test(++n, "example.com", "http://www.example.com", false);
+ whitelist_test(++n, "www.example.com", "http://www.example.com:80", false);
+ whitelist_test(++n, "www.example.com", "http://www.example.com", true);
+ whitelist_test(++n, "www.example.com/", "http://www.example.com", false);
+ whitelist_test(++n, "www.example.com/foo/bar/*", "http://www.example.com/foo/bar/baz", true);
// Path only
- whitelist_test(++n, "/foo/*/baz", "http://www.example.com/foo/bar/baz", true);
- whitelist_test(++n, "/foo/*/baz", "http://www.example.com/foo/bar/", false);
- }
-
+ whitelist_test(++n, "/foo/*/baz", "http://www.example.com/foo/bar/baz", true);
+ whitelist_test(++n, "/foo/*/baz", "http://www.example.com/foo/bar/", false);
+ }
+
}