3 files changed, 10 insertions, 76 deletions

diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h
deleted file mode 100644
index af26bf8803..0000000000
--- a/indra/llmessage/tests/llmockhttpclient.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/** 
- * @file 
- * @brief 
- *
- * $LicenseInfo:firstyear=2008&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$
- */
-
-/* Macro Definitions */
-#ifndef LL_LLMOCKHTTPCLIENT_H
-#define LL_LLMOCKHTTPCLIENT_H
-
-#include "linden_common.h"
-#include "llhttpclientinterface.h"
-
-#include <gmock/gmock.h>
-
-class LLMockHTTPClient : public LLHTTPClientInterface
-{
-public:
-  MOCK_METHOD2(get, void(const std::string& url, LLCurl::ResponderPtr responder));
-  MOCK_METHOD3(get, void(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers));
-  MOCK_METHOD3(put, void(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder));
-};
-
-// A helper to match responder types
-template<typename T>
-struct ResponderType
-{
-	bool operator()(LLCurl::ResponderPtr ptr) const
-	{
-		T* p = dynamic_cast<T*>(ptr.get());
-		return p != NULL;
-	}
-};
-
-inline bool operator==(const LLSD& l, const LLSD& r)
-{
-	std::ostringstream ls, rs;
-	ls << l;
-	rs << r;
-	return ls.str() == rs.str();
-
-}
-
-
-#endif //LL_LLMOCKHTTPCLIENT_H
-
diff --git a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
index e20f61b73f..3f87a4aff6 100644
--- a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
+++ b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
@@ -47,16 +47,16 @@ void LLMessageSystem::clearReceiveState(void)
 
 char gUdpDispatchedData[MAX_BUFFER_SIZE];
 bool gUdpDispatchWasCalled = false;
-BOOL LLTemplateMessageReader::readMessage(const U8* data,class LLHost const &) 
-{ 
+bool LLTemplateMessageReader::readMessage(const U8* data,class LLHost const &)
+{
 	gUdpDispatchWasCalled = true;
 	strcpy(gUdpDispatchedData, reinterpret_cast<const char*>(data));
 	return  true;
 }
 
-BOOL gValidateMessage = FALSE;
-BOOL LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted) 
-{ 
+bool gValidateMessage = false;
+bool LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted)
+{
 	return gValidateMessage;
 }
 
@@ -84,7 +84,7 @@ namespace tut
 				mMessageName = "MessageName";
 				gUdpDispatchWasCalled = false;
 				gClearRecvWasCalled = false;
-				gValidateMessage = FALSE;
+				gValidateMessage = false;
 				mMessage["body"]["binary-template-data"] = std::vector<U8>();
 			}
 
@@ -121,7 +121,7 @@ namespace tut
 	{
 		LLTemplateMessageReader* pReader = NULL;
 		LLTemplateMessageDispatcher t(*pReader);
-		gValidateMessage = TRUE;
+		gValidateMessage = true;
 		std::vector<U8> vector_data;
 		fillVector(vector_data, gBinaryTemplateData);		
 		mMessage["body"]["binary-template-data"] = vector_data;
@@ -138,7 +138,7 @@ namespace tut
 		std::vector<U8> vector_data;
 		fillVector(vector_data, gBinaryTemplateData);
 		mMessage["body"]["binary-template-data"] = vector_data;
-		gValidateMessage = FALSE;
+		gValidateMessage = false;
 		t.dispatch(mMessageName, mMessage, mResponsePtr);
 		ensure("clear received message was called", gClearRecvWasCalled);
 	}
@@ -149,7 +149,7 @@ namespace tut
 	{
 		LLTemplateMessageReader* pReader = NULL;
 		LLTemplateMessageDispatcher t(*pReader);
-		gValidateMessage = TRUE;
+		gValidateMessage = true;
 		std::vector<U8> vector_data;
 		fillVector(vector_data, gBinaryTemplateData);
 		mMessage["body"]["binary-template-data"] = vector_data;
diff --git a/indra/llmessage/tests/llxfer_file_test.cpp b/indra/llmessage/tests/llxfer_file_test.cpp
index a8c1adf9b4..cf95d2627c 100644
--- a/indra/llmessage/tests/llxfer_file_test.cpp
+++ b/indra/llmessage/tests/llxfer_file_test.cpp
@@ -51,7 +51,7 @@ namespace tut
 			oversized_filename += 'X';
 		}
 
-		LLXfer_File xff(oversized_filename, FALSE, 1);
+		LLXfer_File xff(oversized_filename, false, 1);
 		ensure("oversized local_filename nul-terminated",
 		       xff.getFileName().length() < LL_MAX_PATH);
 	}