Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickbr @lehmann-4178656ch
patrickbr authored and lehmann-4178656ch committed Oct 18, 2024
1 parent 8e72ba0 commit a1de9d8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions tests/issues/Issue15.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ TEST(Issue15, Relation_8291361_expected) {
ASSERT_THAT(printedState,
::testing::HasSubstr("relations seen:1 dumped: 1 geometry: 0\n"));
ASSERT_THAT(printedState,
::testing::HasSubstr("ways seen:47 dumped: 1 geometry: 0\n"));
::testing::HasSubstr("ways seen:47 dumped: 47 geometry: 0\n"));
const auto printedData = coutBuffer.str();
ASSERT_THAT(
printedData,
Expand Down Expand Up @@ -115,7 +115,7 @@ TEST(Issue15, Relation_8291361_failed) {
ASSERT_THAT(printedState,
::testing::HasSubstr("relations seen:1 dumped: 1 geometry: 0\n"));
ASSERT_THAT(printedState,
::testing::HasSubstr("ways seen:47 dumped: 1 geometry: 0\n"));
::testing::HasSubstr("ways seen:47 dumped: 47 geometry: 0\n"));
const auto printedData = coutBuffer.str();
ASSERT_THAT(
printedData,
Expand Down
28 changes: 14 additions & 14 deletions tests/osm/OsmiumHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ TEST(OSM_OsmiumHandler, noFacts) {
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(0, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -221,7 +221,7 @@ TEST(OSM_OsmiumHandler, noGeometricRelations) {
ASSERT_EQ(2, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(0, oh.wayGeometriesHandled());

// Cleanup
Expand Down Expand Up @@ -260,8 +260,8 @@ TEST(OSM_OsmiumHandler, noAreaFacts) {
ASSERT_EQ(2, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -299,8 +299,8 @@ TEST(OSM_OsmiumHandler, noNodeFacts) {
ASSERT_EQ(2, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -338,8 +338,8 @@ TEST(OSM_OsmiumHandler, noRelationFacts) {
ASSERT_EQ(0, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -378,7 +378,7 @@ TEST(OSM_OsmiumHandler, noWayFacts) {
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(0, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -416,8 +416,8 @@ TEST(OSM_OsmiumHandler, noAreaGeometricRelations) {
ASSERT_EQ(2, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -455,8 +455,8 @@ TEST(OSM_OsmiumHandler, noNodeGeometricRelations) {
ASSERT_EQ(2, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(1, oh.wayGeometriesHandled());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(2, oh.wayGeometriesHandled());

// Cleanup
output.close();
Expand Down Expand Up @@ -494,7 +494,7 @@ TEST(OSM_OsmiumHandler, noWayGeometricRelations) {
ASSERT_EQ(2, oh.relationsDumped());
ASSERT_EQ(0, oh.relationGeometriesHandled());
ASSERT_EQ(2, oh.waysSeen());
ASSERT_EQ(1, oh.waysDumped());
ASSERT_EQ(2, oh.waysDumped());
ASSERT_EQ(0, oh.wayGeometriesHandled());

// Cleanup
Expand Down

0 comments on commit a1de9d8

Please sign in to comment.