diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-04 17:32:30 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-05 11:16:57 -0700 |
| commit | ce2a06e6773dfb656c7bf6fdbb7e8bc463710685 (patch) | |
| tree | d3939aca3d9378a87832f305f68e82bc1fa6fd89 /test | |
| parent | a81891771441dfc1c839b9d100368b6bbf1fc127 (diff) | |
| download | qtlocation-mapboxgl-ce2a06e6773dfb656c7bf6fdbb7e8bc463710685.tar.gz | |
[core] Privatize math.hpp and vec.hpp
Diffstat (limited to 'test')
| -rw-r--r-- | test/math/clamp.cpp | 24 | ||||
| -rw-r--r-- | test/math/minmax.cpp (renamed from test/util/math.cpp) | 8 | ||||
| -rw-r--r-- | test/test.gypi | 4 |
3 files changed, 28 insertions, 8 deletions
diff --git a/test/math/clamp.cpp b/test/math/clamp.cpp new file mode 100644 index 0000000000..2fdafae1b4 --- /dev/null +++ b/test/math/clamp.cpp @@ -0,0 +1,24 @@ +#include <mbgl/test/util.hpp> + +#include <mbgl/util/constants.hpp> +#include <mbgl/math/clamp.hpp> + +using namespace mbgl; + +TEST(Math, ClampFloatingPoint) { + double lowestValue = std::numeric_limits<double>::lowest(); + double maximumValue = std::numeric_limits<double>::max(); + double quietNAN = std::numeric_limits<double>::quiet_NaN(); + + ASSERT_DOUBLE_EQ(0., util::clamp(0., quietNAN, quietNAN)); + ASSERT_DOUBLE_EQ(0., util::clamp(0., lowestValue, maximumValue)); +} + +TEST(Math, ClampIntegral) { + int32_t lowestValue = std::numeric_limits<int32_t>::lowest(); + int32_t maximumValue = std::numeric_limits<int32_t>::max(); + int32_t quietNAN = std::numeric_limits<int32_t>::quiet_NaN(); + + ASSERT_EQ(0, util::clamp(0, quietNAN, quietNAN)); + ASSERT_EQ(0, util::clamp(0, lowestValue, maximumValue)); +} diff --git a/test/util/math.cpp b/test/math/minmax.cpp index c833ca41e2..2e3ebdc340 100644 --- a/test/util/math.cpp +++ b/test/math/minmax.cpp @@ -1,7 +1,7 @@ #include <mbgl/test/util.hpp> #include <mbgl/util/constants.hpp> -#include <mbgl/util/math.hpp> +#include <mbgl/math/minmax.hpp> using namespace mbgl; @@ -19,9 +19,6 @@ TEST(Math, MinMaxFloatingPoint) { ASSERT_DOUBLE_EQ(maximumValue, util::max(double(NAN), maximumValue)); ASSERT_DOUBLE_EQ(maximumValue, util::max(quietNAN, maximumValue)); ASSERT_DOUBLE_EQ(10., util::max(8., 9., 10.)); - - ASSERT_DOUBLE_EQ(0., util::clamp(0., quietNAN, quietNAN)); - ASSERT_DOUBLE_EQ(0., util::clamp(0., lowestValue, maximumValue)); } TEST(Math, MinMaxIntegral) { @@ -36,7 +33,4 @@ TEST(Math, MinMaxIntegral) { ASSERT_EQ(maximumValue, util::max(quietNAN, maximumValue)); ASSERT_EQ(10, util::max(8, 9, 10)); - - ASSERT_EQ(0, util::clamp(0, quietNAN, quietNAN)); - ASSERT_EQ(0, util::clamp(0, lowestValue, maximumValue)); } diff --git a/test/test.gypi b/test/test.gypi index 2326fd7cf9..1e136389e8 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -24,7 +24,6 @@ 'util/geo.cpp', 'util/image.cpp', 'util/mapbox.cpp', - 'util/math.cpp', 'util/merge_lines.cpp', 'util/run_loop.cpp', 'util/text_conversions.cpp', @@ -48,6 +47,9 @@ 'map/tile.cpp', 'map/transform.cpp', + 'math/minmax.cpp', + 'math/clamp.cpp', + 'storage/offline.cpp', 'storage/offline_database.cpp', 'storage/offline_download.cpp', |