Skip to content

Commit

Permalink
Migrate all uses of gtest to googletest (flutter#4728)
Browse files Browse the repository at this point in the history
gtest is an old version that predates the googletest and googlemock
merger, all tests should be using the newer googletest that's being
kept in sync with the upstream version.
  • Loading branch information
petrhosek authored Mar 6, 2018
1 parent a4c296d commit 15bb1e9
Show file tree
Hide file tree
Showing 11 changed files with 522 additions and 164 deletions.
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,16 @@ deps = {
# and not have to specific specific hashes.

'src/garnet':
Var('fuchsia_git') + '/garnet' + '@' + 'b3ba6b6d6ab8ef658278cc43c9f839a8a8d1718e',
Var('fuchsia_git') + '/garnet' + '@' + '78f46d051a38ed251970b3e3ffe8803815407cc0',

'src/topaz':
Var('fuchsia_git') + '/topaz' + '@' + 'e331f910c1003d154a4de6e1b5356f8d785fd6ec',

'src/third_party/benchmark':
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

'src/third_party/gtest':
Var('fuchsia_git') + '/third_party/gtest' + '@' + 'c00f82917331efbbd27124b537e4ccc915a02b72',
'src/third_party/googletest':
Var('fuchsia_git') + '/third_party/googletest' + '@' + '2072b0053d3537fa5e8d222e34c759987aae1320',

'src/third_party/rapidjson':
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '9defbb0209a534ffeb3a2b79d5ee440a77407292',
Expand Down
2 changes: 1 addition & 1 deletion flow/matrix_decomposition_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <cmath>

#include "flutter/flow/matrix_decomposition.h"
#include "third_party/gtest/include/gtest/gtest.h"
#include "gtest/gtest.h"

TEST(MatrixDecomposition, Rotation) {
SkMatrix44 matrix = SkMatrix44::I();
Expand Down
2 changes: 1 addition & 1 deletion flow/raster_cache_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// found in the LICENSE file.

#include "flutter/flow/raster_cache.h"
#include "third_party/gtest/include/gtest/gtest.h"
#include "gtest/gtest.h"
#include "third_party/skia/include/core/SkPicture.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"

Expand Down
2 changes: 1 addition & 1 deletion sky/engine/wtf/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,6 @@ executable("wtf_unittests") {

# Does not use $flutter_root/testing because it needs and provides its own main
# function in RunAllTests.cpp.
"//third_party/gtest",
"//third_party/googletest:gtest",
]
}
2 changes: 1 addition & 1 deletion testing/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source_set("testing") {
]

public_deps = [
"//third_party/gtest",
"//third_party/googletest:gtest",
]

public_configs = [ "$flutter_root:config" ]
Expand Down
2 changes: 1 addition & 1 deletion third_party/txt/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ executable("txt_unittests") {

deps = [
":txt",
"//third_party/gtest",
"//third_party/googletest:gtest",
] + txt_common_executable_deps
}

Expand Down
2 changes: 1 addition & 1 deletion third_party/txt/src/txt/font_collection.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "lib/fxl/macros.h"
#include "minikin/FontCollection.h"
#include "minikin/FontFamily.h"
#include "third_party/gtest/include/gtest/gtest_prod.h"
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
#include "txt/asset_font_manager.h"
Expand Down
2 changes: 1 addition & 1 deletion third_party/txt/src/txt/paragraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "paint_record.h"
#include "paragraph_style.h"
#include "styled_runs.h"
#include "third_party/gtest/include/gtest/gtest_prod.h"
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "third_party/skia/include/core/SkRect.h"
#include "utils/WindowsUtils.h"

Expand Down
2 changes: 1 addition & 1 deletion third_party/txt/src/txt/styled_runs.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <vector>

#include "text_style.h"
#include "third_party/gtest/include/gtest/gtest_prod.h"
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "utils/WindowsUtils.h"

namespace txt {
Expand Down
162 changes: 108 additions & 54 deletions travis/licenses_golden/licenses_garnet

Large diffs are not rendered by default.

502 changes: 403 additions & 99 deletions travis/licenses_golden/licenses_third_party

Large diffs are not rendered by default.

0 comments on commit 15bb1e9

Please sign in to comment.