diff options
Diffstat (limited to 'tests/UtilsTest.cpp')
-rw-r--r-- | tests/UtilsTest.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp index 438a5cce47..9454b54e5c 100644 --- a/tests/UtilsTest.cpp +++ b/tests/UtilsTest.cpp @@ -10,6 +10,7 @@ #include "SkTSearch.h" #include "SkTSort.h" #include "SkUtils.h" +#include "RefCntIs.h" #include "Test.h" class RefClass : public SkRefCnt { @@ -27,30 +28,30 @@ private: static void test_autounref(skiatest::Reporter* reporter) { RefClass obj(0); - REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); SkAutoTUnref<RefClass> tmp(&obj); REPORTER_ASSERT(reporter, &obj == tmp.get()); - REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); REPORTER_ASSERT(reporter, &obj == tmp.detach()); - REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); REPORTER_ASSERT(reporter, NULL == tmp.detach()); REPORTER_ASSERT(reporter, NULL == tmp.get()); obj.ref(); - REPORTER_ASSERT(reporter, 2 == obj.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj, 2)); { SkAutoTUnref<RefClass> tmp2(&obj); } - REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); } static void test_autostarray(skiatest::Reporter* reporter) { RefClass obj0(0); RefClass obj1(1); - REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); { SkAutoSTArray<2, SkRefPtr<RefClass> > tmp; @@ -61,14 +62,14 @@ static void test_autostarray(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, 4 == tmp.count()); tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); // test out reset with data in the array (and a new allocation) tmp.reset(0); REPORTER_ASSERT(reporter, 0 == tmp.count()); - REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); tmp.reset(2); // this should use the preexisting allocation REPORTER_ASSERT(reporter, 2 == tmp.count()); @@ -77,8 +78,8 @@ static void test_autostarray(skiatest::Reporter* reporter) { } // test out destructor with data in the array (and using existing allocation) - REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); { // test out allocating ctor (this should allocate new memory) @@ -87,32 +88,32 @@ static void test_autostarray(skiatest::Reporter* reporter) { tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); // Test out resut with data in the array and malloced storage tmp.reset(0); - REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); tmp.reset(2); // this should use the preexisting storage tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); tmp.reset(4); // this should force a new malloc - REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); } - REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); - REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); + REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); + REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); } ///////////////////////////////////////////////////////////////////////////// |