| Index: tests/FitsInTest.cpp
|
| diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp
|
| index 365d7ea3d4309cb8f7da3932cc11f2c014e36444..b66d53b51927d33b5fe48d9314643fcec6103aa0 100644
|
| --- a/tests/FitsInTest.cpp
|
| +++ b/tests/FitsInTest.cpp
|
| @@ -6,14 +6,15 @@
|
| */
|
|
|
| #include "Test.h"
|
| -
|
| +#include "TestClassDef.h"
|
| #include "SkTypes.h"
|
| #include "SkTFitsIn.h"
|
| +
|
| #include <limits>
|
|
|
| #define TEST(S, s, D, expected) REPORTER_ASSERT(reporter, (SkTFitsIn<D>((S)(s)) == (expected)))
|
|
|
| -static void FitsInTest(skiatest::Reporter* reporter) {
|
| +DEF_TEST(FitsIn, reporter) {
|
| TEST(int32_t, 1, int8_t, true);
|
| TEST(int32_t, -1, int8_t, true);
|
| TEST(int32_t, (int32_t)(std::numeric_limits<int8_t>::max)(), int8_t, true);
|
| @@ -67,6 +68,3 @@ static void FitsInTest(skiatest::Reporter* reporter) {
|
| // Uncommenting the following should cause compile failures.
|
| //TEST(float, 1, uint64_t, true);
|
| }
|
| -
|
| -#include "TestClassDef.h"
|
| -DEFINE_TESTCLASS("FitsIn", FitsInTestClass, FitsInTest)
|
|
|