Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/StringTest.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 "SkString.h"
 #include <stdarg.h>
 #include <stdio.h>
 
 // Windows vsnprintf doesn't 0-terminate safely), but is so far
 // encapsulated in SkString that we can't test it directly.
 
 #ifdef SK_BUILD_FOR_WIN
     #define VSNPRINTF(buffer, size, format, args)   \
         vsnprintf_s(buffer, size, _TRUNCATE, format, args)
 #else
     #define VSNPRINTF   vsnprintf
 #endif
 
 #define ARGS_TO_BUFFER(format, buffer, size)        \
     do {                                            \
         va_list args;                               \
         va_start(args, format);                     \
         VSNPRINTF(buffer, size, format, args);      \
         va_end(args);                               \
     } while (0)
 
 static void printfAnalog(char* buffer, int size, const char format[], ...) {
     ARGS_TO_BUFFER(format, buffer, size);
 }
 
-
-
-static void TestString(skiatest::Reporter* reporter) {
+DEF_TEST(String, reporter) {
     SkString    a;
     SkString    b((size_t)0);
     SkString    c("");
     SkString    d(NULL, 0);
 
     REPORTER_ASSERT(reporter, a.isEmpty());
     REPORTER_ASSERT(reporter, a == b && a == c && a == d);
 
     a.set("hello");
     b.set("hellox", 5);
@@ skipping 135 matching lines @@
     REPORTER_ASSERT(reporter, buffer[18] == 'a');
     REPORTER_ASSERT(reporter, buffer[19] == 'a');
     REPORTER_ASSERT(reporter, buffer[20] == 'a');
     printfAnalog(buffer, 20, "%30d", 0);
     REPORTER_ASSERT(reporter, buffer[18] == ' ');
     REPORTER_ASSERT(reporter, buffer[19] == 0);
     REPORTER_ASSERT(reporter, buffer[20] == 'a');
 
 }
 
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("String", StringTestClass, TestString)
-
 DEF_TEST(String_SkStrSplit, r) {
     SkTArray<SkString> results;
 
     SkStrSplit("a-_b_c-dee--f-_-_-g-", "-_", &results);
     REPORTER_ASSERT(r, results.count() == 6);
     REPORTER_ASSERT(r, results[0].equals("a"));
     REPORTER_ASSERT(r, results[1].equals("b"));
     REPORTER_ASSERT(r, results[2].equals("c"));
     REPORTER_ASSERT(r, results[3].equals("dee"));
     REPORTER_ASSERT(r, results[4].equals("f"));
     REPORTER_ASSERT(r, results[5].equals("g"));
 }