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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/page/EventSourceTest.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5 Created 4 years, 10 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
Download patch
« third_party/WebKit/Source/core/editing/CaretBase.h ('K') | « third_party/WebKit/Source/core/loader/LinkLoader.cpp ('k') | third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/page/EventSourceTest.cpp
diff --git a/third_party/WebKit/Source/core/page/EventSourceTest.cpp b/third_party/WebKit/Source/core/page/EventSourceTest.cpp
index 221a463977fcf2ea17015779db680a4662d9cfc0..0b55920d05d21c9a0f2c73dcc2c58c49492b036f 100644
--- a/third_party/WebKit/Source/core/page/EventSourceTest.cpp
+++ b/third_party/WebKit/Source/core/page/EventSourceTest.cpp
@@ -31,7 +31,7 @@ String dataAsString(ScriptState* scriptState, MessageEvent* event)
{
ScriptState::Scope scope(scriptState);
v8::Isolate* isolate = scriptState->isolate();
- ASSERT(MessageEvent::DataTypeSerializedScriptValue == event->dataType());
+ ASSERT(MessageEvent::DataTypeSerializedScriptValue == event->getDataType());
if (!event->dataAsSerializedScriptValue())
return String();
MessagePortArray ports = event->ports();
@@ -124,7 +124,7 @@ TEST_F(EventSourceTest, DispatchSimpleMessageEvent)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
EXPECT_EQ(String(), event->lastEventId());
}
@@ -139,7 +139,7 @@ TEST_F(EventSourceTest, DispatchMessageEventWithLastEventId)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
EXPECT_EQ("99", event->lastEventId());
}
@@ -154,7 +154,7 @@ TEST_F(EventSourceTest, DispatchMessageEventWithCustomEventType)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("foo", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
@@ -183,13 +183,13 @@ TEST_F(EventSourceTest, EventTypeShouldBeReset)
ASSERT_EQ(1u, fooListener->events().size());
ASSERT_EQ("foo", fooListener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> fooEvent = static_cast<MessageEvent*>(fooListener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, fooEvent->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, fooEvent->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), fooEvent.get()));
ASSERT_EQ(1u, messageListener->events().size());
ASSERT_EQ("message", messageListener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> messageEvent = static_cast<MessageEvent*>(messageListener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, messageEvent->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, messageEvent->getDataType());
EXPECT_EQ("bye", dataAsString(scriptState(), messageEvent.get()));
}
@@ -203,7 +203,7 @@ TEST_F(EventSourceTest, DataShouldBeReset)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
@@ -218,13 +218,13 @@ TEST_F(EventSourceTest, LastEventIdShouldNotBeReset)
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
EXPECT_EQ("99", event0->lastEventId());
ASSERT_EQ("message", listener->events()[1]->type());
RefPtrWillBeRawPtr<MessageEvent> event1 = static_cast<MessageEvent*>(listener->events()[1].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event1->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event1->getDataType());
EXPECT_EQ("bye", dataAsString(scriptState(), event1.get()));
EXPECT_EQ("99", event1->lastEventId());
}
@@ -240,12 +240,12 @@ TEST_F(EventSourceTest, VariousNewLinesShouldBeAllowed)
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
ASSERT_EQ("message", listener->events()[1]->type());
RefPtrWillBeRawPtr<MessageEvent> event1 = static_cast<MessageEvent*>(listener->events()[1].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event1->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event1->getDataType());
EXPECT_EQ("bye", dataAsString(scriptState(), event1.get()));
}
@@ -304,7 +304,7 @@ TEST_F(EventSourceTest, UnrecognizedFieldShouldBeIgnored)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
@@ -319,7 +319,7 @@ TEST_F(EventSourceTest, CommentShouldBeIgnored)
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
}
@@ -334,7 +334,7 @@ TEST_F(EventSourceTest, BOMShouldBeIgnored)
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
}
@@ -349,7 +349,7 @@ TEST_F(EventSourceTest, ColonlessLineShouldBeTreatedAsNameOnlyField)
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
}
@@ -363,7 +363,7 @@ TEST_F(EventSourceTest, AtMostOneLeadingSpaceCanBeSkipped)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ(" type ", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ(" hello ", dataAsString(scriptState(), event.get()));
}
@@ -377,7 +377,7 @@ TEST_F(EventSourceTest, DataShouldAccumulate)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello\nworld\n", dataAsString(scriptState(), event.get()));
}
@@ -394,7 +394,7 @@ TEST_F(EventSourceTest, EventShouldNotAccumulate)
ASSERT_EQ(1u, bListener->events().size());
ASSERT_EQ("b", bListener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(bListener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
@@ -414,14 +414,14 @@ TEST_F(EventSourceTest, FeedDataOneByOne)
ASSERT_EQ(1u, bListener->events().size());
ASSERT_EQ("b", bListener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> bEvent = static_cast<MessageEvent*>(bListener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, bEvent->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, bEvent->getDataType());
EXPECT_EQ("hello\nworld", dataAsString(scriptState(), bEvent.get()));
EXPECT_EQ("4", bEvent->lastEventId());
ASSERT_EQ(1u, messageListener->events().size());
ASSERT_EQ("message", messageListener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> messageEvent = static_cast<MessageEvent*>(messageListener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, messageEvent->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, messageEvent->getDataType());
EXPECT_EQ("bye", dataAsString(scriptState(), messageEvent.get()));
EXPECT_EQ("8", messageEvent->lastEventId());
}
@@ -436,7 +436,7 @@ TEST_F(EventSourceTest, InvalidUTF8Sequence)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
- ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
+ ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->getDataType());
String expected = String() + replacementCharacter + "hello" + replacementCharacter;
EXPECT_EQ(expected, dataAsString(scriptState(), event.get()));
}
« third_party/WebKit/Source/core/editing/CaretBase.h ('K') | « third_party/WebKit/Source/core/loader/LinkLoader.cpp ('k') | third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698