From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Thu, 7 Sep 2017 09:01:55 +0000 (+0200)
Subject: Fix tests for URL formatting changes
X-Git-Tag: v2.8.0~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08486a0f7ca7fb06a709aed8e2aeb91946464d92;p=icinga2

Fix tests for URL formatting changes

refs #5558
---

diff --git a/test/remote-url.cpp b/test/remote-url.cpp
index c209d5962..fce18d7ed 100644
--- a/test/remote-url.cpp
+++ b/test/remote-url.cpp
@@ -52,7 +52,8 @@ BOOST_AUTO_TEST_CASE(get_and_set)
 	url->SetPort("1918");
 	std::vector<String> p = boost::assign::list_of("path")("to")("münchen");
 	url->SetPath(p);
-	BOOST_CHECK(url->Format(true) == "ftp://Horst:Seehofer@koenigreich.bayern:1918/path/to/m%C3%BCnchen");
+
+	BOOST_CHECK(url->Format(false, true) == "ftp://Horst:Seehofer@koenigreich.bayern:1918/path/to/m%C3%BCnchen");
 
 	std::map<String, std::vector<String> > m;
 	std::vector<String> v1 = boost::assign::list_of("hip")("hip")("hurra");
@@ -84,17 +85,17 @@ BOOST_AUTO_TEST_CASE(parameters)
 BOOST_AUTO_TEST_CASE(format)
 {
 	Url::Ptr url = new Url("http://foo.bar/baz/?hop=top&flop=sop#iLIKEtrains");
-	BOOST_CHECK(new Url(url->Format()));
+	BOOST_CHECK(new Url(url->Format(false, false)));
 
 	url = new Url("//main.args/////////?k[]=one&k[]=two#three");
-	BOOST_CHECK(new Url(url->Format()));
+	BOOST_CHECK(new Url(url->Format(false, false)));
 
 	url = new Url("/foo/bar/index.php?blaka");
-	BOOST_CHECK(new Url(url->Format()));
-	BOOST_CHECK(url->Format() == "/foo/bar/index.php?blaka");
+	BOOST_CHECK(new Url(url->Format(false, false)));
+	BOOST_CHECK(url->Format(false, false) == "/foo/bar/index.php?blaka");
 
 	url = new Url("/");
-	BOOST_CHECK(url->Format() == "/");
+	BOOST_CHECK(url->Format(false, false) == "/");
 }
 
 BOOST_AUTO_TEST_CASE(illegal_legal_strings)