aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-02-27 16:24:51 +0000
committerGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-02-27 16:24:51 +0000
commited673310e2551e64d8196f7776d7d4c92085f8c2 (patch)
treeac5a737aaaf66c97be7109eb980beadd35e30e25 /include/core
parent3469c76c40790b409621fd7eff34f56240718549 (diff)
add initial unittest framework (tests)
move some previous unittests out of core classes and into tests git-svn-id: http://skia.googlecode.com/svn/trunk@96 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkMath.h9
-rw-r--r--include/core/SkMatrix.h7
-rw-r--r--include/core/SkUserConfig.h2
-rw-r--r--include/core/SkUtils.h7
4 files changed, 1 insertions, 24 deletions
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 5c2b475ef9..683a1ac303 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -217,14 +217,5 @@ static inline unsigned SkMul16ShiftRound(unsigned a, unsigned b, int shift) {
return (prod + (prod >> shift)) >> shift;
}
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_DEBUG
- class SkMath {
- public:
- static void UnitTest();
- };
-#endif
-
#endif
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index 2b25dcada3..aa008cb2d9 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -403,13 +403,6 @@ public:
void dump() const;
void toDumpString(SkString*) const;
-#ifdef SK_DEBUG
- /** @cond UNIT_TEST */
-
- static void UnitTest();
- /** @endcond */
-#endif
-
private:
enum {
/** Set if the matrix will map a rectangle to another rectangle. This
diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h
index a3c34a3ba7..498eb8f62b 100644
--- a/include/core/SkUserConfig.h
+++ b/include/core/SkUserConfig.h
@@ -118,7 +118,7 @@
so this flag is optional.
*/
#ifdef SK_DEBUG
-//#define SK_SUPPORT_UNITTEST
+#define SK_SUPPORT_UNITTEST
#endif
#endif
diff --git a/include/core/SkUtils.h b/include/core/SkUtils.h
index f3e33417f1..9f3b1d6f36 100644
--- a/include/core/SkUtils.h
+++ b/include/core/SkUtils.h
@@ -96,13 +96,6 @@ size_t SkUTF16_FromUnichar(SkUnichar uni, uint16_t utf16[] = NULL);
size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues,
char utf8[] = NULL);
-class SkUtils {
-public:
-#ifdef SK_DEBUG
- static void UnitTest();
-#endif
-};
-
///////////////////////////////////////////////////////////////////////////////
class SkAutoTrace {