Fix SkTFits in to work properly with signed/unsigned mixtures.

tests/FitsInTest.cpp

+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "Test.h"
+
+#include "SkTypes.h"
+#include "SkTFitsIn.h"
+#include <limits>
+
+namespace {
+
+#define TEST(S, s, D, expected) REPORTER_ASSERT(reporter, (SkTFitsIn<D>((S)(s)) == (expected)));

[mtklein, 2013/07/11 14:56:57]

If you leave off the trailing ';' here, it'll force you to add it consistently
below.  :)

[bungeman-skia, 2013/07/11 20:22:03]

Done.

+
+static void FitsInTest(skiatest::Reporter* 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);
+    TEST(int32_t, ((int32_t)(std::numeric_limits<int8_t>::max)())+1, int8_t, false);
+    TEST(int32_t,  (int32_t)(std::numeric_limits<int8_t>::min)(),    int8_t, true);
+    TEST(int32_t, (int32_t)((std::numeric_limits<int8_t>::min)())-1, int8_t, false);
+
+    TEST(int32_t,  1, uint8_t, true);
+    TEST(int32_t, -1, uint8_t, false);
+    TEST(int32_t,  (int32_t)(std::numeric_limits<uint8_t>::max)(),    uint8_t, true);
+    TEST(int32_t, ((int32_t)(std::numeric_limits<uint8_t>::max)())+1, uint8_t, false);
+    TEST(int32_t,  0, uint8_t, true);
+    TEST(int32_t, -1, uint8_t, false);
+    TEST(int32_t, -127, uint8_t, false);
+    TEST(int32_t, -128, uint8_t, false);
+
+    TEST(int32_t, 1000, int8_t, false);
+    TEST(int32_t, 1000, uint8_t, false);
+
+    TEST(int32_t, 1, int32_t, true);
+    TEST(int32_t, -1, int32_t, true);
+    TEST(int32_t, 1, uint32_t, true);
+    TEST(int32_t, -1, uint32_t, false);
+
+    TEST(int32_t, 1, int64_t, true);
+    TEST(int32_t, -1, int64_t, true);
+    TEST(int32_t, 1, uint64_t, true);
+    TEST(int32_t, -1, uint64_t, false);
+
+    TEST(uint32_t, 1, int8_t, true);
+    TEST(uint32_t, 1, uint8_t, true);
+    TEST(uint32_t, 1, int32_t, true);
+    TEST(uint32_t, 1, uint32_t, true);
+    TEST(uint32_t, 1, int64_t, true);
+    TEST(uint32_t, 1, uint64_t, true);
+
+    TEST(uint32_t, (std::numeric_limits<uint32_t>::max)(), int8_t, false);
+    TEST(uint32_t, (std::numeric_limits<uint32_t>::max)(), uint8_t, false);
+    TEST(uint32_t, (std::numeric_limits<uint32_t>::max)(), int32_t, false);
+    TEST(uint32_t, (std::numeric_limits<uint32_t>::max)(), uint32_t, true);
+    TEST(uint32_t, (std::numeric_limits<uint32_t>::max)(), int64_t, true);
+    TEST(uint32_t, (std::numeric_limits<uint32_t>::max)(), uint64_t, true)
+
+    TEST(uint64_t, 1, int8_t, true);
+    TEST(uint64_t, 1, uint8_t, true);
+    TEST(uint64_t, 1, int32_t, true);
+    TEST(uint64_t, 1, uint32_t, true);
+    TEST(uint64_t, 1, int64_t, true);
+    TEST(uint64_t, 1, uint64_t, true);
+
+    //TEST(float, 1, uint64_t, true);

[mtklein, 2013/07/11 14:56:57]

Can you tack on a reminder why this is commented out?  I guess // We don't
support floating point types. ?

[bungeman-skia, 2013/07/11 20:22:03]

Done. Oops, yes, thought I had a comment here already. It would be interesting
to have a test setup where we could ensure that various bits of code don't
compile.

+}
+
+}
+
+#include "TestClassDef.h"
+DEFINE_TESTCLASS("FitsIn", FitsInTestClass, FitsInTest)
+