diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 21:45:03 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 21:45:03 +0000 |
| commit | 78e7b4e1b928fa69f672be3c743df6d6c3ecbced (patch) | |
| tree | 5bc67e556d8a790498b4700d0aa37495c89bfcd5 /tests/SkpSkGrTest.cpp | |
| parent | dab032a4ba4a93bff49adae064912e4bb6583784 (diff) | |
Get rid of DEFINE_TESTCLASS_SHORT() macro.
Instead tests should be written using DEF_TEST() macro, which is much
nicer and simplifies the process of setting up an unit test.
BUG=None
TEST=skpskgr_test, pathops_unittest
R=mtklein@google.com
Review URL: https://codereview.chromium.org/117863005
git-svn-id: http://skia.googlecode.com/svn/trunk@12870 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/SkpSkGrTest.cpp')
| -rwxr-xr-x | tests/SkpSkGrTest.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp index 1f0529e016..a896517c56 100755 --- a/tests/SkpSkGrTest.cpp +++ b/tests/SkpSkGrTest.cpp @@ -26,6 +26,7 @@ #include "SkThreadPool.h" #include "SkTime.h" #include "Test.h" +#include "TestClassDef.h" #ifdef SK_BUILD_FOR_WIN #define PATH_SLASH "\\" @@ -36,7 +37,7 @@ #define PATH_SLASH "/" #define IN_DIR "/usr/local/google/home/caryclark" PATH_SLASH "9-30-13-skp" #define OUT_DIR "/media/01CD75512A7F9EE0/4" PATH_SLASH - #define LINE_FEED \n" + #define LINE_FEED "\n" #endif #define PATH_STR_SIZE 512 @@ -572,7 +573,7 @@ static bool initTest() { return make_out_dirs(); } -static void SkpSkGrTest(skiatest::Reporter* reporter) { +DEF_TEST(SkpSkGr, reporter) { SkTArray<TestResult, true> errors; if (!initTest()) { return; @@ -628,8 +629,8 @@ static void SkpSkGrTest(skiatest::Reporter* reporter) { SkDebugf("#%d\n", testCount); } } - skipOver: - reporter->bumpTestCount(); + skipOver: + reporter->bumpTestCount(); checkEarlyExit: if (1 && testCount == 20) { break; @@ -669,7 +670,7 @@ static void testSkGrMain(SkpSkGrThreadState* data) { data->fReporter->bumpTestCount(); } -static void SkpSkGrThreadedTest(skiatest::Reporter* reporter) { +DEF_TEST(SkpSkGrThreaded, reporter) { if (!initTest()) { return; } @@ -736,7 +737,7 @@ static void SkpSkGrThreadedTest(skiatest::Reporter* reporter) { } } -static void SkpSkGrOneOffTest(skiatest::Reporter* reporter) { +DEF_TEST(SkpSkGrOneOff, reporter) { if (!initTest()) { return; } @@ -750,10 +751,3 @@ static void SkpSkGrOneOffTest(skiatest::Reporter* reporter) { TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose()); TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose()); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS_SHORT(SkpSkGrTest) - -DEFINE_TESTCLASS_SHORT(SkpSkGrOneOffTest) - -DEFINE_TESTCLASS_SHORT(SkpSkGrThreadedTest) |