Skip to content

GitLab

T
tangled
Commit 662b4400 authored by Steve Kobes's avatar Steve Kobes Committed by Commit Bot
Browse files
Options

RLS: Deparameterize core/layout unit tests. 

Bug: 823365
Change-Id: Iec2e356bc185a0bc24abffd17586cafad1bb17ef
Reviewed-on: https://chromium-review.googlesource.com/1062126Reviewed-by: default avatarStefan Zager <szager@chromium.org>
Commit-Queue: Steve Kobes <skobes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559222}
parent 6187d940
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 180 deletions
third_party/blink/renderer/core/layout/layout_count_test.cc
View file @ 662b4400
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/core/layout/layout_block_flow.h" #include "third_party/blink/renderer/core/layout/layout_block_flow.h"
#include "third_party/blink/renderer/core/testing/core_unit_test_helper.h" #include "third_party/blink/renderer/core/testing/core_unit_test_helper.h"
#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
namespace blink { namespace blink {
...@@ -13,7 +12,6 @@ class LayoutCountTest : public RenderingTest {}; ...@@ -13,7 +12,6 @@ class LayoutCountTest : public RenderingTest {};
TEST_F(LayoutCountTest, SimpleBlockLayoutIsOnePass) { TEST_F(LayoutCountTest, SimpleBlockLayoutIsOnePass) {
ScopedTrackLayoutPassesPerBlockForTest track_layout_passes_per_block(true); ScopedTrackLayoutPassesPerBlockForTest track_layout_passes_per_block(true);
ScopedRootLayerScrollingForTest root_layer_scrolling(true);
SetBodyInnerHTML( SetBodyInnerHTML(
"<!DOCTYPE html>" "<!DOCTYPE html>"
" <div id='block' style='height:1000px'>Item</div>"); " <div id='block' style='height:1000px'>Item</div>");
......
third_party/blink/renderer/core/layout/layout_geometry_map_test.cc
View file @ 662b4400
...@@ -42,21 +42,14 @@ ...@@ -42,21 +42,14 @@
#include "third_party/blink/renderer/core/layout/layout_box.h" #include "third_party/blink/renderer/core/layout/layout_box.h"
#include "third_party/blink/renderer/core/layout/layout_view.h" #include "third_party/blink/renderer/core/layout/layout_view.h"
#include "third_party/blink/renderer/core/paint/paint_layer.h" #include "third_party/blink/renderer/core/paint/paint_layer.h"
#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
#include "third_party/blink/renderer/platform/testing/unit_test_helpers.h" #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
#include "third_party/blink/renderer/platform/testing/url_test_helpers.h" #include "third_party/blink/renderer/platform/testing/url_test_helpers.h"
namespace blink { namespace blink {
typedef bool TestParamRootLayerScrolling; class LayoutGeometryMapTest : public testing::Test {
class LayoutGeometryMapTest
: public testing::Test,
public testing::WithParamInterface<TestParamRootLayerScrolling>,
private ScopedRootLayerScrollingForTest {
public: public:
LayoutGeometryMapTest() LayoutGeometryMapTest() : base_url_("http://www.test.com/") {}
: ScopedRootLayerScrollingForTest(GetParam()),
base_url_("http://www.test.com/") {}
void TearDown() override { void TearDown() override {
Platform::Current() Platform::Current()
...@@ -171,9 +164,7 @@ class LayoutGeometryMapTest ...@@ -171,9 +164,7 @@ class LayoutGeometryMapTest
const std::string base_url_; const std::string base_url_;
}; };
INSTANTIATE_TEST_CASE_P(All, LayoutGeometryMapTest, testing::Bool()); TEST_F(LayoutGeometryMapTest, SimpleGeometryMapTest) {
TEST_P(LayoutGeometryMapTest, SimpleGeometryMapTest) {
RegisterMockedHttpURLLoad("rgm_test.html"); RegisterMockedHttpURLLoad("rgm_test.html");
FrameTestHelpers::WebViewHelper web_view_helper; FrameTestHelpers::WebViewHelper web_view_helper;
WebView* web_view = WebView* web_view =
...@@ -213,9 +204,9 @@ TEST_P(LayoutGeometryMapTest, SimpleGeometryMapTest) { ...@@ -213,9 +204,9 @@ TEST_P(LayoutGeometryMapTest, SimpleGeometryMapTest) {
// Fails on Windows due to crbug.com/391457. When run through the transform the // Fails on Windows due to crbug.com/391457. When run through the transform the
// position on windows differs by a pixel // position on windows differs by a pixel
#if defined(OS_WIN) #if defined(OS_WIN)
TEST_P(LayoutGeometryMapTest, DISABLED_TransformedGeometryTest) TEST_F(LayoutGeometryMapTest, DISABLED_TransformedGeometryTest)
#else #else
TEST_P(LayoutGeometryMapTest, TransformedGeometryTest) TEST_F(LayoutGeometryMapTest, TransformedGeometryTest)
#endif #endif
{ {
RegisterMockedHttpURLLoad("rgm_transformed_test.html"); RegisterMockedHttpURLLoad("rgm_transformed_test.html");
...@@ -276,7 +267,7 @@ TEST_P(LayoutGeometryMapTest, TransformedGeometryTest) ...@@ -276,7 +267,7 @@ TEST_P(LayoutGeometryMapTest, TransformedGeometryTest)
rgm.MapToAncestor(rect, nullptr).BoundingBox()); rgm.MapToAncestor(rect, nullptr).BoundingBox());
} }
TEST_P(LayoutGeometryMapTest, FixedGeometryTest) { TEST_F(LayoutGeometryMapTest, FixedGeometryTest) {
RegisterMockedHttpURLLoad("rgm_fixed_position_test.html"); RegisterMockedHttpURLLoad("rgm_fixed_position_test.html");
FrameTestHelpers::WebViewHelper web_view_helper; FrameTestHelpers::WebViewHelper web_view_helper;
WebView* web_view = web_view_helper.InitializeAndLoad( WebView* web_view = web_view_helper.InitializeAndLoad(
...@@ -314,7 +305,7 @@ TEST_P(LayoutGeometryMapTest, FixedGeometryTest) { ...@@ -314,7 +305,7 @@ TEST_P(LayoutGeometryMapTest, FixedGeometryTest) {
rgm.MapToAncestor(rect, nullptr)); rgm.MapToAncestor(rect, nullptr));
} }
TEST_P(LayoutGeometryMapTest, ContainsFixedPositionTest) { TEST_F(LayoutGeometryMapTest, ContainsFixedPositionTest) {
RegisterMockedHttpURLLoad("rgm_contains_fixed_position_test.html"); RegisterMockedHttpURLLoad("rgm_contains_fixed_position_test.html");
FrameTestHelpers::WebViewHelper web_view_helper; FrameTestHelpers::WebViewHelper web_view_helper;
WebView* web_view = web_view_helper.InitializeAndLoad( WebView* web_view = web_view_helper.InitializeAndLoad(
...@@ -361,7 +352,7 @@ TEST_P(LayoutGeometryMapTest, ContainsFixedPositionTest) { ...@@ -361,7 +352,7 @@ TEST_P(LayoutGeometryMapTest, ContainsFixedPositionTest) {
rgm.PopMappingsToAncestor(static_cast<PaintLayer*>(nullptr)); rgm.PopMappingsToAncestor(static_cast<PaintLayer*>(nullptr));
} }
TEST_P(LayoutGeometryMapTest, IframeTest) { TEST_F(LayoutGeometryMapTest, IframeTest) {
RegisterMockedHttpURLLoad("rgm_iframe_test.html"); RegisterMockedHttpURLLoad("rgm_iframe_test.html");
RegisterMockedHttpURLLoad("rgm_test.html"); RegisterMockedHttpURLLoad("rgm_test.html");
FrameTestHelpers::WebViewHelper web_view_helper; FrameTestHelpers::WebViewHelper web_view_helper;
...@@ -458,7 +449,7 @@ TEST_P(LayoutGeometryMapTest, IframeTest) { ...@@ -458,7 +449,7 @@ TEST_P(LayoutGeometryMapTest, IframeTest) {
rgm_no_frame.MapToAncestor(rect, nullptr)); rgm_no_frame.MapToAncestor(rect, nullptr));
} }
TEST_P(LayoutGeometryMapTest, ColumnTest) { TEST_F(LayoutGeometryMapTest, ColumnTest) {
RegisterMockedHttpURLLoad("rgm_column_test.html"); RegisterMockedHttpURLLoad("rgm_column_test.html");
FrameTestHelpers::WebViewHelper web_view_helper; FrameTestHelpers::WebViewHelper web_view_helper;
WebView* web_view = WebView* web_view =
...@@ -507,7 +498,7 @@ TEST_P(LayoutGeometryMapTest, ColumnTest) { ...@@ -507,7 +498,7 @@ TEST_P(LayoutGeometryMapTest, ColumnTest) {
EXPECT_EQ(3.0f, RectFromQuad(rgm.MapToAncestor(rect, nullptr)).Height()); EXPECT_EQ(3.0f, RectFromQuad(rgm.MapToAncestor(rect, nullptr)).Height());
} }
TEST_P(LayoutGeometryMapTest, FloatUnderInlineLayer) { TEST_F(LayoutGeometryMapTest, FloatUnderInlineLayer) {
RegisterMockedHttpURLLoad("rgm_float_under_inline.html"); RegisterMockedHttpURLLoad("rgm_float_under_inline.html");
FrameTestHelpers::WebViewHelper web_view_helper; FrameTestHelpers::WebViewHelper web_view_helper;
WebView* web_view = web_view_helper.InitializeAndLoad( WebView* web_view = web_view_helper.InitializeAndLoad(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment