Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1124)

Side by Side Diff: Source/core/editing/EditingUtilitiesTest.cpp

Issue 1320573003: Rename isBlock() to isEnclosingBlock() in EditingUtilities (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-26T15:16:19 Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/editing/EditingUtilities.h" 6 #include "core/editing/EditingUtilities.h"
7 7
8 #include "core/editing/EditingTestBase.h" 8 #include "core/editing/EditingTestBase.h"
9 9
10 namespace blink { 10 namespace blink {
11 11
12 class EditingUtilitiesTest : public EditingTestBase { 12 class EditingUtilitiesTest : public EditingTestBase {
13 }; 13 };
14 14
15 TEST_F(EditingUtilitiesTest, enclosingNodeOfType) 15 TEST_F(EditingUtilitiesTest, enclosingNodeOfType)
16 { 16 {
17 const char* bodyContent = "<p id='host'><b id='one'>11</b></p>"; 17 const char* bodyContent = "<p id='host'><b id='one'>11</b></p>";
18 const char* shadowContent = "<content select=#two></content><div id='three'> <content select=#one></div></content>"; 18 const char* shadowContent = "<content select=#two></content><div id='three'> <content select=#one></div></content>";
19 setBodyContent(bodyContent); 19 setBodyContent(bodyContent);
20 RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent); 20 RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent);
21 updateLayoutAndStyleForPainting(); 21 updateLayoutAndStyleForPainting();
22 Node* host = document().getElementById("host"); 22 Node* host = document().getElementById("host");
23 Node* one = document().getElementById("one"); 23 Node* one = document().getElementById("one");
24 Node* three = shadowRoot->getElementById("three"); 24 Node* three = shadowRoot->getElementById("three");
25 25
26 EXPECT_EQ(host, enclosingNodeOfType(Position(one, 0), isBlock)); 26 EXPECT_EQ(host, enclosingNodeOfType(Position(one, 0), isEnclosingBlock));
27 EXPECT_EQ(three, enclosingNodeOfType(PositionInComposedTree(one, 0), isBlock )); 27 EXPECT_EQ(three, enclosingNodeOfType(PositionInComposedTree(one, 0), isEnclo singBlock));
28 } 28 }
29 29
30 TEST_F(EditingUtilitiesTest, NextNodeIndex) 30 TEST_F(EditingUtilitiesTest, NextNodeIndex)
31 { 31 {
32 const char* bodyContent = "<p id='host'>00<b id='one'>11</b><b id='two'>22</ b>33</p>"; 32 const char* bodyContent = "<p id='host'>00<b id='one'>11</b><b id='two'>22</ b>33</p>";
33 const char* shadowContent = "<content select=#two></content><content select= #one></content>"; 33 const char* shadowContent = "<content select=#two></content><content select= #one></content>";
34 setBodyContent(bodyContent); 34 setBodyContent(bodyContent);
35 setShadowContent(shadowContent); 35 setShadowContent(shadowContent);
36 Node* host = document().getElementById("host"); 36 Node* host = document().getElementById("host");
37 Node* two = document().getElementById("two"); 37 Node* two = document().getElementById("two");
(...skipping 11 matching lines...) Expand all
49 updateLayoutAndStyleForPainting(); 49 updateLayoutAndStyleForPainting();
50 Node* one = document().getElementById("one"); 50 Node* one = document().getElementById("one");
51 Node* two = document().getElementById("two"); 51 Node* two = document().getElementById("two");
52 Node* three = document().getElementById("three"); 52 Node* three = document().getElementById("three");
53 53
54 EXPECT_EQ(Position(two->firstChild(), 1), nextVisuallyDistinctCandidate(Posi tion(one, 1))); 54 EXPECT_EQ(Position(two->firstChild(), 1), nextVisuallyDistinctCandidate(Posi tion(one, 1)));
55 EXPECT_EQ(PositionInComposedTree(three->firstChild(), 1), nextVisuallyDistin ctCandidate(PositionInComposedTree(one, 1))); 55 EXPECT_EQ(PositionInComposedTree(three->firstChild(), 1), nextVisuallyDistin ctCandidate(PositionInComposedTree(one, 1)));
56 } 56 }
57 57
58 } // namespace blink 58 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698