Skip to content

Commit a48697b

Browse files
jotojoto
committed
Cleanup flex extra tests
1 parent 6fa6b43 commit a48697b

File tree

1 file changed

+73
-77
lines changed

1 file changed

+73
-77
lines changed

‎tests/test-output-flex-extra.cpp‎

Lines changed: 73 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
static testing::db::import_t db;
77

8+
static char const *const conf_file = "test_output_flex_extra.lua";
9+
810
TEST_CASE("nodes and ways")
911
{
10-
testing::opt_t options = testing::opt_t()
11-
.slim()
12-
.flex("test_output_flex_extra.lua")
13-
.srs(PROJ_LATLONG);
12+
options_t options =
13+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
1414

1515
REQUIRE_NOTHROW(db.run_import(options,
1616
"n10 v1 dV x10.0 y10.0\n"
@@ -38,7 +38,9 @@ TEST_CASE("nodes and ways")
3838
conn.get_count("osm2pgsql_test_highways",
3939
"ST_AsText(geom) = 'LINESTRING(10.2 10.2,10.2 10)'"));
4040

41-
REQUIRE_NOTHROW(db.run_import(options.append(), "n11 v2 dV x10.0 y10.3\n"));
41+
options.append = true;
42+
43+
REQUIRE_NOTHROW(db.run_import(options, "n11 v2 dV x10.0 y10.3\n"));
4244

4345
CHECK(2 == conn.get_count("osm2pgsql_test_highways"));
4446

@@ -54,7 +56,7 @@ TEST_CASE("nodes and ways")
5456
"ST_AsText(geom) = 'LINESTRING(10.2 10.2,10.2 10)'"));
5557

5658
REQUIRE_NOTHROW(db.run_import(
57-
options.append(),
59+
options,
5860
"n12 v2 dD\n"
5961
"w20 v2 dV Thighway=primary Nn10,n11\n"
6062
"w21 v2 dV Thighway=secondary Nn13\n")); // single node in way!
@@ -68,8 +70,8 @@ TEST_CASE("nodes and ways")
6870
CHECK(1 == conn.get_count("osm2pgsql_test_highways",
6971
"ST_AsText(geom) = 'LINESTRING(10 10,10 10.3)'"));
7072

71-
REQUIRE_NOTHROW(db.run_import(
72-
options.append(), "w21 v2 dV Thighway=secondary Nn13,n14,n15\n"));
73+
REQUIRE_NOTHROW(
74+
db.run_import(options, "w21 v2 dV Thighway=secondary Nn13,n14,n15\n"));
7375

7476
CHECK(2 == conn.get_count("osm2pgsql_test_highways"));
7577

@@ -86,10 +88,8 @@ TEST_CASE("nodes and ways")
8688

8789
TEST_CASE("relation data on ways")
8890
{
89-
testing::opt_t options = testing::opt_t()
90-
.slim()
91-
.flex("test_output_flex_extra.lua")
92-
.srs(PROJ_LATLONG);
91+
options_t options =
92+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
9393

9494
// create database with three ways and a relation on two of them
9595
REQUIRE_NOTHROW(
@@ -119,8 +119,10 @@ TEST_CASE("relation data on ways")
119119

120120
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
121121

122+
options.append = true;
123+
122124
// move node in way in the relation
123-
REQUIRE_NOTHROW(db.run_import(options.append(), "n11 v2 dV x10.0 y10.1\n"));
125+
REQUIRE_NOTHROW(db.run_import(options, "n11 v2 dV x10.0 y10.1\n"));
124126

125127
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
126128
CHECK(1 == conn.get_count("osm2pgsql_test_routes"));
@@ -137,7 +139,7 @@ TEST_CASE("relation data on ways")
137139

138140
// add the third way to the relation
139141
REQUIRE_NOTHROW(db.run_import(
140-
options.append(), "r30 v2 dV Ttype=route,ref=X11 Mw20@,w21@,w22@\n"));
142+
options, "r30 v2 dV Ttype=route,ref=X11 Mw20@,w21@,w22@\n"));
141143

