Skip to content

Commit eef48fa

Browse files
glynosglynos
committed
[uri] cleaned tests.
1 parent 63f07da commit eef48fa

File tree

2 files changed

+23
-103
lines changed

2 files changed

+23
-103
lines changed

‎libs/network/test/uri/uri_builder_stream_test.cpp

+13-53
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@
88
#include <boost/test/unit_test.hpp>
99
#include <boost/network/uri/uri.hpp>
1010
#include <boost/network/uri/directives.hpp>
11-
#include <boost/network/uri/accessors.hpp>
1211
#include <boost/network/uri/uri_io.hpp>
13-
#include <boost/network/tags.hpp>
14-
#include <boost/mpl/list.hpp>
15-
#include <boost/range/algorithm/equal.hpp>
16-
#include <boost/range/algorithm/copy.hpp>
1712

1813

1914
using namespace boost::network;
@@ -24,9 +19,8 @@ BOOST_AUTO_TEST_CASE(builder_test)
2419
uri::uri instance;
2520
instance << uri::scheme("http") << uri::host("www.example.com") << uri::path("/");
2621
BOOST_REQUIRE(uri::valid(instance));
27-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
28-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
29-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
22+
BOOST_CHECK_EQUAL("http://www.example.com/", instance.string());
23+
3024
}
3125

3226
BOOST_AUTO_TEST_CASE(full_uri_builder_test)
@@ -41,26 +35,15 @@ BOOST_AUTO_TEST_CASE(full_uri_builder_test)
4135
<< uri::fragment("fragment")
4236
;
4337
BOOST_REQUIRE(uri::valid(instance));
44-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
45-
BOOST_CHECK_EQUAL(uri::user_info(instance), "user:password");
46-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
47-
BOOST_CHECK(uri::port_us(instance));
48-
BOOST_CHECK_EQUAL(uri::port_us(instance).get(), 80);
49-
BOOST_CHECK_EQUAL(uri::port(instance), "80");
50-
BOOST_CHECK_EQUAL(uri::path(instance), "/path");
51-
BOOST_CHECK_EQUAL(uri::query(instance), "query");
52-
BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
38+
BOOST_CHECK_EQUAL("http://user:[email protected]:80/path?query#fragment", instance.string());
5339
}
5440

5541
BOOST_AUTO_TEST_CASE(port_test)
5642
{
5743
uri::uri instance;
5844
instance << uri::scheme("http") << uri::host("www.example.com") << uri::port(8000) << uri::path("/");
5945
BOOST_REQUIRE(uri::valid(instance));
60-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
61-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
62-
BOOST_CHECK_EQUAL(uri::port(instance), "8000");
63-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
46+
BOOST_CHECK_EQUAL("http://www.example.com:8000/", instance.string());
6447
}
6548

6649
BOOST_AUTO_TEST_CASE(encoded_path_test)
@@ -73,11 +56,7 @@ BOOST_AUTO_TEST_CASE(encoded_path_test)
7356
;
7457
;
7558
BOOST_REQUIRE(uri::valid(instance));
76-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
77-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
78-
BOOST_CHECK_EQUAL(uri::port(instance), "8000");
79-
BOOST_CHECK_EQUAL(uri::path(instance), "/Path%20With%20%28Some%29%20Encoded%20Characters%21");
80-
BOOST_CHECK_EQUAL(uri::decoded_path(instance), "/Path With (Some) Encoded Characters!");
59+
BOOST_CHECK_EQUAL("http://www.example.com:8000/Path%20With%20%28Some%29%20Encoded%20Characters%21", instance.string());
8160
}
8261

8362
BOOST_AUTO_TEST_CASE(query_test)
@@ -87,10 +66,7 @@ BOOST_AUTO_TEST_CASE(query_test)
8766
<< uri::query("key", "value")
8867
;
8968
BOOST_REQUIRE(uri::valid(instance));
90-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
91-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
92-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
93-
BOOST_CHECK_EQUAL(uri::query(instance), "key=value");
69+
BOOST_CHECK_EQUAL("http://www.example.com/?key=value", instance.string());
9470
}
9571

9672
BOOST_AUTO_TEST_CASE(query_2_test)
@@ -100,21 +76,15 @@ BOOST_AUTO_TEST_CASE(query_2_test)
10076
<< uri::query("key1", "value1") << uri::query("key2", "value2")
10177
;
10278
BOOST_REQUIRE(uri::valid(instance));
103-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
104-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
105-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
106-
BOOST_CHECK_EQUAL(uri::query(instance), "key1=value1&key2=value2");
79+
BOOST_CHECK_EQUAL("http://www.example.com/?key1=value1&key2=value2", instance.string());
10780
}
10881

