AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split GrUnitTests.cpp into two separate unit tests.

Browse Source 
GrUnitTests is too generic. Instead we split this file between the two
APIs being tested there, GrTBSearch and GrBinHashKey.

BUG=None
TEST=tests -m GrTBSearchTest && tests -m GrBinHashKeyTest
R=brian@thesalomons.net, robertphillips@google.com

Review URL: https://codereview.chromium.org/150943002

git-svn-id: http://skia.googlecode.com/svn/trunk@13273 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tfarina@chromium.org 2014-01-31 21:48:52 +00:00
parent e254310a55
commit bbff20855f
4 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gyp/tests.gyp
View File

@ -81,12 +81,13 @@
'../tests/GpuBitmapCopyTest.cpp',
'../tests/GpuColorFilterTest.cpp',
'../tests/GpuDrawPathTest.cpp',
'../tests/GrBinHashKeyTest.cpp',
'../tests/GrContextFactoryTest.cpp',
'../tests/GrDrawTargetTest.cpp',
'../tests/GrMemoryPoolTest.cpp',
'../tests/GrRedBlackTreeTest.cpp',
'../tests/GrSurfaceTest.cpp',
'../tests/GrUnitTests.cpp',
'../tests/GrTBSearchTest.cpp',
'../tests/GradientTest.cpp',
'../tests/HashCacheTest.cpp',
'../tests/ImageCacheTest.cpp',

5
src/gpu/GrTBSearch.h
View File

@ -1,4 +1,3 @@
/*
* Copyright 2010 Google Inc.
*
@ -6,11 +5,11 @@
* found in the LICENSE file.
*/
#ifndef GrTBSearch_DEFINED
#define GrTBSearch_DEFINED
#include "SkTypes.h"
template <typename ELEM, typename KEY>
int GrTBSearch(const ELEM array[], int count, KEY target) {
SkASSERT(count >= 0);

36
tests/GrUnitTests.cpp → tests/GrBinHashKeyTest.cpp
View File

@ -1,47 +1,18 @@
/*
* Copyright 2010 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"
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
#include "GrBinHashKey.h"
#include "GrDrawTarget.h"
#include "GrRedBlackTree.h"
#include "SkMatrix.h"
// If we aren't inheriting these as #defines from elsewhere,
// clang demands they be declared before we #include the template
// that relies on them.
static bool LT(const int& elem, int value) {
return elem < value;
}
static bool EQ(const int& elem, int value) {
return elem == value;
}
#include "GrTBSearch.h"
#include "Test.h"
DEF_TEST(GrUnitTests_bsearch, reporter) {
const int array[] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 22, 33, 44, 55, 66, 77, 88, 99
};
for (int n = 0; n < static_cast<int>(GR_ARRAY_COUNT(array)); ++n) {
for (int i = 0; i < n; i++) {
int index = GrTBSearch<int, int>(array, n, array[i]);
REPORTER_ASSERT(reporter, index == (int) i);
index = GrTBSearch<int, int>(array, n, -array[i]);
REPORTER_ASSERT(reporter, index < 0);
}
}
}
DEF_TEST(GrUnitTests_binHashKey, reporter) {
DEF_TEST(GrBinHashKeyTest, reporter) {
const char* testStringA_ = "abcdABCD";
const char* testStringB_ = "abcdBBCD";
const uint32_t* testStringA = reinterpret_cast<const uint32_t*>(testStringA_);
@ -67,5 +38,4 @@ DEF_TEST(GrUnitTests_binHashKey, reporter) {
REPORTER_ASSERT(reporter, keyA.getHash() != keyB.getHash());
}
#endif

40
tests/GrTBSearchTest.cpp Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright 2014 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
#include "Test.h"
// If we aren't inheriting these as #defines from elsewhere,
// clang demands they be declared before we #include the template
// that relies on them.
static bool LT(const int& elem, int value) {
return elem < value;
}
static bool EQ(const int& elem, int value) {
return elem == value;
}
#include "GrTBSearch.h"
DEF_TEST(GrTBSearchTest, reporter) {
const int array[] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 22, 33, 44, 55, 66, 77, 88, 99
};
for (int n = 0; n < static_cast<int>(SK_ARRAY_COUNT(array)); ++n) {
for (int i = 0; i < n; i++) {
int index = GrTBSearch<int, int>(array, n, array[i]);
REPORTER_ASSERT(reporter, index == (int) i);
index = GrTBSearch<int, int>(array, n, -array[i]);
REPORTER_ASSERT(reporter, index < 0);
}
}
}
#endif