142144
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
143145
CHECK(1 == conn.get_count("osm2pgsql_test_routes"));
@@ -152,9 +154,9 @@ TEST_CASE("relation data on ways")
152154
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21,22'"));
153155

154156
// remove the second way from the relation and delete it
155-
REQUIRE_NOTHROW(db.run_import(
156-
options.append(), "w21 v2 dD\n"
157-
"r30 v3 dV Ttype=route,ref=X11 Mw20@,w22@\n"));
157+
REQUIRE_NOTHROW(
158+
db.run_import(options, "w21 v2 dD\n"
159+
"r30 v3 dV Ttype=route,ref=X11 Mw20@,w22@\n"));
158160

159161
CHECK(2 == conn.get_count("osm2pgsql_test_highways"));
160162
CHECK(1 == conn.get_count("osm2pgsql_test_routes"));
@@ -169,7 +171,7 @@ TEST_CASE("relation data on ways")
169171
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,22'"));
170172

171173
// delete the relation, leaving two ways
172-
REQUIRE_NOTHROW(db.run_import(options.append(), "r30 v4 dD\n"));
174+
REQUIRE_NOTHROW(db.run_import(options, "r30 v4 dD\n"));
173175

174176
CHECK(2 == conn.get_count("osm2pgsql_test_highways"));
175177
CHECK(0 == conn.get_count("osm2pgsql_test_routes"));
@@ -185,10 +187,8 @@ TEST_CASE("relation data on ways")
185187

