Automated merge with https://bitbucket.org/mani_linden/viewer-development/

1 files changed, 9 insertions, 4 deletions

diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index d93a85cf7d..958526e35b 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -29,6 +29,7 @@
 // associated header

 #include "../llupdaterservice.h"

 #include "../llupdatechecker.h"

+#include "../llupdatedownloader.h"

 

 #include "../../../test/lltut.h"

 //#define DEBUG_ON

@@ -59,7 +60,11 @@ LLPluginMessage::LLPluginMessage(LLPluginMessage const&) {}
 

 LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client)

 {}

-void LLUpdateChecker::check(std::string const & host, std::string channel, std::string version){}

+void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl, 

+								  std::string const & servicePath, std::string channel, std::string version)

+{}

+LLUpdateDownloader::LLUpdateDownloader(Client & ) {}

+void LLUpdateDownloader::download(LLURI const & ){}

 

 /*****************************************************************************

 *   TUT

@@ -109,9 +114,9 @@ namespace tut
 		bool got_usage_error = false;

 		try

 		{

-			updater.setParams(test_url, test_channel, test_version);

+			updater.setParams("1.0",test_url, "update" ,test_channel, test_version);

 			updater.startChecking();

-			updater.setParams("other_url", test_channel, test_version);

+			updater.setParams("1.0", "other_url", "update", test_channel, test_version);

 		}

 		catch(LLUpdaterService::UsageError)

 		{

@@ -125,7 +130,7 @@ namespace tut
     {

         DEBUG;

 		LLUpdaterService updater;

-		updater.setParams(test_url, test_channel, test_version);

+		updater.setParams("1.0", test_url, "update", test_channel, test_version);

 		updater.startChecking();

 		ensure(updater.isChecking());

 		updater.stopChecking();