From 401bd1c6439bd9d77d36643722e29cde94a30e61 Mon Sep 17 00:00:00 2001 From: xDraconian Date: Thu, 21 Dec 2017 13:38:29 -0600 Subject: [PATCH] Simgear::test_bucket code coverage Lines: 82.1% >> 98.7% Functions: 83.0% >> 100.0% No memory leaks --- simgear/bucket/test_bucket.cxx | 146 +++++++++++++++++++++++++-------- 1 file changed, 112 insertions(+), 34 deletions(-) diff --git a/simgear/bucket/test_bucket.cxx b/simgear/bucket/test_bucket.cxx index 81990069..fd292a7d 100644 --- a/simgear/bucket/test_bucket.cxx +++ b/simgear/bucket/test_bucket.cxx @@ -53,7 +53,7 @@ void testBasic() SG_CHECK_EQUAL(b1.gen_index(), 3040320); SG_CHECK_EQUAL(b1.gen_base_path(), "e000n50/e005n55"); SG_VERIFY(b1.isValid()); - + SGBucket b2(-10.1, -43.8); SG_CHECK_EQUAL(b2.get_chunk_lon(), -11); SG_CHECK_EQUAL(b2.get_chunk_lat(), -44); @@ -62,7 +62,7 @@ void testBasic() SG_CHECK_EQUAL(b2.get_y(), 1); SG_CHECK_EQUAL(b2.gen_base_path(), "w020s50/w011s44"); SG_VERIFY(b2.isValid()); - + SGBucket b3(123.48, 9.01); SG_CHECK_EQUAL(b3.get_chunk_lon(), 123); SG_CHECK_EQUAL(b3.get_chunk_lat(), 9); @@ -70,10 +70,10 @@ void testBasic() SG_CHECK_EQUAL(b3.get_y(), 0); SG_CHECK_EQUAL(b3.gen_base_path(), "e120n00/e123n09"); SG_VERIFY(b3.isValid()); - + SGBucket defBuck; SG_VERIFY(!defBuck.isValid()); - + b3.make_bad(); SG_VERIFY(!b3.isValid()); @@ -87,19 +87,47 @@ void testBasic() SG_CHECK_EQUAL(atAntiMeridian2.get_chunk_lon(), -180); SG_CHECK_EQUAL(atAntiMeridian2.get_x(), 0); -// check comparisom operator overload + // check comparison operator overload SGBucket b4(5.11, 55.1); SG_VERIFY(b1 == b4); // should be equal SG_VERIFY(b1 == b1); SG_VERIFY(b1 != defBuck); SG_VERIFY(b1 != b2); - -// check wrapping/clipping of inputs + + // check wrapping/clipping of inputs SGBucket wrapMeridian(-200.0, 45.0); SG_CHECK_EQUAL(wrapMeridian.get_chunk_lon(), 160); SGBucket clipPole(48.9, 91); SG_CHECK_EQUAL(clipPole.get_chunk_lat(), 89); + + // test override of a bucket's geod + auto geod = SGGeod::fromDegFt(-86.678, 36.1248, 599.0); +#ifndef NO_DEPRECATED_API + SGBucket bna_airport; + bna_airport.set_bucket(geod); +#else + SGBucket bna_airport(geod); +#endif + SG_VERIFY(bna_airport.isValid()); + SG_CHECK_EQUAL(bna_airport.get_chunk_lon(), -87); // left origin of the 1-degree chunk + SG_CHECK_EQUAL(bna_airport.get_chunk_lat(), 36); // bottom origin of the 1-degree chunk + SG_CHECK_EQUAL(bna_airport.get_x(), 1); // buckets are 0.25 deg wide at the W87 parallel + // we're 0.322 deg from the origin (second bucket) + SG_CHECK_EQUAL(bna_airport.get_y(), 0); // buckets are always 0.125 deg tall + // we're 0.1248 deg from the origin (first bucket) + SG_CHECK_EQUAL(bna_airport.gen_base_path(), "w090n30/w087n36"); + SG_CHECK_EQUAL_EP2(bna_airport.get_width_m(), 22479.1, 0.1); + SG_CHECK_EQUAL_EP2(bna_airport.get_height_m(), 13914.9, 0.1); + SG_CHECK_EQUAL(bna_airport.gen_index_str(), "1531777"); // 0x175F81 = b01011101|01111110|000|001 + // = 93-180 | 126-90 | 0 | 1 + // = -87 | 36 | 0 | 1 + + // test stream output + cout << "[TEST] BNA Airport: " << bna_airport << endl; + auto center = bna_airport.get_center(); + cout << "[TEST] BNA lon: " << center.getLongitudeDeg() << endl; + cout << "[TEST] BNA lat: " << center.getLatitudeDeg() << endl; } void testPolar() @@ -110,17 +138,17 @@ void testPolar() SG_CHECK_EQUAL(b1.get_chunk_lon(), 0); SG_CHECK_EQUAL(b1.get_x(), 0); SG_CHECK_EQUAL(b1.get_y(), 7); - + SG_CHECK_EQUAL_EP(b1.get_highest_lat(), 90.0); SG_CHECK_EQUAL_EP(b1.get_width_m(), 10.0); - + SG_CHECK_EQUAL(b2.get_chunk_lat(), 89); SG_CHECK_EQUAL(b2.get_chunk_lon(), 0); SG_CHECK_EQUAL(b2.get_x(), 0); SG_CHECK_EQUAL(b2.get_y(), 7); - + SG_CHECK_EQUAL(b1.gen_index(), b2.gen_index()); - + SGGeod actualNorthPole1 = b1.get_corner(2); SGGeod actualNorthPole2 = b1.get_corner(3); SG_CHECK_EQUAL_EP(actualNorthPole1.getLatitudeDeg(), 90.0); @@ -131,11 +159,11 @@ void testPolar() SGBucket b3(-2, 89.88); SGBucket b4(-7, 89.88); SG_CHECK_EQUAL(b3.gen_index(), b4.gen_index()); - + // south pole SGBucket b5(-170, -89.88); SGBucket b6(-179, -89.88); - + SG_CHECK_EQUAL(b5.get_chunk_lat(), -90); SG_CHECK_EQUAL(b5.get_chunk_lon(), -180); SG_CHECK_EQUAL(b5.get_x(), 0); @@ -143,17 +171,16 @@ void testPolar() SG_CHECK_EQUAL(b5.gen_index(), b6.gen_index()); SG_CHECK_EQUAL_EP(b5.get_highest_lat(), -90.0); SG_CHECK_EQUAL_EP(b5.get_width_m(), 10.0); - + SGGeod actualSouthPole1 = b5.get_corner(0); SGGeod actualSouthPole2 = b5.get_corner(1); SG_CHECK_EQUAL_EP(actualSouthPole1.getLatitudeDeg(), -90.0); SG_CHECK_EQUAL_EP(actualSouthPole1.getLongitudeDeg(), -180); SG_CHECK_EQUAL_EP(actualSouthPole2.getLatitudeDeg(), -90.0); SG_CHECK_EQUAL_EP(actualSouthPole2.getLongitudeDeg(), -168); - + SGBucket b7(200, 89.88); SG_CHECK_EQUAL(b7.get_chunk_lon(), -168); - } // test the tiles just below the pole (between 86 & 89 degrees N/S) @@ -167,7 +194,7 @@ void testNearPolar() SGBucket b3(176.1, 88.5); SG_CHECK_EQUAL(b3.get_chunk_lon(), 176); - + SGBucket b4(-178, 88.5); SG_CHECK_EQUAL(b4.get_chunk_lon(), -180); } @@ -181,7 +208,7 @@ void testOffset() SG_CHECK_EQUAL(b1.get_chunk_lon(), -60); SG_CHECK_EQUAL(b1.get_x(), 1); SG_CHECK_EQUAL(b1.get_y(), 7); - + // offset vertically SGBucket b2(b1.sibling(0, 1)); SG_CHECK_EQUAL(b2.get_chunk_lat(), 22); @@ -190,7 +217,7 @@ void testOffset() SG_CHECK_EQUAL(b2.get_y(), 0); SG_CHECK_EQUAL(b2.gen_index(), sgBucketOffset(-59.8, 21.9, 0, 1)); - + // offset vertically and horizontally. We compute horizontal (x) // movement at the target latitude, so this should move 0.25 * -3 degrees, // NOT 0.125 * -3 degrees. @@ -199,7 +226,7 @@ void testOffset() SG_CHECK_EQUAL(b3.get_chunk_lon(), -61); SG_CHECK_EQUAL(b3.get_x(), 1); SG_CHECK_EQUAL(b3.get_y(), 0); - + SG_CHECK_EQUAL(b3.gen_index(), sgBucketOffset(-59.8, 21.9, -3, 1)); } @@ -210,40 +237,40 @@ void testPolarOffset() SG_CHECK_EQUAL(b1.get_chunk_lon(), -12); SG_CHECK_EQUAL(b1.get_x(), 0); SG_CHECK_EQUAL(b1.get_y(), 3); - + // offset horizontally SGBucket b2(b1.sibling(-2, 0)); SG_CHECK_EQUAL(b2.get_chunk_lat(), -90); SG_CHECK_EQUAL(b2.get_chunk_lon(), -36); SG_CHECK_EQUAL(b2.get_x(), 0); SG_CHECK_EQUAL(b2.get_y(), 3); - + SG_CHECK_EQUAL(b2.gen_index(), sgBucketOffset(-11.7, -89.6, -2, 0)); - -// offset and wrap + + // offset and wrap SGBucket b3(-170, 89.1); SGBucket b4(b3.sibling(-1, 0)); SG_CHECK_EQUAL(b4.get_chunk_lat(), 89); SG_CHECK_EQUAL(b4.get_chunk_lon(), 168); SG_CHECK_EQUAL(b4.get_x(), 0); SG_CHECK_EQUAL(b4.get_y(), 0); - + SG_CHECK_EQUAL(b4.gen_index(), sgBucketOffset(-170, 89.1, -1, 0)); - + SGBucket b5(177, 87.3); SGBucket b6(b5.sibling(1, 1)); SG_CHECK_EQUAL(b6.get_chunk_lat(), 87); SG_CHECK_EQUAL(b6.get_chunk_lon(), -180); SG_CHECK_EQUAL(b6.get_x(), 0); SG_CHECK_EQUAL(b6.get_y(), 3); - + SG_CHECK_EQUAL(b6.gen_index(), sgBucketOffset(177, 87.3, 1, 1)); // offset vertically towards the pole SGBucket b7(b1.sibling(0, -5)); SG_VERIFY(!b7.isValid()); - + SG_VERIFY(!SGBucket(0, 90).sibling(0, 1).isValid()); } @@ -256,29 +283,80 @@ void testOffsetWrap() SG_CHECK_EQUAL(b1.get_chunk_lon(), -180); SG_CHECK_EQUAL(b1.get_x(), 1); SG_CHECK_EQUAL(b1.get_y(), 6); - + SGBucket b2(b1.sibling(-2, 0)); SG_CHECK_EQUAL(b2.get_chunk_lat(), 16); SG_CHECK_EQUAL(b2.get_chunk_lon(), 179); SG_CHECK_EQUAL(b2.get_x(), 7); SG_CHECK_EQUAL(b2.get_y(), 6); SG_CHECK_EQUAL(b2.gen_index(), sgBucketOffset(-179.8, 16.8, -2, 0)); - - +} + +void testSiblings() +{ + SGBucket bna_airport(-86.678, 36.1248); + SG_VERIFY(bna_airport.isValid()); + + // retrieve the sibling two positions north-east of my position + auto sib1 = bna_airport.sibling(2, 2); + SG_CHECK_EQUAL(sib1.get_chunk_lon(), bna_airport.get_chunk_lon()); + SG_CHECK_EQUAL(sib1.get_chunk_lat(), bna_airport.get_chunk_lat()); + SG_CHECK_EQUAL(sib1.get_x(), 3); // my x-pos (1) + 2 = 3 + SG_CHECK_EQUAL(sib1.get_y(), 2); // my y-pos (0) + 2 = 2 + SG_CHECK_EQUAL(sib1.gen_base_path(), bna_airport.gen_base_path()); + + // retrieve the one sibling two positions to the north-east + std::vector siblings; + bna_airport.siblings(2, 2, siblings); + SG_CHECK_EQUAL(siblings.size(), static_cast::size_type>(1)); + siblings.clear(); + + // retrieve the one sibling at the chunk origin of sib1 + sib1.siblings(-2, -2, siblings); + SG_CHECK_EQUAL(siblings.size(), static_cast::size_type>(1)); + siblings.clear(); + + // calculate delta between two buckets + int dx = 0; + int dy = 0; + sgBucketDiff(bna_airport, sib1, &dx, &dy); + SG_CHECK_EQUAL(dx, 2); + SG_CHECK_EQUAL(dy, 2); + + // retrieve all siblings between two geodetic locations + auto geod_bna = SGGeod::fromDegFt(-86.678, 36.1248, 599.0); + auto geod_m54 = SGGeod::fromDegFt(-86.317, 36.1908, 122.0); + sgGetBuckets(geod_bna, geod_m54, siblings); + SG_CHECK_EQUAL(siblings.size(), static_cast::size_type>(4)); + siblings.clear(); + + // edge cases + + // ensure you cannot retrieve the sibling of an invalid bucket + SGBucket bad; + auto bad_sib = bad.sibling(1, 1); + SG_CHECK_EQUAL(bad_sib.get_chunk_lon(), -1000); + SG_CHECK_EQUAL(bad.siblings(2, 2, siblings), 0); + + // if we drop below the 22nd parallel, the bucket widths are half the size + // expect this to retrieve two buckets + bna_airport.siblings(0, -160, siblings); + SG_CHECK_EQUAL(siblings.size(), static_cast::size_type>(2)); + siblings.clear(); } int main(int argc, char* argv[]) { testBucketSpans(); - + testBasic(); testPolar(); testNearPolar(); testOffset(); testOffsetWrap(); testPolarOffset(); - + testSiblings(); + cout << "all tests passed OK" << endl; return 0; // passed } -