10982
BOOST_AUTO_TEST_CASE(fragment_test)
11083
{
11184
uri::uri instance;
11285
instance << uri::scheme("http") << uri::host("www.example.com") << uri::path("/") << uri::fragment("fragment");
11386
BOOST_REQUIRE(uri::valid(instance));
114-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
115-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
116-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
117-
BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
87+
BOOST_CHECK_EQUAL("http://www.example.com/#fragment", instance.string());
11888
}
11989

12090
BOOST_AUTO_TEST_CASE(from_base_test)
@@ -123,30 +93,23 @@ BOOST_AUTO_TEST_CASE(from_base_test)
12393
uri::uri instance;
12494
instance << base_uri << uri::path("/") << uri::fragment("fragment");
12595
BOOST_REQUIRE(uri::valid(instance));
126-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
127-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
128-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
129-
BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
96+
BOOST_CHECK_EQUAL("http://www.example.com/#fragment", instance.string());
13097
}
13198

13299
BOOST_AUTO_TEST_CASE(scheme_http_test)
133100
{
134101
uri::uri instance;
135102
instance << uri::schemes::http << uri::host("www.example.com") << uri::path("/");
136103
BOOST_REQUIRE(uri::valid(instance));
137-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
138-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
139-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
104+
BOOST_CHECK_EQUAL("http://www.example.com/", instance.string());
140105
}
141106

142107
BOOST_AUTO_TEST_CASE(scheme_https_test)
143108
{
144109
uri::uri instance;
145110
instance << uri::schemes::https << uri::host("www.example.com") << uri::path("/");
146111
BOOST_REQUIRE(uri::valid(instance));
147-
BOOST_CHECK_EQUAL(uri::scheme(instance), "https");
148-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
149-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
112+
BOOST_CHECK_EQUAL("https://www.example.com/", instance.string());
150113
}
151114

152115
BOOST_AUTO_TEST_CASE(encoded_null_char_test)
@@ -159,16 +122,13 @@ BOOST_AUTO_TEST_CASE(encoded_null_char_test)
159122
<< uri::encoded_path("/")
160123
;
161124
BOOST_REQUIRE(uri::valid(instance));
162-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
163-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
164-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
125+
BOOST_CHECK_EQUAL("http://www.example.com/", instance.string());
165126
}
166127

167128
BOOST_AUTO_TEST_CASE(mailto_builder_test)
168129
{
169130
uri::uri instance;
170131
instance << uri::scheme("mailto") << uri::path("[email protected]");
171132
BOOST_REQUIRE(uri::valid(instance));
172-
BOOST_CHECK_EQUAL(uri::scheme(instance), "mailto");
173-
BOOST_CHECK_EQUAL(uri::path(instance), "[email protected]");
133+
BOOST_CHECK_EQUAL("mailto:[email protected]", instance.string());
174134
}

‎libs/network/test/uri/uri_builder_test.cpp

+10-50
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
#include <boost/config/warning_disable.hpp>
88
#include <boost/test/unit_test.hpp>
99
#include <boost/network/uri/uri.hpp>
10-
#include <boost/network/uri/directives.hpp>
11-
#include <boost/network/uri/accessors.hpp>
1210
#include <boost/network/uri/uri_io.hpp>
13-
#include <boost/network/tags.hpp>
14-
#include <boost/mpl/list.hpp>
15-
#include <boost/range/algorithm/equal.hpp>
16-
#include <boost/range/algorithm/copy.hpp>
1711

1812

1913
using namespace boost::network;
@@ -30,9 +24,6 @@ BOOST_AUTO_TEST_CASE(builder_test)
3024
;
3125
BOOST_REQUIRE(uri::valid(instance));
3226
BOOST_CHECK_EQUAL("http://www.example.com/", instance.string());
33-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
34-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
35-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
3627
}
3728

3829
BOOST_AUTO_TEST_CASE(full_uri_builder_test)
@@ -49,26 +40,15 @@ BOOST_AUTO_TEST_CASE(full_uri_builder_test)
4940
.fragment("fragment")
5041
;
5142
BOOST_REQUIRE(uri::valid(instance));
52-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
53-
BOOST_CHECK_EQUAL(uri::user_info(instance), "user:password");
54-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
55-
BOOST_CHECK(uri::port_us(instance));
56-
BOOST_CHECK_EQUAL(uri::port_us(instance).get(), 80);
57-
BOOST_CHECK_EQUAL(uri::port(instance), "80");
58-
BOOST_CHECK_EQUAL(uri::path(instance), "/path");
59-
BOOST_CHECK_EQUAL(uri::query(instance), "query");
60-
BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
43+
BOOST_CHECK_EQUAL("http://user:[email protected]:80/path?query#fragment", instance.string());
6144
}
6245

