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
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp
index 520ba97..a021454 100644
--- a/tests/PathOpsCubicLineIntersectionTest.cpp
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp
@@ -10,6 +10,7 @@
#include "SkPathOpsLine.h"
#include "SkReduceOrder.h"
#include "Test.h"
+#include "TestClassDef.h"
static struct lineCubic {
SkDCubic cubic;
@@ -76,7 +77,7 @@
}
}
-static void PathOpsCubicLineIntersectionTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsCubicLineIntersection, reporter) {
for (size_t index = 0; index < lineCubicTests_count; ++index) {
int iIndex = static_cast<int>(index);
testOne(reporter, iIndex);
@@ -84,7 +85,7 @@
}
}
-static void PathOpsCubicLineIntersectionOneOffTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsCubicLineIntersectionOneOff, reporter) {
int iIndex = 0;
testOne(reporter, iIndex);
const SkDCubic& cubic = lineCubicTests[iIndex].cubic;
@@ -108,8 +109,3 @@
sect.distance(i.pt(0)), cubic[3].distance(prevL));
#endif
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsCubicLineIntersectionTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsCubicLineIntersectionOneOffTest)