57ee5a9d0d
## Summary of the Pull Request Introduces convenience type `til::size` which automatically implements our best practices for size-related types and provides automatic conversions in/out of the relevant types. ## PR Checklist * [x] In support of Differental Rendering #778 * [X] I work here. * [x] Tests added/passed * [x] I'm a core contributor. ## Detailed Description of the Pull Request / Additional comments - Automatically converts in from anything with a X/Y (console `COORD`) or cx/cy (Win32 `SIZE`) - Automatically converts out to `COORD`, `SIZE`, or `D2D1_SIZE_F`. - Constructs from bare integers written into source file - Default constructs to empty - Uses Chromium Math for all basic math operations (+, -, *, /) - Provides equality tests - Adds initial proposal for division-to-ceiling (round up division) that attempts to `ceil` without any floating point math. - Accessors for height/width - Type converting accessors (that use safe conversions and throw) for height/width - Convenience function for area calculation (as that's common with type) and uses safe math to do it. - TAEF/WEX Output and Comparators so they will print very nicely with `VERIFY` and `Log` macros in our testing suite. ## Validation Steps Performed - See automated tests of functionality.
495 lines
15 KiB
C++
495 lines
15 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "precomp.h"
|
|
|
|
#include "til/size.h"
|
|
|
|
using namespace WEX::Common;
|
|
using namespace WEX::Logging;
|
|
using namespace WEX::TestExecution;
|
|
|
|
class SizeTests
|
|
{
|
|
TEST_CLASS(SizeTests);
|
|
|
|
TEST_METHOD(DefaultConstruct)
|
|
{
|
|
const til::size sz;
|
|
VERIFY_ARE_EQUAL(0, sz._width);
|
|
VERIFY_ARE_EQUAL(0, sz._height);
|
|
}
|
|
|
|
TEST_METHOD(RawConstruct)
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
VERIFY_ARE_EQUAL(5, sz._width);
|
|
VERIFY_ARE_EQUAL(10, sz._height);
|
|
}
|
|
|
|
TEST_METHOD(UnsignedConstruct)
|
|
{
|
|
Log::Comment(L"0.) Normal unsigned construct.");
|
|
{
|
|
const size_t width = 5;
|
|
const size_t height = 10;
|
|
|
|
const til::size sz{ width, height };
|
|
VERIFY_ARE_EQUAL(5, sz._width);
|
|
VERIFY_ARE_EQUAL(10, sz._height);
|
|
}
|
|
|
|
Log::Comment(L"1.) Unsigned construct overflow on width.");
|
|
{
|
|
constexpr size_t width = std::numeric_limits<size_t>().max();
|
|
const size_t height = 10;
|
|
|
|
auto fn = [&]() {
|
|
til::size sz{ width, height };
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
|
|
Log::Comment(L"2.) Unsigned construct overflow on height.");
|
|
{
|
|
constexpr size_t height = std::numeric_limits<size_t>().max();
|
|
const size_t width = 10;
|
|
|
|
auto fn = [&]() {
|
|
til::size sz{ width, height };
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(SignedConstruct)
|
|
{
|
|
const ptrdiff_t width = -5;
|
|
const ptrdiff_t height = -10;
|
|
|
|
const til::size sz{ width, height };
|
|
VERIFY_ARE_EQUAL(width, sz._width);
|
|
VERIFY_ARE_EQUAL(height, sz._height);
|
|
}
|
|
|
|
TEST_METHOD(CoordConstruct)
|
|
{
|
|
COORD coord{ -5, 10 };
|
|
|
|
const til::size sz{ coord };
|
|
VERIFY_ARE_EQUAL(coord.X, sz._width);
|
|
VERIFY_ARE_EQUAL(coord.Y, sz._height);
|
|
}
|
|
|
|
TEST_METHOD(SizeConstruct)
|
|
{
|
|
SIZE size{ 5, -10 };
|
|
|
|
const til::size sz{ size };
|
|
VERIFY_ARE_EQUAL(size.cx, sz._width);
|
|
VERIFY_ARE_EQUAL(size.cy, sz._height);
|
|
}
|
|
|
|
TEST_METHOD(Equality)
|
|
{
|
|
Log::Comment(L"0.) Equal.");
|
|
{
|
|
const til::size s1{ 5, 10 };
|
|
const til::size s2{ 5, 10 };
|
|
VERIFY_IS_TRUE(s1 == s2);
|
|
}
|
|
|
|
Log::Comment(L"1.) Left Width changed.");
|
|
{
|
|
const til::size s1{ 4, 10 };
|
|
const til::size s2{ 5, 10 };
|
|
VERIFY_IS_FALSE(s1 == s2);
|
|
}
|
|
|
|
Log::Comment(L"2.) Right Width changed.");
|
|
{
|
|
const til::size s1{ 5, 10 };
|
|
const til::size s2{ 6, 10 };
|
|
VERIFY_IS_FALSE(s1 == s2);
|
|
}
|
|
|
|
Log::Comment(L"3.) Left Height changed.");
|
|
{
|
|
const til::size s1{ 5, 9 };
|
|
const til::size s2{ 5, 10 };
|
|
VERIFY_IS_FALSE(s1 == s2);
|
|
}
|
|
|
|
Log::Comment(L"4.) Right Height changed.");
|
|
{
|
|
const til::size s1{ 5, 10 };
|
|
const til::size s2{ 5, 11 };
|
|
VERIFY_IS_FALSE(s1 == s2);
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(Inequality)
|
|
{
|
|
Log::Comment(L"0.) Equal.");
|
|
{
|
|
const til::size s1{ 5, 10 };
|
|
const til::size s2{ 5, 10 };
|
|
VERIFY_IS_FALSE(s1 != s2);
|
|
}
|
|
|
|
Log::Comment(L"1.) Left Width changed.");
|
|
{
|
|
const til::size s1{ 4, 10 };
|
|
const til::size s2{ 5, 10 };
|
|
VERIFY_IS_TRUE(s1 != s2);
|
|
}
|
|
|
|
Log::Comment(L"2.) Right Width changed.");
|
|
{
|
|
const til::size s1{ 5, 10 };
|
|
const til::size s2{ 6, 10 };
|
|
VERIFY_IS_TRUE(s1 != s2);
|
|
}
|
|
|
|
Log::Comment(L"3.) Left Height changed.");
|
|
{
|
|
const til::size s1{ 5, 9 };
|
|
const til::size s2{ 5, 10 };
|
|
VERIFY_IS_TRUE(s1 != s2);
|
|
}
|
|
|
|
Log::Comment(L"4.) Right Height changed.");
|
|
{
|
|
const til::size s1{ 5, 10 };
|
|
const til::size s2{ 5, 11 };
|
|
VERIFY_IS_TRUE(s1 != s2);
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(Addition)
|
|
{
|
|
Log::Comment(L"0.) Addition of two things that should be in bounds.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
const til::size sz2{ 23, 47 };
|
|
|
|
const til::size expected{ sz.width() + sz2.width(), sz.height() + sz2.height() };
|
|
|
|
VERIFY_ARE_EQUAL(expected, sz + sz2);
|
|
}
|
|
|
|
Log::Comment(L"1.) Addition results in value that is too large (width).");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ bigSize, static_cast<ptrdiff_t>(0) };
|
|
const til::size sz2{ 1, 1 };
|
|
|
|
auto fn = [&]() {
|
|
sz + sz2;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
|
|
Log::Comment(L"2.) Addition results in value that is too large (height).");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ static_cast<ptrdiff_t>(0), bigSize };
|
|
const til::size sz2{ 1, 1 };
|
|
|
|
auto fn = [&]() {
|
|
sz + sz2;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(Subtraction)
|
|
{
|
|
Log::Comment(L"0.) Subtraction of two things that should be in bounds.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
const til::size sz2{ 23, 47 };
|
|
|
|
const til::size expected{ sz.width() - sz2.width(), sz.height() - sz2.height() };
|
|
|
|
VERIFY_ARE_EQUAL(expected, sz - sz2);
|
|
}
|
|
|
|
Log::Comment(L"1.) Subtraction results in value that is too small (width).");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ bigSize, static_cast<ptrdiff_t>(0) };
|
|
const til::size sz2{ -2, -2 };
|
|
|
|
auto fn = [&]() {
|
|
sz2 - sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
|
|
Log::Comment(L"2.) Subtraction results in value that is too small (height).");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ static_cast<ptrdiff_t>(0), bigSize };
|
|
const til::size sz2{ -2, -2 };
|
|
|
|
auto fn = [&]() {
|
|
sz2 - sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(Multiplication)
|
|
{
|
|
Log::Comment(L"0.) Multiplication of two things that should be in bounds.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
const til::size sz2{ 23, 47 };
|
|
|
|
const til::size expected{ sz.width() * sz2.width(), sz.height() * sz2.height() };
|
|
|
|
VERIFY_ARE_EQUAL(expected, sz * sz2);
|
|
}
|
|
|
|
Log::Comment(L"1.) Multiplication results in value that is too large (width).");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ bigSize, static_cast<ptrdiff_t>(0) };
|
|
const til::size sz2{ 10, 10 };
|
|
|
|
auto fn = [&]() {
|
|
sz* sz2;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
|
|
Log::Comment(L"2.) Multiplication results in value that is too large (height).");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ static_cast<ptrdiff_t>(0), bigSize };
|
|
const til::size sz2{ 10, 10 };
|
|
|
|
auto fn = [&]() {
|
|
sz* sz2;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(Division)
|
|
{
|
|
Log::Comment(L"0.) Division of two things that should be in bounds.");
|
|
{
|
|
const til::size sz{ 555, 510 };
|
|
const til::size sz2{ 23, 47 };
|
|
|
|
const til::size expected{ sz.width() / sz2.width(), sz.height() / sz2.height() };
|
|
|
|
VERIFY_ARE_EQUAL(expected, sz / sz2);
|
|
}
|
|
|
|
Log::Comment(L"1.) Division by zero");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ bigSize, static_cast<ptrdiff_t>(0) };
|
|
const til::size sz2{ 1, 1 };
|
|
|
|
auto fn = [&]() {
|
|
sz2 / sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(DivisionRoundingUp)
|
|
{
|
|
Log::Comment(L"1.) Division rounding up with positive result.");
|
|
{
|
|
const til::size sz{ 10, 5 };
|
|
const til::size divisor{ 3, 2 };
|
|
|
|
// 10 / 3 is 3.333, rounded up is 4.
|
|
// 5 / 2 is 2.5, rounded up is 3.
|
|
const til::size expected{ 4, 3 };
|
|
|
|
VERIFY_ARE_EQUAL(expected, sz.divide_ceil(divisor));
|
|
}
|
|
|
|
Log::Comment(L"2.) Division rounding larger(up) with negative result.");
|
|
{
|
|
const til::size sz{ -10, -5 };
|
|
const til::size divisor{ 3, 2 };
|
|
|
|
// -10 / 3 is -3.333, rounded up is -4.
|
|
// -5 / 2 is -2.5, rounded up is -3.
|
|
const til::size expected{ -4, -3 };
|
|
|
|
VERIFY_ARE_EQUAL(expected, sz.divide_ceil(divisor));
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(Width)
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
VERIFY_ARE_EQUAL(sz._width, sz.width());
|
|
}
|
|
|
|
TEST_METHOD(WidthCast)
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
VERIFY_ARE_EQUAL(static_cast<SHORT>(sz._width), sz.width<SHORT>());
|
|
}
|
|
|
|
TEST_METHOD(Height)
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
VERIFY_ARE_EQUAL(sz._height, sz.height());
|
|
}
|
|
|
|
TEST_METHOD(HeightCast)
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
VERIFY_ARE_EQUAL(static_cast<SHORT>(sz._height), sz.height<SHORT>());
|
|
}
|
|
|
|
TEST_METHOD(Area)
|
|
{
|
|
Log::Comment(L"0.) Area of two things that should be in bounds.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
VERIFY_ARE_EQUAL(sz._width * sz._height, sz.area());
|
|
}
|
|
|
|
Log::Comment(L"1.) Area is out of bounds on multiplication.");
|
|
{
|
|
constexpr ptrdiff_t bigSize = std::numeric_limits<ptrdiff_t>().max();
|
|
const til::size sz{ bigSize, bigSize };
|
|
|
|
auto fn = [&]() {
|
|
sz.area();
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(CastToCoord)
|
|
{
|
|
Log::Comment(L"0.) Typical situation.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
COORD val = sz;
|
|
VERIFY_ARE_EQUAL(5, val.X);
|
|
VERIFY_ARE_EQUAL(10, val.Y);
|
|
}
|
|
|
|
Log::Comment(L"1.) Overflow on width.");
|
|
{
|
|
constexpr ptrdiff_t width = std::numeric_limits<ptrdiff_t>().max();
|
|
const ptrdiff_t height = 10;
|
|
const til::size sz{ width, height };
|
|
|
|
auto fn = [&]() {
|
|
COORD val = sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
|
|
Log::Comment(L"2.) Overflow on height.");
|
|
{
|
|
constexpr ptrdiff_t height = std::numeric_limits<ptrdiff_t>().max();
|
|
const ptrdiff_t width = 10;
|
|
const til::size sz{ width, height };
|
|
|
|
auto fn = [&]() {
|
|
COORD val = sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(CastToSize)
|
|
{
|
|
Log::Comment(L"0.) Typical situation.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
SIZE val = sz;
|
|
VERIFY_ARE_EQUAL(5, val.cx);
|
|
VERIFY_ARE_EQUAL(10, val.cy);
|
|
}
|
|
|
|
Log::Comment(L"1.) Fit max width into SIZE (may overflow).");
|
|
{
|
|
constexpr ptrdiff_t width = std::numeric_limits<ptrdiff_t>().max();
|
|
const ptrdiff_t height = 10;
|
|
const til::size sz{ width, height };
|
|
|
|
// On some platforms, ptrdiff_t will fit inside cx/cy
|
|
const bool overflowExpected = width > std::numeric_limits<decltype(SIZE::cx)>().max();
|
|
|
|
if (overflowExpected)
|
|
{
|
|
auto fn = [&]() {
|
|
SIZE val = sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
else
|
|
{
|
|
SIZE val = sz;
|
|
VERIFY_ARE_EQUAL(width, val.cx);
|
|
}
|
|
}
|
|
|
|
Log::Comment(L"2.) Fit max height into SIZE (may overflow).");
|
|
{
|
|
constexpr ptrdiff_t height = std::numeric_limits<ptrdiff_t>().max();
|
|
const ptrdiff_t width = 10;
|
|
const til::size sz{ width, height };
|
|
|
|
// On some platforms, ptrdiff_t will fit inside cx/cy
|
|
const bool overflowExpected = height > std::numeric_limits<decltype(SIZE::cy)>().max();
|
|
|
|
if (overflowExpected)
|
|
{
|
|
auto fn = [&]() {
|
|
SIZE val = sz;
|
|
};
|
|
|
|
VERIFY_THROWS_SPECIFIC(fn(), wil::ResultException, [](wil::ResultException& e) { return e.GetErrorCode() == E_ABORT; });
|
|
}
|
|
else
|
|
{
|
|
SIZE val = sz;
|
|
VERIFY_ARE_EQUAL(height, val.cy);
|
|
}
|
|
}
|
|
}
|
|
|
|
TEST_METHOD(CastToD2D1SizeF)
|
|
{
|
|
Log::Comment(L"0.) Typical situation.");
|
|
{
|
|
const til::size sz{ 5, 10 };
|
|
D2D1_SIZE_F val = sz;
|
|
VERIFY_ARE_EQUAL(5, val.width);
|
|
VERIFY_ARE_EQUAL(10, val.height);
|
|
}
|
|
|
|
// All ptrdiff_ts fit into a float, so there's no exception tests.
|
|
}
|
|
};
|