Get rid of DEFINE_TESTCLASS() macro.

src/core/SkTileGrid.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTileGrid_DEFINED
 #define SkTileGrid_DEFINED
@@ skipping 51 matching lines @@
      * Gets the number of insertions
      */
     virtual int getCount() const SK_OVERRIDE;
 
     virtual void rewindInserts() SK_OVERRIDE;
 
     // Used by search() and in SkTileGridHelper implementations
     enum {
         kTileFinished = -1,
     };
-private:
+
     SkTDArray<void*>& tile(int x, int y);

[mtklein, 2013/12/13 15:24:31]

I'm not keen on having to expose this guy.  Seems super abstraction-breaking.

Some alternatives:

1)  Make this method protected, subclass it inside the test code and make it
public there.
  [SkTileGrid.h]
  protected:
        SkTDArray<void*>& tile(int x, int y);  // For testing only.
 
  [TileGridTest.cpp]
  class SkTileGridForTesting : public SkTileGrid {
  public:
      SkTDArray<void*>& tile(int x, int y) { return SkTileGrid::tile(x,y); }
  };
  (then use SkTileGridForTesting instead of SkTileGrid in tests)

2)  Keep the method public, but lock it down to only what we really need for the
tests:
  public:
      int tileCount(int x, int y) const;  // For testing only.

Leaning towards 2) myself.

[tfarina, 2013/12/13 21:00:08]

Done.

 
+private:
     int fXTileCount, fYTileCount, fTileCount;
     SkTileGridPicture::TileGridInfo fInfo;
     SkTDArray<void*>* fTileData;
     int fInsertionCount;
     SkIRect fGridBounds;
     SkTileGridNextDatumFunctionPtr fNextDatumFunction;
 
-    friend class TileGridTest;
     typedef SkBBoxHierarchy INHERITED;
 };
 
 /**
  * Generic implementation for SkTileGridNextDatumFunctionPtr. user code may instantiate
  * this template to get a valid SkTileGridNextDatumFunction implementation
  *
  * Returns the next element of tileData[i][tileIndices[i]] for all i and advances
  * tileIndices[] past them. The order in which data are returned by successive
  * calls to this method must reflect the order in which the were originally
@@ skipping 36 matching lines @@
                     tileIndices[tile] = SkTileGrid::kTileFinished;
                 }
             }
         }
         return minVal;
     }
     return NULL;
 }
 
 #endif