diff options
Diffstat (limited to 'gfx/tests/gtest')
| -rw-r--r-- | gfx/tests/gtest/TestMoz2D.cpp | 11 | ||||
| -rw-r--r-- | gfx/tests/gtest/TestPoint.cpp | 98 | ||||
| -rw-r--r-- | gfx/tests/gtest/moz.build | 10 |
3 files changed, 101 insertions, 18 deletions
diff --git a/gfx/tests/gtest/TestMoz2D.cpp b/gfx/tests/gtest/TestMoz2D.cpp index 50854cdc98..2859f94b20 100644 --- a/gfx/tests/gtest/TestMoz2D.cpp +++ b/gfx/tests/gtest/TestMoz2D.cpp @@ -6,7 +6,6 @@ #include "gtest/gtest.h" #include "TestBase.h" -#include "TestPoint.h" #include "TestScaling.h" #include "TestBugs.h" @@ -20,16 +19,6 @@ TEST(Moz2D, Bugs) ASSERT_EQ(failures, 0); } -TEST(Moz2D, Point) -{ - TestBase* test = new TestPoint(); - int failures = 0; - test->RunTests(&failures); - delete test; - - ASSERT_EQ(failures, 0); -} - TEST(Moz2D, Scaling) { TestBase* test = new TestScaling(); diff --git a/gfx/tests/gtest/TestPoint.cpp b/gfx/tests/gtest/TestPoint.cpp new file mode 100644 index 0000000000..9a77c8908d --- /dev/null +++ b/gfx/tests/gtest/TestPoint.cpp @@ -0,0 +1,98 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "gtest/gtest.h" +#include <cmath> + +#include "BasePoint.h" +#include "Units.h" +#include "Point.h" + +using mozilla::CSSCoord; +using mozilla::CSSIntCoord; +using mozilla::CSSIntPoint; +using mozilla::CSSPixel; +using mozilla::gfx::CoordTyped; +using mozilla::gfx::FloatType_t; +using mozilla::gfx::IntCoordTyped; +using mozilla::gfx::IntPointTyped; +using mozilla::gfx::PointTyped; +using mozilla::gfx::UnknownUnits; + +TEST(Gfx, TestCSSIntPointLength) +{ + CSSIntPoint testPnt(1, 1); + float res = testPnt.Length(); + + float epsilon = 0.001f; + constexpr float sqrtOfTwo = 1.414; + float diff = std::abs(res - sqrtOfTwo); + EXPECT_LT(diff, epsilon); +} + +TEST(Gfx, TestPointAddition) +{ + PointTyped<CSSPixel> a, b; + a.x = 2; + a.y = 2; + b.x = 5; + b.y = -5; + + a += b; + + EXPECT_EQ(a.x, 7.f); + EXPECT_EQ(a.y, -3.f); +} + +TEST(Gfx, TestPointSubtraction) +{ + PointTyped<CSSPixel> a, b; + a.x = 2; + a.y = 2; + b.x = 5; + b.y = -5; + + a -= b; + + EXPECT_EQ(a.x, -3.f); + EXPECT_EQ(a.y, 7.f); +} + +TEST(Gfx, TestPointRoundToMultiple) +{ + const int32_t roundTo = 2; + + IntPointTyped<CSSPixel> p(478, -394); + EXPECT_EQ(p.RoundedToMultiple(roundTo), p); + + IntPointTyped<CSSPixel> p2(478, 393); + EXPECT_NE(p2.RoundedToMultiple(roundTo), p2); +} + +TEST(Gfx, TestFloatTypeMeta) +{ + // TODO: Should int64_t's FloatType be double instead? + static_assert(std::is_same_v<FloatType_t<int64_t>, float>, + "The FloatType of an integer type should be float"); + static_assert(std::is_same_v<FloatType_t<int32_t>, float>, + "The FloatType of an integer type should be float"); + static_assert( + std::is_same_v<FloatType_t<float>, float>, + "The FloatType of a floating-point type should be the given type"); + static_assert( + std::is_same_v<FloatType_t<double>, double>, + "The FloatType of a floating-point type should be the given type"); + static_assert( + std::is_same_v<FloatType_t<IntCoordTyped<UnknownUnits, int32_t>>, + CoordTyped<UnknownUnits, float>>, + "The FloatType of an IntCoordTyped<Units, Rep> should be " + "CoordTyped<Units, float>"); + static_assert( + std::is_same_v<FloatType_t<CoordTyped<UnknownUnits, long double>>, + CoordTyped<UnknownUnits, long double>>, + "The FloatType of a CoordTyped<Units, Rep> should be " + "CoordTyped<Units, Rep>"); +} diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build index 7c79a84163..3ef2b7bc0e 100644 --- a/gfx/tests/gtest/moz.build +++ b/gfx/tests/gtest/moz.build @@ -17,6 +17,7 @@ UNIFIED_SOURCES += [ "TestGfxWidgets.cpp", "TestMatrix.cpp", "TestMoz2D.cpp", + "TestPoint.cpp", "TestPolygon.cpp", "TestQcms.cpp", "TestRegion.cpp", @@ -24,14 +25,9 @@ UNIFIED_SOURCES += [ "TestSwizzle.cpp", "TestTextures.cpp", "TestTreeTraversal.cpp", + "TestVsync.cpp", ] -# skip the test on windows10-aarch64 due to perma-crash - bug 1544961 -if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"): - UNIFIED_SOURCES += [ - "TestVsync.cpp", - ] - if CONFIG["OS_TARGET"] != "Android": UNIFIED_SOURCES += [ "TestRect.cpp", @@ -43,7 +39,6 @@ UNIFIED_SOURCES += [ "TestBase.cpp", "TestBugs.cpp", "TestCairo.cpp", - "TestPoint.cpp", "TestScaling.cpp", ] ] @@ -70,6 +65,7 @@ LOCAL_INCLUDES += [ "/gfx/layers", "/gfx/ots/src", "/gfx/qcms", + "/layout/base", ] FINAL_LIBRARY = "xul-gtest" |