Skip to content

Commit a98df36

Browse files
jotojoto
committed
Tests: Put more members into relations
1 parent 60e786c commit a98df36

File tree

2 files changed

+70
-37
lines changed

2 files changed

+70
-37
lines changed

‎tests/test-output-flex-way-relation-add.cpp‎

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ TEST_CASE("test way: add relation with way in t1 (marked)")
3737
data.add("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
3838

3939
SECTION("no relation") {}
40-
SECTION("relation without w10") { data.add("r32 v1 dV Tt=ag Mw15@"); }
40+
41+
SECTION("relation without w10")
42+
{
43+
data.add("r32 v1 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@");
44+
}
4145

4246
REQUIRE_NOTHROW(db.run_import(options, data()));
4347

@@ -52,7 +56,8 @@ TEST_CASE("test way: add relation with way in t1 (marked)")
5256

5357
options.append = true;
5458

55-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@mark,w15@\n"));
59+
REQUIRE_NOTHROW(db.run_import(
60+
options, "r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@\n"));
5661

5762
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
5863
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -70,7 +75,7 @@ TEST_CASE("test way: add relation with way in t2 (marked)")
7075
testing::data_t data{tdata};
7176

7277
data.add("w10 v1 dV Tt2=yes Nn10,n11");
73-
data.add("r31 v1 dV Tt=ag Mw10@mark");
78+
data.add("r31 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@");
7479

7580
REQUIRE_NOTHROW(db.run_import(options, data()));
7681

@@ -86,7 +91,8 @@ TEST_CASE("test way: add relation with way in t2 (marked)")
8691

8792
options.append = true;
8893

89-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@mark,w15@\n"));
94+
REQUIRE_NOTHROW(db.run_import(
95+
options, "r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@\n"));
9096

9197
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
9298
CHECK(0 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -104,7 +110,7 @@ TEST_CASE("test way: add relation with way in t1 and t2 (marked)")
104110
testing::data_t data{tdata};
105111

106112
data.add("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
107-
data.add("r31 v1 dV Tt=ag Mw10@mark");
113+
data.add("r31 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@");
108114

109115
REQUIRE_NOTHROW(db.run_import(options, data()));
110116

@@ -120,7 +126,8 @@ TEST_CASE("test way: add relation with way in t1 and t2 (marked)")
120126

121127
options.append = true;
122128

123-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@mark,w15@\n"));
129+
REQUIRE_NOTHROW(db.run_import(
130+
options, "r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@\n"));
124131

125132
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
126133
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -139,11 +146,14 @@ TEST_CASE("test way: add (to) relation with way in tboth stage 1 (marked)")
139146

140147
data.add("w10 v1 dV Ttboth=yes Nn10,n11");
141148

142-
SECTION("adding relation") {
143-
data.add("r31 v1 dV Tt=ag Mw10@");
149+
SECTION("adding relation")
150+
{
151+
data.add("r31 v1 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@");
144152
}
145-
SECTION("changing relation") {
146-
data.add("r32 v1 dV Tt=ag Mw10@,w15@");
153+
154+
SECTION("changing relation")
155+
{
156+
data.add("r32 v1 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@");
147157
}
148158

149159
REQUIRE_NOTHROW(db.run_import(options, data()));
@@ -161,7 +171,8 @@ TEST_CASE("test way: add (to) relation with way in tboth stage 1 (marked)")
161171

162172
options.append = true;
163173

164-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@mark,w15@\n"));
174+
REQUIRE_NOTHROW(db.run_import(
175+
options, "r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@\n"));
165176

166177
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
167178
CHECK(0 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -180,7 +191,7 @@ TEST_CASE("test way: add relation with way in tboth stage 2 (marked)")
180191
testing::data_t data{tdata};
181192

182193
data.add("w10 v1 dV Ttboth=yes Nn10,n11");
183-
data.add("r31 v1 dV Tt=ag Mw10@mark");
194+
data.add("r31 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@");
184195

185196
REQUIRE_NOTHROW(db.run_import(options, data()));
186197

@@ -197,7 +208,8 @@ TEST_CASE("test way: add relation with way in tboth stage 2 (marked)")
197208

198209
options.append = true;
199210

200-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@mark,w15@\n"));
211+
REQUIRE_NOTHROW(db.run_import(
212+
options, "r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@\n"));
201213

202214
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
203215
CHECK(0 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -221,7 +233,11 @@ TEST_CASE("test way: add relation with way in t1 (not marked)")
221233
data.add("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
222234

223235
SECTION("no relation") {}
224-
SECTION("relation without w10") { data.add("r32 v1 dV Tt=ag Mw15@"); }
236+
237+
SECTION("relation without w10")
238+
{
239+
data.add("r32 v1 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@");
240+
}
225241

226242
REQUIRE_NOTHROW(db.run_import(options, data()));
227243

@@ -236,7 +252,8 @@ TEST_CASE("test way: add relation with way in t1 (not marked)")
236252

237253
options.append = true;
238254

239-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@,w15@\n"));
255+
REQUIRE_NOTHROW(db.run_import(
256+
options, "r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@\n"));
240257

241258
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
242259
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -253,7 +270,7 @@ TEST_CASE("test way: add relation with way in t2 (not marked)")
253270
testing::data_t data{tdata};
254271

255272
data.add("w10 v1 dV Tt2=yes Nn10,n11");
256-
data.add("r31 v1 dV Tt=ag Mw10@mark");
273+
data.add("r31 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@");
257274

258275
REQUIRE_NOTHROW(db.run_import(options, data()));
259276

@@ -269,7 +286,8 @@ TEST_CASE("test way: add relation with way in t2 (not marked)")
269286

270287
options.append = true;
271288

272-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@,w15@\n"));
289+
REQUIRE_NOTHROW(db.run_import(
290+
options, "r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@\n"));
273291

274292
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
275293
CHECK(0 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -287,7 +305,7 @@ TEST_CASE("test way: add relation with way in t1 and t2 (not marked)")
287305
testing::data_t data{tdata};
288306

289307
data.add("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
290-
data.add("r31 v1 dV Tt=ag Mw10@mark");
308+
data.add("r31 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@");
291309

292310
REQUIRE_NOTHROW(db.run_import(options, data()));
293311

@@ -303,7 +321,8 @@ TEST_CASE("test way: add relation with way in t1 and t2 (not marked)")
303321

304322
options.append = true;
305323

306-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@,w15@\n"));
324+
REQUIRE_NOTHROW(db.run_import(
325+
options, "r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@\n"));
307326

308327
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
309328
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -321,7 +340,7 @@ TEST_CASE("test way: add relation with way in tboth stage 1 (not marked)")
321340
testing::data_t data{tdata};
322341

323342
data.add("w10 v1 dV Ttboth=yes Nn10,n11");
324-
data.add("r31 v1 dV Tt=ag Mw10@");
343+
data.add("r31 v1 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@");
325344

326345
REQUIRE_NOTHROW(db.run_import(options, data()));
327346

@@ -338,7 +357,8 @@ TEST_CASE("test way: add relation with way in tboth stage 1 (not marked)")
338357

339358
options.append = true;
340359

341-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@,w15@\n"));
360+
REQUIRE_NOTHROW(db.run_import(
361+
options, "r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@\n"));
342362

343363
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
344364
CHECK(0 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
@@ -357,7 +377,7 @@ TEST_CASE("test way: add relation with way in tboth stage 2 (not marked)")
357377
testing::data_t data{tdata};
358378

359379
data.add("w10 v1 dV Ttboth=yes Nn10,n11");
360-
data.add("r31 v1 dV Tt=ag Mw10@mark");
380+
data.add("r31 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@");
361381

362382
REQUIRE_NOTHROW(db.run_import(options, data()));
363383

@@ -374,7 +394,8 @@ TEST_CASE("test way: add relation with way in tboth stage 2 (not marked)")
374394

375395
options.append = true;
376396

377-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw10@,w15@\n"));
397+
REQUIRE_NOTHROW(db.run_import(
398+
options, "r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@\n"));
378399

379400
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
380401
CHECK(0 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));

‎tests/test-output-flex-way-relation-del.cpp‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST_CASE("test way: delete relation with way not in relation")
3232
testing::data_t data{tdata};
3333

3434
data.add("w10 v1 dV Tt=ag Nn10,n11");
35-
data.add("r32 v1 dV Tt=ag Mw15@");
35+
data.add("r32 v1 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@");
3636

3737
REQUIRE_NOTHROW(db.run_import(options, data()));
3838

@@ -64,7 +64,7 @@ TEST_CASE("test way: delete relation with way in t1")
6464
testing::data_t data{tdata};
6565

6666
data.add("w10 v1 dV Tt1=yes Nn10,n11");
67-
data.add("r32 v1 dV Tt=ag Mw15@");
67+
data.add("r32 v1 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@");
6868

6969
REQUIRE_NOTHROW(db.run_import(options, data()));
7070

@@ -97,7 +97,7 @@ TEST_CASE("test way: delete relation with way in t2 (multi)")
9797

9898
data.add("w10 v1 dV Tt2=yes Nn10,n11");
9999
data.add("r31 v1 dV Tt=ag Mw10@mark");
100-
data.add("r32 v1 dV Tt=ag Mw10@mark,w15@");
100+
data.add("r32 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@");
101101

102102
REQUIRE_NOTHROW(db.run_import(options, data()));
103103

@@ -117,9 +117,11 @@ TEST_CASE("test way: delete relation with way in t2 (multi)")
117117
{
118118
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dD\n"));
119119
}
120+
120121
SECTION("remove way from relation")
121122
{
122-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw15@\n"));
123+
REQUIRE_NOTHROW(db.run_import(
124+
options, "r32 v2 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@\n"));
123125
}
124126

125127
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
@@ -138,7 +140,7 @@ TEST_CASE("test way: delete relation with way in t2 (single)")
138140
testing::data_t data{tdata};
139141

140142
data.add("w10 v1 dV Tt2=yes Nn10,n11");
141-
data.add("r32 v1 dV Tt=ag Mw10@mark,w15@");
143+
data.add("r32 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@");
142144

143145
REQUIRE_NOTHROW(db.run_import(options, data()));
144146

@@ -158,9 +160,11 @@ TEST_CASE("test way: delete relation with way in t2 (single)")
158160
{
159161
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dD\n"));
160162
}
163+
161164
SECTION("remove way from relation")
162165
{
163-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw15@\n"));
166+
REQUIRE_NOTHROW(db.run_import(
167+
options, "r32 v2 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@\n"));
164168
}
165169

166170
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
@@ -180,7 +184,7 @@ TEST_CASE("test way: delete relation with way in t1 + t2 (multi)")
180184

181185
data.add("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
182186
data.add("r31 v1 dV Tt=ag Mw10@mark");
183-
data.add("r32 v1 dV Tt=ag Mw10@mark,w15@");
187+
data.add("r32 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@");
184188

185189
REQUIRE_NOTHROW(db.run_import(options, data()));
186190

@@ -200,9 +204,11 @@ TEST_CASE("test way: delete relation with way in t1 + t2 (multi)")
200204
{
201205
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dD\n"));
202206
}
207+
203208
SECTION("remove way from relation")
204209
{
205-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw15@\n"));
210+
REQUIRE_NOTHROW(db.run_import(
211+
options, "r32 v2 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@\n"));
206212
}
207213

208214
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
@@ -221,7 +227,7 @@ TEST_CASE("test way: delete relation with way in t1 + t2 (single)")
221227
testing::data_t data{tdata};
222228

223229
data.add("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
224-
data.add("r32 v1 dV Tt=ag Mw10@mark,w15@");
230+
data.add("r32 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@");
225231

226232
REQUIRE_NOTHROW(db.run_import(options, data()));
227233

@@ -241,9 +247,11 @@ TEST_CASE("test way: delete relation with way in t1 + t2 (single)")
241247
{
242248
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dD\n"));
243249
}
250+
244251
SECTION("remove way from relation")
245252
{
246-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw15@\n"));
253+
REQUIRE_NOTHROW(db.run_import(
254+
options, "r32 v2 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@\n"));
247255
}
248256

249257
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
@@ -262,7 +270,7 @@ TEST_CASE("test way: delete relation with way in tboth (multi)")
262270

263271
data.add("w10 v1 dV Ttboth=yes Nn10,n11");
264272
data.add("r31 v1 dV Tt=ag Mw10@mark");
265-
data.add("r32 v1 dV Tt=ag Mw10@mark,w15@");
273+
data.add("r32 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@");
266274

267275
REQUIRE_NOTHROW(db.run_import(options, data()));
268276

@@ -282,9 +290,11 @@ TEST_CASE("test way: delete relation with way in tboth (multi)")
282290
{
283291
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dD\n"));
284292
}
293+
285294
SECTION("remove way from relation")
286295
{
287-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw15@\n"));
296+
REQUIRE_NOTHROW(db.run_import(
297+
options, "r32 v2 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@\n"));
288298
}
289299

290300
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
@@ -303,7 +313,7 @@ TEST_CASE("test way: delete relation with way in tboth (single)")
303313
testing::data_t data{tdata};
304314

305315
data.add("w10 v1 dV Ttboth=yes Nn10,n11");
306-
data.add("r32 v1 dV Tt=ag Mw10@mark,w15@");
316+
data.add("r32 v1 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@");
307317

308318
REQUIRE_NOTHROW(db.run_import(options, data()));
309319

@@ -323,9 +333,11 @@ TEST_CASE("test way: delete relation with way in tboth (single)")
323333
{
324334
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dD\n"));
325335
}
336+
326337
SECTION("remove way from relation")
327338
{
328-
REQUIRE_NOTHROW(db.run_import(options, "r32 v2 dV Tt=ag Mw15@\n"));
339+
REQUIRE_NOTHROW(db.run_import(
340+
options, "r32 v2 dV Tt=ag Mw11@,w12@,w13@,w14@,w15@\n"));
329341
}
330342

331343
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));

0 commit comments

Comments
 (0)