Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/Reader32Test.cpp

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
-
+#include "Test.h"
+#include "TestClassDef.h"
 #include "SkReader32.h"
-#include "Test.h"
 
 static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
     REPORTER_ASSERT(reporter, reader.eof());
     REPORTER_ASSERT(reporter, reader.size() == reader.offset());
     REPORTER_ASSERT(reporter, (const char*)reader.peek() ==
                     (const char*)reader.base() + reader.size());
 }
 
 static void assert_start(skiatest::Reporter* reporter, const SkReader32& reader) {
     REPORTER_ASSERT(reporter, 0 == reader.offset());
     REPORTER_ASSERT(reporter, reader.size() == reader.available());
     REPORTER_ASSERT(reporter, reader.isAvailable(reader.size()));
     REPORTER_ASSERT(reporter, !reader.isAvailable(reader.size() + 1));
     REPORTER_ASSERT(reporter, reader.peek() == reader.base());
 }
 
 static void assert_empty(skiatest::Reporter* reporter, const SkReader32& reader) {
     REPORTER_ASSERT(reporter, 0 == reader.size());
     REPORTER_ASSERT(reporter, 0 == reader.offset());
     REPORTER_ASSERT(reporter, 0 == reader.available());
     REPORTER_ASSERT(reporter, !reader.isAvailable(1));
     assert_eof(reporter, reader);
     assert_start(reporter, reader);
 }
 
-static void Tests(skiatest::Reporter* reporter) {
+DEF_TEST(Reader32, reporter) {
     SkReader32 reader;
     assert_empty(reporter, reader);
     REPORTER_ASSERT(reporter, NULL == reader.base());
     REPORTER_ASSERT(reporter, NULL == reader.peek());
 
     size_t i;
 
     const int32_t data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
     const SkScalar data2[] = { 0, SK_Scalar1, -SK_Scalar1, SK_Scalar1/2 };
     const size_t bufsize = sizeof(data) > sizeof(data2) ?
@@ skipping 26 matching lines @@
     reader.rewind();
     assert_start(reporter, reader);
     reader.read(buffer, sizeof(data2));
     REPORTER_ASSERT(reporter, !memcmp(data2, buffer, sizeof(data2)));
 
     reader.setMemory(NULL, 0);
     assert_empty(reporter, reader);
     REPORTER_ASSERT(reporter, NULL == reader.base());
     REPORTER_ASSERT(reporter, NULL == reader.peek());
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Reader32", Reader32Class, Tests)