6346
BOOST_AUTO_TEST_CASE(port_test)
6447
{
6548
uri::uri instance;
6649
uri::builder(instance).scheme("http").host("www.example.com").port(8000).path("/");
6750
BOOST_REQUIRE(uri::valid(instance));
68-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
69-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
70-
BOOST_CHECK_EQUAL(uri::port(instance), "8000");
71-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
51+
BOOST_CHECK_EQUAL("http://www.example.com:8000/", instance.string());
7252
}
7353

7454
BOOST_AUTO_TEST_CASE(encoded_path_test)
@@ -82,11 +62,7 @@ BOOST_AUTO_TEST_CASE(encoded_path_test)
8262
.encoded_path("/Path With (Some) Encoded Characters!")
8363
;
8464
BOOST_REQUIRE(uri::valid(instance));
85-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
86-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
87-
BOOST_CHECK_EQUAL(uri::port(instance), "8000");
88-
BOOST_CHECK_EQUAL(uri::path(instance), "/Path%20With%20%28Some%29%20Encoded%20Characters%21");
89-
BOOST_CHECK_EQUAL(uri::decoded_path(instance), "/Path With (Some) Encoded Characters!");
65+
BOOST_CHECK_EQUAL("http://www.example.com:8000/Path%20With%20%28Some%29%20Encoded%20Characters%21", instance.string());
9066
}
9167

9268
BOOST_AUTO_TEST_CASE(query_test)
@@ -100,10 +76,7 @@ BOOST_AUTO_TEST_CASE(query_test)
10076
.query("key", "value")
10177
;
10278
BOOST_REQUIRE(uri::valid(instance));
103-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
104-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
105-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
106-
BOOST_CHECK_EQUAL(uri::query(instance), "key=value");
79+
BOOST_CHECK_EQUAL("http://www.example.com/?key=value", instance.string());
10780
}
10881

10982
BOOST_AUTO_TEST_CASE(query_2_test)
@@ -118,10 +91,7 @@ BOOST_AUTO_TEST_CASE(query_2_test)
11891
.query("key2", "value2")
11992
;
12093
BOOST_REQUIRE(uri::valid(instance));
121-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
122-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
123-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
124-
BOOST_CHECK_EQUAL(uri::query(instance), "key1=value1&key2=value2");
94+
BOOST_CHECK_EQUAL("http://www.example.com/?key1=value1&key2=value2", instance.string());
12595
}
12696

12797
BOOST_AUTO_TEST_CASE(fragment_test)
@@ -135,26 +105,19 @@ BOOST_AUTO_TEST_CASE(fragment_test)
135105
.fragment("fragment")
136106
;
137107
BOOST_REQUIRE(uri::valid(instance));
138-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
139-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
140-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
141-
BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
108+
BOOST_CHECK_EQUAL("http://www.example.com/#fragment", instance.string());
142109
}
143110

144111
BOOST_AUTO_TEST_CASE(from_base_test)
145112
{
146-
uri::uri base_uri("http://www.example.com");
147-
uri::uri instance(base_uri);
113+
uri::uri instance("http://www.example.com");
148114
uri::builder builder(instance);
149115
builder
150116
.path("/")
151117
.fragment("fragment")
152118
;
153119
BOOST_REQUIRE(uri::valid(instance));
154-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
155-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
156-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
157-
BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
120+
BOOST_CHECK_EQUAL("http://www.example.com/#fragment", instance.string());
158121
}
159122

160123
BOOST_AUTO_TEST_CASE(encoded_null_char_test)
@@ -169,9 +132,7 @@ BOOST_AUTO_TEST_CASE(encoded_null_char_test)
169132
.encoded_path("/")
170133
;
171134
BOOST_REQUIRE(uri::valid(instance));
172-
BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
173-
BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
174-
BOOST_CHECK_EQUAL(uri::path(instance), "/");
135+
BOOST_CHECK_EQUAL("http://www.example.com/", instance.string());
175136
}
176137

177138
BOOST_AUTO_TEST_CASE(mailto_builder_test)
@@ -183,6 +144,5 @@ BOOST_AUTO_TEST_CASE(mailto_builder_test)
183144
.path("[email protected]")
184145
;
185146
BOOST_REQUIRE(uri::valid(instance));
186-
BOOST_CHECK_EQUAL(uri::scheme(instance), "mailto");
187-
BOOST_CHECK_EQUAL(uri::path(instance), "[email protected]");
147+
BOOST_CHECK_EQUAL("mailto:[email protected]", instance.string());
188148
}

0 commit comments

Comments
 (0)