186188
TEST_CASE("relation data on ways: delete or re-tag relation")
187189
{
188-
testing::opt_t options = testing::opt_t()
189-
.slim()
190-
.flex("test_output_flex_extra.lua")
191-
.srs(PROJ_LATLONG);
190+
options_t options =
191+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
192192

193193
// create database with three ways and a relation on two of them
194194
REQUIRE_NOTHROW(
@@ -218,15 +218,17 @@ TEST_CASE("relation data on ways: delete or re-tag relation")
218218

219219
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
220220

221+
options.append = true;
222+
221223
SECTION("delete relation")
222224
{
223-
REQUIRE_NOTHROW(db.run_import(options.append(), "r30 v2 dD\n"));
225+
REQUIRE_NOTHROW(db.run_import(options, "r30 v2 dD\n"));
224226
}
225227

226228
SECTION("change tags on relation")
227229
{
228-
REQUIRE_NOTHROW(db.run_import(options.append(),
229-
"r30 v2 dV Ttype=foo Mw20@,w21@\n"));
230+
REQUIRE_NOTHROW(
231+
db.run_import(options, "r30 v2 dV Ttype=foo Mw20@,w21@\n"));
230232
}
231233

232234
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
@@ -245,10 +247,8 @@ TEST_CASE("relation data on ways: delete or re-tag relation")
245247

246248
TEST_CASE("relation data on ways: delete way in other relation")
247249
{
248-
testing::opt_t options = testing::opt_t()
249-
.slim()
250-
.flex("test_output_flex_extra.lua")
251-
.srs(PROJ_LATLONG);
250+
options_t options =
251+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
252252

253253
// create database with three ways and two relations on them
254254
REQUIRE_NOTHROW(
@@ -280,23 +280,23 @@ TEST_CASE("relation data on ways: delete way in other relation")
280280
CHECK(0 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
281281
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '21,22'"));
282282

283+
options.append = true;
284+
283285
SECTION("change way node list")
284286
{
285-
REQUIRE_NOTHROW(db.run_import(options.append(),
286-
"w20 v2 dV Thighway=primary Nn10,n11\n"));
287+
REQUIRE_NOTHROW(
288+
db.run_import(options, "w20 v2 dV Thighway=primary Nn10,n11\n"));
287289
}
288290

289291
SECTION("change way tags")
290292
{
291293
REQUIRE_NOTHROW(db.run_import(
292-
options.append(),
293-
"w20 v2 dV Thighway=primary,name=foo Nn10,n11,n12\n"));
294+
options, "w20 v2 dV Thighway=primary,name=foo Nn10,n11,n12\n"));
294295
}
295296

296297
SECTION("change way node")
297298
{
298-
REQUIRE_NOTHROW(
299-
db.run_import(options.append(), "n10 v2 dV x11.0 y10.0\n"));
299+
REQUIRE_NOTHROW(db.run_import(options, "n10 v2 dV x11.0 y10.0\n"));
300300
}
301301

302302
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
@@ -314,12 +314,11 @@ TEST_CASE("relation data on ways: delete way in other relation")
314314
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '21,22'"));
315315
}
316316

317-
TEST_CASE("relation data on ways: changing things in one relation should not change output")
317+
TEST_CASE("relation data on ways: changing things in one relation should not "
318+
"change output")
318319
{
319-
testing::opt_t options = testing::opt_t()
320-
.slim()
321-
.flex("test_output_flex_extra.lua")
322-
.srs(PROJ_LATLONG);
320+
options_t options =
321+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
323322

324323
// create database with three ways and two relations on them
325324
REQUIRE_NOTHROW(
@@ -352,29 +351,29 @@ TEST_CASE("relation data on ways: changing things in one relation should not cha
352351
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
353352
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '21,22'"));
354353

354+
options.append = true;
355+
355356
SECTION("new version of relation")
356357
{
357358
REQUIRE_NOTHROW(db.run_import(
358-
options.append(), "r30 v2 dV Ttype=route,ref=Y11 Mw20@,w21@\n"));
359+
options, "r30 v2 dV Ttype=route,ref=Y11 Mw20@,w21@\n"));
359360
}
360361

361362
SECTION("change way node list")
362363
{
363-
REQUIRE_NOTHROW(db.run_import(options.append(),
364-
"w20 v2 dV Thighway=primary Nn10,n11\n"));
364+
REQUIRE_NOTHROW(
365+
db.run_import(options, "w20 v2 dV Thighway=primary Nn10,n11\n"));
365366
}
366367

367368
SECTION("change way tags")
368369
{
369370
REQUIRE_NOTHROW(db.run_import(
370-
options.append(),
371-
"w20 v2 dV Thighway=primary,name=foo Nn10,n11,n12\n"));
371+
options, "w20 v2 dV Thighway=primary,name=foo Nn10,n11,n12\n"));
372372
}
373373

374374
SECTION("change way node")
375375
{
376-
REQUIRE_NOTHROW(
377-
db.run_import(options.append(), "n10 v2 dV x11.0 y10.0\n"));
376+
REQUIRE_NOTHROW(db.run_import(options, "n10 v2 dV x11.0 y10.0\n"));
378377
}
379378

380379
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
@@ -395,10 +394,8 @@ TEST_CASE("relation data on ways: changing things in one relation should not cha
395394

396395
TEST_CASE("relation data on ways: change relation (two rels)")
397396
{
398-
testing::opt_t options = testing::opt_t()
399-
.slim()
400-
.flex("test_output_flex_extra.lua")
401-
.srs(PROJ_LATLONG);
397+
options_t options =
398+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
402399

403400
// create database with three ways and two relations on them
404401
REQUIRE_NOTHROW(
@@ -431,8 +428,10 @@ TEST_CASE("relation data on ways: change relation (two rels)")
431428
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
432429
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '21,22'"));
433430

434-
REQUIRE_NOTHROW(db.run_import(
435-
options.append(), "r30 v2 dV Ttype=route,ref=Z11 Mw20@,w21@\n"));
431+
options.append = true;
432+
433+
REQUIRE_NOTHROW(
434+
db.run_import(options, "r30 v2 dV Ttype=route,ref=Z11 Mw20@,w21@\n"));
436435

437436
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
438437
CHECK(2 == conn.get_count("osm2pgsql_test_routes"));
@@ -452,25 +451,23 @@ TEST_CASE("relation data on ways: change relation (two rels)")
452451

453452
TEST_CASE("relation data on ways: change relation (three rels)")
454453
{
455-
testing::opt_t options = testing::opt_t()
456-
.slim()
457-
.flex("test_output_flex_extra.lua")
458-
.srs(PROJ_LATLONG);
454+
options_t options =
455+
testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
459456

460457
// create database with three ways and two relations on them
461-
REQUIRE_NOTHROW(
462-
db.run_import(options, "n10 v1 dV x10.0 y10.0\n"
463-
"n11 v1 dV x10.0 y10.2\n"
464-
"n12 v1 dV x10.2 y10.2\n"
465-
"n13 v1 dV x10.2 y10.0\n"
466-
"n14 v1 dV x10.3 y10.0\n"
467-
"n15 v1 dV x10.4 y10.0\n"
468-
"w20 v1 dV Thighway=primary Nn10,n11,n12\n"
469-
"w21 v1 dV Thighway=secondary Nn12,n13\n"
470-
"w22 v1 dV Thighway=secondary Nn13,n14,n15\n"
471-
"r30 v1 dV Ttype=route,ref=Y11 Mw20@,w21@\n"
472-
"r31 v1 dV Ttype=route,ref=X11 Mw21@,w22@\n"
473-
"r32 v1 dV Ttype=route,ref=Z11 Mw22@\n"));
458+
REQUIRE_NOTHROW(db.run_import(options,
459+
"n10 v1 dV x10.0 y10.0\n"
460+
"n11 v1 dV x10.0 y10.2\n"
461+
"n12 v1 dV x10.2 y10.2\n"
462+
"n13 v1 dV x10.2 y10.0\n"
463+
"n14 v1 dV x10.3 y10.0\n"
464+
"n15 v1 dV x10.4 y10.0\n"
465+
"w20 v1 dV Thighway=primary Nn10,n11,n12\n"
466+
"w21 v1 dV Thighway=secondary Nn12,n13\n"
467+
"w22 v1 dV Thighway=secondary Nn13,n14,n15\n"
468+
"r30 v1 dV Ttype=route,ref=Y11 Mw20@,w21@\n"
469+
"r31 v1 dV Ttype=route,ref=X11 Mw21@,w22@\n"
470+
"r32 v1 dV Ttype=route,ref=Z11 Mw22@\n"));
474471

475472
auto conn = db.db().connect();
476473

@@ -490,26 +487,25 @@ TEST_CASE("relation data on ways: change relation (three rels)")
490487
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '21,22'"));
491488
CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '22'"));
492489

490+
options.append = true;
491+
493492
SECTION("change way node list")
494493
{
495-
REQUIRE_NOTHROW(db.run_import(options.append(),
496-
"w20 v2 dV Thighway=primary Nn10,n11\n"));
494+
REQUIRE_NOTHROW(
495+
db.run_import(options, "w20 v2 dV Thighway=primary Nn10,n11\n"));
497496
}
498497

499498
SECTION("change way tags")
500499
{
501500
REQUIRE_NOTHROW(db.run_import(
502-
options.append(),
503-
"w20 v2 dV Thighway=primary,name=foo Nn10,n11,n12\n"));
501+
options, "w20 v2 dV Thighway=primary,name=foo Nn10,n11,n12\n"));
504502
}
505503

506504
SECTION("change way node")
507505
{
508-
REQUIRE_NOTHROW(
509-
db.run_import(options.append(), "n10 v2 dV x11.0 y10.0\n"));
506+
REQUIRE_NOTHROW(db.run_import(options, "n10 v2 dV x11.0 y10.0\n"));
510507
}
511508

512-
513509
CHECK(3 == conn.get_count("osm2pgsql_test_highways"));
514510
CHECK(3 == conn.get_count("osm2pgsql_test_routes"));
515511

0 commit comments

Comments
 (0)