Skip to content

BDD tests: replace sum step with table check with aggregate #2431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joto merged 1 commit into from
Nov 8, 2025
Merged

BDD tests: replace sum step with table check with aggregate #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 48 additions & 41 deletions tests/bdd/regression/import.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ Feature: Imports of the test database
When running osm2pgsql pgsql

Then table planet_osm_point has 1342 rows
And table planet_osm_line has 3231 rows
And table planet_osm_roads has 375 rows
And table planet_osm_polygon has 4130 rows

Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1247245186
And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1247245413
And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
And table planet_osm_polygon contains
| count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
| 4130 | 1247245186 | 1247245413 |
And table planet_osm_line contains
| count(*) | round(sum(ST_Length(way))) |
| 3231 | 4211350 |
And table planet_osm_roads contains
| count(*) | round(sum(ST_Length(way))) |
| 375 | 2032023 |

And there are no tables planet_osm_nodes, planet_osm_ways, planet_osm_rels

Expand All @@ -37,14 +38,15 @@ Feature: Imports of the test database
| <drop> |

Then table planet_osm_point has 1342 rows
And table planet_osm_line has 3231 rows
And table planet_osm_roads has 375 rows
And table planet_osm_polygon has 4130 rows

Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1247245186
And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1247245413
And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
And table planet_osm_polygon contains
| count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
| 4130 | 1247245186 | 1247245413 |
And table planet_osm_line contains
| count(*) | round(sum(ST_Length(way))) |
| 3231 | 4211350 |
And table planet_osm_roads contains
| count(*) | round(sum(ST_Length(way))) |
| 375 | 2032023 |

And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels

Expand All @@ -61,14 +63,15 @@ Feature: Imports of the test database
| <slim> |

Then table planet_osm_point has 1342 rows
And table planet_osm_line has 3231 rows
And table planet_osm_roads has 375 rows
And table planet_osm_polygon has 4136 rows

Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1272140688
And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1272140891
And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
And table planet_osm_polygon contains
| count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
| 4136 | 1272140688 | 1272140891 |
And table planet_osm_line contains
| count(*) | round(sum(ST_Length(way))) |
| 3231 | 4211350 |
And table planet_osm_roads contains
| count(*) | round(sum(ST_Length(way))) |
| 375 | 2032023 |

And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels

Expand Down Expand Up @@ -102,15 +105,18 @@ Feature: Imports of the test database
When running osm2pgsql pgsql with parameters
| --slim | -j |

Then table planet_osm_point has 1360 rows
And table planet_osm_line has 3254 rows
And table planet_osm_roads has 375 rows
And table planet_osm_polygon has 4131 rows

Then the sum of 'array_length(akeys(tags),1)' in table planet_osm_point is 4228
And the sum of 'array_length(akeys(tags),1)' in table planet_osm_roads is 2317
And the sum of 'array_length(akeys(tags),1)' in table planet_osm_line is 10387
And the sum of 'array_length(akeys(tags),1)' in table planet_osm_polygon is 9538
Then table planet_osm_point contains
| count(*) | sum(array_length(akeys(tags), 1)) |
| 1360 | 4228 |
Then table planet_osm_line contains
| count(*) | sum(array_length(akeys(tags), 1)) |
| 3254 | 10387 |
Then table planet_osm_roads contains
| count(*) | sum(array_length(akeys(tags), 1)) |
| 375 | 2317 |
Then table planet_osm_polygon contains
| count(*) | sum(array_length(akeys(tags), 1)) |
| 4131 | 9538 |


Scenario Outline: Import slim with various tweaks
Expand All @@ -121,14 +127,15 @@ Feature: Imports of the test database
| <param3> |

Then table planet_osm_point has 1342 rows
And table planet_osm_line has 3231 rows
And table planet_osm_roads has 375 rows
And table planet_osm_polygon has 4130 rows

Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1247245186
And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1247245413
And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
And table planet_osm_polygon contains
| count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
| 4130 | 1247245186 | 1247245413 |
And table planet_osm_line contains
| count(*) | round(sum(ST_Length(way))) |
| 3231 | 4211350 |
And table planet_osm_roads contains
| count(*) | round(sum(ST_Length(way))) |
| 375 | 2032023 |

And there are tables planet_osm_nodes, planet_osm_ways, planet_osm_rels

Expand Down
17 changes: 0 additions & 17 deletions tests/bdd/steps/steps_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,6 @@ def db_table_row_count(context, table, row_num, has_where):
f"Table {table}: expected {row_num} rows, got {actual}"


@then(r"the sum of '(?P<formula>.+)' in table (?P<table>.+) is (?P<result>\d+)(?P<has_where> with condition)?")
def db_table_sum_up(context, table, formula, result, has_where):
assert table_exists(context.db, table)

query = sql.SQL("SELECT round(sum({})) FROM {}")\
.format(sql.SQL(formula), sql.Identifier(*table.split('.', 2)))

if has_where:
query = sql.SQL("{} WHERE {}").format(query, sql.SQL(context.text))


actual = scalar(context.db, query)

assert actual == int(result),\
f"Table {table}: expected sum {result}, got {actual}"


@then("there (?:is|are) (?P<exists>no )?tables? (?P<tables>.+)")
def db_table_existance(context, exists, tables):
for table in tables.split(','):
Expand Down