third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp - Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing

Unified Diff: third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp

Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing (Closed)

Patch Set: Created 3 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp ('k') | third_party/WebKit/Source/core/scheduler/ActiveConnectionThrottlingTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp

index 9b136214ddbaa321f511923f5419ee283b21f1b2..de7b253107f9e415a0d0357826965d90e6292218 100644

--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp

@@ -48,16 +48,16 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleTransformTree) {

String transform_tree_as_string =

transformPropertyTreeAsString(*GetDocument().View());

EXPECT_THAT(transform_tree_as_string.Ascii().data(),

- testing::MatchesRegex("root .*"

- " .*Translation \\(.*\\) .*"));

+ ::testing::MatchesRegex("root .*"

+ " .*Translation \\(.*\\) .*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleClipTree) {

SetBodyInnerHTML("hello world");

String clip_tree_as_string = clipPropertyTreeAsString(*GetDocument().View());

EXPECT_THAT(clip_tree_as_string.Ascii().data(),

- testing::MatchesRegex("root .*"

- " .*Clip \\(.*\\) .*"));

+ ::testing::MatchesRegex("root .*"

+ " .*Clip \\(.*\\) .*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleEffectTree) {

@@ -65,8 +65,8 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleEffectTree) {

String effect_tree_as_string =

effectPropertyTreeAsString(*GetDocument().View());

EXPECT_THAT(effect_tree_as_string.Ascii().data(),

- testing::MatchesRegex("root .*"

- " Effect \\(LayoutBlockFlow DIV\\) .*"));

+ ::testing::MatchesRegex("root .*"

+ " Effect \\(LayoutBlockFlow DIV\\) .*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleScrollTree) {

@@ -74,8 +74,8 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleScrollTree) {

String scroll_tree_as_string =

scrollPropertyTreeAsString(*GetDocument().View());

EXPECT_THAT(scroll_tree_as_string.Ascii().data(),

- testing::MatchesRegex("root .*"

- " Scroll \\(.*\\) .*"));

+ ::testing::MatchesRegex("root .*"

+ " Scroll \\(.*\\) .*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleTransformTreePath) {

@@ -89,10 +89,10 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleTransformTreePath) {

String transform_path_as_string =

transformed_object_properties->Transform()->ToTreeString();

EXPECT_THAT(transform_path_as_string.Ascii().data(),

- testing::MatchesRegex("root .* transform.*"

- " .* transform.*"

- " .* transform.*"));

+ ::testing::MatchesRegex("root .* transform.*"

+ " .* transform.*"

+ " .* transform.*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleClipTreePath) {

@@ -105,9 +105,9 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleClipTreePath) {

String clip_path_as_string =

clipped_object_properties->CssClip()->ToTreeString();

EXPECT_THAT(clip_path_as_string.Ascii().data(),

- testing::MatchesRegex("root .* rect.*"

- " .* rect.*"

- " .* rect.*"));

+ ::testing::MatchesRegex("root .* rect.*"

+ " .* rect.*"

+ " .* rect.*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleEffectTreePath) {

@@ -118,8 +118,8 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleEffectTreePath) {

String effect_path_as_string =

effect_object_properties->Effect()->ToTreeString();

EXPECT_THAT(effect_path_as_string.Ascii().data(),

- testing::MatchesRegex("root .* opacity.*"

- " .* opacity.*"));

+ ::testing::MatchesRegex("root .* opacity.*"

+ " .* opacity.*"));

}

TEST_P(PaintPropertyTreePrinterTest, SimpleScrollTreePath) {

@@ -134,8 +134,8 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleScrollTreePath) {

->ScrollNode()

->ToTreeString();

EXPECT_THAT(scroll_path_as_string.Ascii().data(),

- testing::MatchesRegex("root .* parent.*"

- " .* parent.*"));

+ ::testing::MatchesRegex("root .* parent.*"

+ " .* parent.*"));

}

} // namespace blink