Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Base/UnitTest
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Base/UnitTest')
-rw-r--r--Swiften/Base/UnitTest/URLTest.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/Base/UnitTest/URLTest.cpp b/Swiften/Base/UnitTest/URLTest.cpp
index c38398a..da9f15c 100644
--- a/Swiften/Base/UnitTest/URLTest.cpp
+++ b/Swiften/Base/UnitTest/URLTest.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2012-2016 Isode Limited. 2 * Copyright (c) 2012-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -66,7 +66,7 @@ class URLTest : public CppUnit::TestFixture {
66 66
67 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 67 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
68 CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost()); 68 CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
69 CPPUNIT_ASSERT_EQUAL(1234, *url.getPort()); 69 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(1234), *url.getPort());
70 CPPUNIT_ASSERT_EQUAL(std::string("/baz/bam"), url.getPath()); 70 CPPUNIT_ASSERT_EQUAL(std::string("/baz/bam"), url.getPath());
71 } 71 }
72 72
@@ -75,7 +75,7 @@ class URLTest : public CppUnit::TestFixture {
75 75
76 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 76 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
77 CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost()); 77 CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
78 CPPUNIT_ASSERT_EQUAL(11440, *url.getPort()); 78 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(11440), *url.getPort());
79 CPPUNIT_ASSERT_EQUAL(std::string("/http-bind/"), url.getPath()); 79 CPPUNIT_ASSERT_EQUAL(std::string("/http-bind/"), url.getPath());
80 } 80 }
81 81
@@ -84,7 +84,7 @@ class URLTest : public CppUnit::TestFixture {
84 84
85 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 85 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
86 CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost()); 86 CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
87 CPPUNIT_ASSERT_EQUAL(1234, *url.getPort()); 87 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(1234), *url.getPort());
88 CPPUNIT_ASSERT_EQUAL(std::string(""), url.getPath()); 88 CPPUNIT_ASSERT_EQUAL(std::string(""), url.getPath());
89 } 89 }
90 90
@@ -121,7 +121,7 @@ class URLTest : public CppUnit::TestFixture {
121 121
122 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 122 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
123 CPPUNIT_ASSERT_EQUAL(std::string("127.0.0.1"), url.getHost()); 123 CPPUNIT_ASSERT_EQUAL(std::string("127.0.0.1"), url.getHost());
124 CPPUNIT_ASSERT_EQUAL(12345, url.getPort().get_value_or(0)); 124 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(12345), url.getPort().get_value_or(0));
125 CPPUNIT_ASSERT_EQUAL(std::string("/foobar"), url.getPath()); 125 CPPUNIT_ASSERT_EQUAL(std::string("/foobar"), url.getPath());
126 } 126 }
127 127
@@ -137,7 +137,7 @@ class URLTest : public CppUnit::TestFixture {
137 137
138 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 138 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
139 CPPUNIT_ASSERT_EQUAL(std::string("fdf8:f53b:82e4::53"), url.getHost()); 139 CPPUNIT_ASSERT_EQUAL(std::string("fdf8:f53b:82e4::53"), url.getHost());
140 CPPUNIT_ASSERT_EQUAL(12435, url.getPort().get_value_or(0)); 140 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(12435), url.getPort().get_value_or(0));
141 } 141 }
142 142
143 void test_FromString_ToString_IPv6RFC2732() { 143 void test_FromString_ToString_IPv6RFC2732() {
@@ -147,7 +147,7 @@ class URLTest : public CppUnit::TestFixture {
147 147
148 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 148 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
149 CPPUNIT_ASSERT_EQUAL(std::string("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210"), url.getHost()); 149 CPPUNIT_ASSERT_EQUAL(std::string("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210"), url.getHost());
150 CPPUNIT_ASSERT_EQUAL(80, url.getPort().get_value_or(2)); 150 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(80), url.getPort().get_value_or(2));
151 CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), url.getPath()); 151 CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), url.getPath());
152 152
153 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 153 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());
@@ -159,7 +159,7 @@ class URLTest : public CppUnit::TestFixture {
159 159
160 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 160 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
161 CPPUNIT_ASSERT_EQUAL(std::string("1080:0:0:0:8:800:200C:417A"), url.getHost()); 161 CPPUNIT_ASSERT_EQUAL(std::string("1080:0:0:0:8:800:200C:417A"), url.getHost());
162 CPPUNIT_ASSERT_EQUAL(2, url.getPort().get_value_or(2)); 162 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(2), url.getPort().get_value_or(2));
163 CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), url.getPath()); 163 CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), url.getPath());
164 164
165 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 165 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());
@@ -171,7 +171,7 @@ class URLTest : public CppUnit::TestFixture {
171 171
172 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 172 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
173 CPPUNIT_ASSERT_EQUAL(std::string("3ffe:2a00:100:7031::1"), url.getHost()); 173 CPPUNIT_ASSERT_EQUAL(std::string("3ffe:2a00:100:7031::1"), url.getHost());
174 CPPUNIT_ASSERT_EQUAL(2, url.getPort().get_value_or(2)); 174 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(2), url.getPort().get_value_or(2));
175 CPPUNIT_ASSERT_EQUAL(std::string(""), url.getPath()); 175 CPPUNIT_ASSERT_EQUAL(std::string(""), url.getPath());
176 176
177 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 177 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());
@@ -183,7 +183,7 @@ class URLTest : public CppUnit::TestFixture {
183 183
184 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 184 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
185 CPPUNIT_ASSERT_EQUAL(std::string("1080::8:800:200C:417A"), url.getHost()); 185 CPPUNIT_ASSERT_EQUAL(std::string("1080::8:800:200C:417A"), url.getHost());
186 CPPUNIT_ASSERT_EQUAL(2, url.getPort().get_value_or(2)); 186 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(2), url.getPort().get_value_or(2));
187 CPPUNIT_ASSERT_EQUAL(std::string("/foo"), url.getPath()); 187 CPPUNIT_ASSERT_EQUAL(std::string("/foo"), url.getPath());
188 188
189 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 189 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());
@@ -195,7 +195,7 @@ class URLTest : public CppUnit::TestFixture {
195 195
196 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 196 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
197 CPPUNIT_ASSERT_EQUAL(std::string("::192.9.5.5"), url.getHost()); 197 CPPUNIT_ASSERT_EQUAL(std::string("::192.9.5.5"), url.getHost());
198 CPPUNIT_ASSERT_EQUAL(2, url.getPort().get_value_or(2)); 198 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(2), url.getPort().get_value_or(2));
199 CPPUNIT_ASSERT_EQUAL(std::string("/ipng"), url.getPath()); 199 CPPUNIT_ASSERT_EQUAL(std::string("/ipng"), url.getPath());
200 200
201 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 201 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());
@@ -207,7 +207,7 @@ class URLTest : public CppUnit::TestFixture {
207 207
208 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 208 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
209 CPPUNIT_ASSERT_EQUAL(std::string("::FFFF:129.144.52.38"), url.getHost()); 209 CPPUNIT_ASSERT_EQUAL(std::string("::FFFF:129.144.52.38"), url.getHost());
210 CPPUNIT_ASSERT_EQUAL(80, url.getPort().get_value_or(2)); 210 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(80), url.getPort().get_value_or(2));
211 CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), url.getPath()); 211 CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), url.getPath());
212 212
213 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 213 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());
@@ -219,7 +219,7 @@ class URLTest : public CppUnit::TestFixture {
219 219
220 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme()); 220 CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
221 CPPUNIT_ASSERT_EQUAL(std::string("2010:836B:4179::836B:4179"), url.getHost()); 221 CPPUNIT_ASSERT_EQUAL(std::string("2010:836B:4179::836B:4179"), url.getHost());
222 CPPUNIT_ASSERT_EQUAL(2, url.getPort().get_value_or(2)); 222 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(2), url.getPort().get_value_or(2));
223 CPPUNIT_ASSERT_EQUAL(std::string(), url.getPath()); 223 CPPUNIT_ASSERT_EQUAL(std::string(), url.getPath());
224 224
225 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString()); 225 CPPUNIT_ASSERT_EQUAL(std::string(testVector), url.toString());