Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/Writer32Test.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 "SkRandom.h"
 #include "SkReader32.h"
 #include "SkWriter32.h"
-#include "Test.h"
 
 static void check_contents(skiatest::Reporter* reporter, const SkWriter32& writer,
                            const void* expected, size_t size) {
     SkAutoSMalloc<256> storage(size);
     REPORTER_ASSERT(reporter, writer.bytesWritten() == size);
     writer.flatten(storage.get());
     REPORTER_ASSERT(reporter, !memcmp(storage.get(), expected, size));
 }
 
 
@@ skipping 156 matching lines @@
         REPORTER_ASSERT(reporter, memcmp(readPtr, originalData.get(), len) == 0);
         // Ensure that the rest is padded with zeroes.
         const char* stop = readPtr + SkAlign4(len);
         readPtr += len;
         while (readPtr < stop) {
             REPORTER_ASSERT(reporter, *readPtr++ == 0);
         }
     }
 }
 
-static void Tests(skiatest::Reporter* reporter) {
+DEF_TEST(Writer32, reporter) {
     // dynamic allocator
     {
         SkWriter32 writer(256 * 4);
         test1(reporter, &writer);
 
         writer.reset();
         test2(reporter, &writer);
 
         writer.reset();
         testWritePad(reporter, &writer);
@@ skipping 43 matching lines @@
 
         writer.reset();
         testWritePad(reporter, &writer);
     }
 
     test_reserve(reporter);
     test_string_null(reporter);
     test_ptr(reporter);
     test_rewind(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Writer32", Writer32Class, Tests)