From 30c5d4477c3b731a50039850c7fcb52e9a59f32d Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Fri, 15 Jan 2010 00:39:16 +0000
Subject: [PATCH] EXT-4340: Fixed and re-enabled the llviewerhelputil unit
test.
---
indra/newview/CMakeLists.txt | 2 +-
indra/newview/tests/llviewerhelputil_test.cpp | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 923d4a52d31..b44f1a5c6c9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1770,8 +1770,8 @@ else (LL_TESTS)
lldateutil.cpp
llmediadataclient.cpp
lllogininstance.cpp
+ llviewerhelputil.cpp
)
- # DISABLED TEST: llviewerhelputil.cpp /* not testing anything useful and hard to mock LLAgent dependency */
##################################################
# DISABLING PRECOMPILED HEADERS USAGE FOR TESTS
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index ec612c46060..d7dd199722e 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -78,9 +78,21 @@ static void substitute_string(std::string &input, const std::string &search, con
}
}
+class LLAgent
+{
+public:
+ LLAgent() {}
+ ~LLAgent() {}
+ BOOL isGodlike() const { return FALSE; }
+private:
+ int dummy;
+};
+LLAgent gAgent;
+
std::string LLWeb::expandURLSubstitutions(const std::string &url,
const LLSD &default_subs)
{
+ (void)gAgent.isGodlike(); // ref symbol to stop compiler from stripping it
std::string new_url = url;
substitute_string(new_url, "[TOPIC]", default_subs["TOPIC"].asString());
substitute_string(new_url, "[VERSION]", gVersion);
@@ -91,6 +103,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
return new_url;
}
+
//----------------------------------------------------------------------------
namespace tut
--
GitLab