diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-19 08:17:26 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-02-19 08:17:26 +0100 |
| commit | 6963af728ef309bc147fd7448ffdbdca21c636ad (patch) | |
| tree | 9e49a7b998f27b5a11bff304461baa836212420a /test/unit | |
| parent | dc0b36898f984b8e32db2a40882218d9d85c28e8 (diff) | |
| parent | 942722214e0b94bd848dac21c8e21923cf9f1c04 (diff) | |
| download | PROJ-6963af728ef309bc147fd7448ffdbdca21c636ad.tar.gz PROJ-6963af728ef309bc147fd7448ffdbdca21c636ad.zip | |
Merge remote-tracking branch 'osgeo/master' into 6.0
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/gie_self_tests.cpp | 15 | ||||
| -rw-r--r-- | test/unit/pj_phi2_test.cpp | 4 | ||||
| -rw-r--r-- | test/unit/test_io.cpp | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp index 5936791e..ad637786 100644 --- a/test/unit/gie_self_tests.cpp +++ b/test/unit/gie_self_tests.cpp @@ -256,8 +256,8 @@ TEST_F(gieTest, proj_create_crs_to_crs) { b.xy.y = 5999669.3036037628; a = proj_trans(P, PJ_FWD, a); - EXPECT_NEAR(a.xy.x, b.xy.x, 1e-9); - EXPECT_NEAR(a.xy.y, b.xy.y, 1e-9); + EXPECT_NEAR(a.xy.x, b.xy.x, 1e-8); + EXPECT_NEAR(a.xy.y, b.xy.y, 1e-8); auto src = proj_get_source_crs(PJ_DEFAULT_CTX, P); ASSERT_TRUE(src != nullptr); @@ -419,11 +419,12 @@ TEST(gie, info_functions) { ASSERT_FALSE(proj_errno(P)); /* factors not created correctly */ /* check a few key characteristics of the Mercator projection */ - ASSERT_EQ(factors.angular_distortion, - 0.0); /* angular distortion should be 0 */ - ASSERT_EQ(factors.meridian_parallel_angle, - M_PI_2); /* Meridian/parallel angle should be 90 deg */ - ASSERT_EQ(factors.meridian_convergence, + EXPECT_NEAR(factors.angular_distortion, 0.0, 1e-7) + << factors.angular_distortion; /* angular distortion should be 0 */ + EXPECT_NEAR(factors.meridian_parallel_angle, M_PI_2, 1e-7) + << factors.meridian_parallel_angle; /* Meridian/parallel angle should be + 90 deg */ + EXPECT_EQ(factors.meridian_convergence, 0.0); /* meridian convergence should be 0 */ proj_destroy(P); diff --git a/test/unit/pj_phi2_test.cpp b/test/unit/pj_phi2_test.cpp index 5fc84600..c4db6e52 100644 --- a/test/unit/pj_phi2_test.cpp +++ b/test/unit/pj_phi2_test.cpp @@ -41,12 +41,12 @@ TEST(PjPhi2Test, Basic) { EXPECT_DOUBLE_EQ(M_PI_2, pj_phi2(ctx, 0.0, 0.0)); - EXPECT_DOUBLE_EQ(0.0, pj_phi2(ctx, 1.0, 0.0)); + EXPECT_NEAR(0.0, pj_phi2(ctx, 1.0, 0.0), 1e-16); EXPECT_DOUBLE_EQ(M_PI_2, pj_phi2(ctx, 0.0, 1.0)); EXPECT_DOUBLE_EQ(M_PI, pj_phi2(ctx, -1.0, 0.0)); EXPECT_DOUBLE_EQ(M_PI_2, pj_phi2(ctx, 0.0, -1.0)); - EXPECT_DOUBLE_EQ(0.0, pj_phi2(ctx, 1.0, 1.0)); + EXPECT_NEAR(0.0, pj_phi2(ctx, 1.0, 1.0), 1e-16); EXPECT_DOUBLE_EQ(M_PI, pj_phi2(ctx, -1.0, -1.0)); // TODO(schwehr): M_PI_4, M_PI_2, M_PI, M_E diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 2cc05aad..3d015e0c 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -6773,7 +6773,7 @@ TEST(io, projparse_longlat_a_es) { ASSERT_TRUE(crs != nullptr); EXPECT_EQ(crs->ellipsoid()->semiMajorAxis().getSIValue(), 2); auto rf = crs->ellipsoid()->computedInverseFlattening(); - EXPECT_EQ(rf, 3.4142135623730958) << rf; + EXPECT_NEAR(rf, 3.4142135623730958, 1e-14) << rf; } // --------------------------------------------------------------------------- |