diff options
author | Mike Klein <mtklein@google.com> | 2014-07-09 09:04:07 -0400 |
---|---|---|
committer | Mike Klein <mtklein@google.com> | 2014-07-09 09:04:07 -0400 |
commit | 874a62acef5ec2ecccdbb99ec4d86402a3341e6a (patch) | |
tree | 984dbc899480cb2dcaa578c08594266f2f9500cb /tests/UtilsTest.cpp | |
parent | 0b544ae222aab1c5d9122a8dfe2800451b31d979 (diff) |
Revert "Remove ability for Release code to call getRefCnt() or getWeakRefCnt()."
This reverts commit 4ae94ffce5ecf1b71cb5e295b68bf4ec9e697443.
BUG=skia:
Review URL: https://codereview.chromium.org/382523002
Diffstat (limited to 'tests/UtilsTest.cpp')
-rw-r--r-- | tests/UtilsTest.cpp | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp index 9454b54e5c..438a5cce47 100644 --- a/tests/UtilsTest.cpp +++ b/tests/UtilsTest.cpp @@ -10,7 +10,6 @@ #include "SkTSearch.h" #include "SkTSort.h" #include "SkUtils.h" -#include "RefCntIs.h" #include "Test.h" class RefClass : public SkRefCnt { @@ -28,30 +27,30 @@ private: static void test_autounref(skiatest::Reporter* reporter) { RefClass obj(0); - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); SkAutoTUnref<RefClass> tmp(&obj); REPORTER_ASSERT(reporter, &obj == tmp.get()); - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); REPORTER_ASSERT(reporter, &obj == tmp.detach()); - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); REPORTER_ASSERT(reporter, NULL == tmp.detach()); REPORTER_ASSERT(reporter, NULL == tmp.get()); obj.ref(); - REPORTER_ASSERT(reporter, RefCntIs(obj, 2)); + REPORTER_ASSERT(reporter, 2 == obj.getRefCnt()); { SkAutoTUnref<RefClass> tmp2(&obj); } - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); } static void test_autostarray(skiatest::Reporter* reporter) { RefClass obj0(0); RefClass obj1(1); - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); { SkAutoSTArray<2, SkRefPtr<RefClass> > tmp; @@ -62,14 +61,14 @@ static void test_autostarray(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, 4 == tmp.count()); tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); // test out reset with data in the array (and a new allocation) tmp.reset(0); REPORTER_ASSERT(reporter, 0 == tmp.count()); - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); tmp.reset(2); // this should use the preexisting allocation REPORTER_ASSERT(reporter, 2 == tmp.count()); @@ -78,8 +77,8 @@ static void test_autostarray(skiatest::Reporter* reporter) { } // test out destructor with data in the array (and using existing allocation) - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); { // test out allocating ctor (this should allocate new memory) @@ -88,32 +87,32 @@ static void test_autostarray(skiatest::Reporter* reporter) { tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); // Test out resut with data in the array and malloced storage tmp.reset(0); - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); tmp.reset(2); // this should use the preexisting storage tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); tmp.reset(4); // this should force a new malloc - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); } - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); } ///////////////////////////////////////////////////////////////////////////// |