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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/core/page/EventSource.cpp ('k') | third_party/WebKit/Source/core/page/FocusController.h » ('j') | third_party/WebKit/Source/willbe.pl » ('J')
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 6ab1b8197d81e706e7b0116340f1cebdf7554c98..b8c1f1a92df8177ca4f128cc0821ea6e7e5a42f3 100644
--- a/third_party/WebKit/Source/core/page/EventSourceTest.cpp
+++ b/third_party/WebKit/Source/core/page/EventSourceTest.cpp
@@ -39,12 +39,12 @@ String dataAsString(ScriptState* scriptState, MessageEvent* event)
class FakeEventListener : public EventListener {
public:
- static PassRefPtrWillBeRawPtr<FakeEventListener> create()
+ static RawPtr<FakeEventListener> create()
{
- return adoptRefWillBeNoop(new FakeEventListener());
+ return (new FakeEventListener());
}
bool operator==(const EventListener& x) const override { return &x == this; }
- const WillBeHeapVector<RefPtrWillBeMember<Event>>& events() { return m_events; }
+ const HeapVector<Member<Event>>& events() { return m_events; }
void handleEvent(ExecutionContext* executionContext, Event* event)
{
m_events.append(event);
@@ -57,7 +57,7 @@ public:
protected:
FakeEventListener() : EventListener(EventListener::CPPEventListenerType) {}
- WillBeHeapVector<RefPtrWillBeMember<Event>> m_events;
+ HeapVector<Member<Event>> m_events;
};
class EventSourceTest : public ::testing::Test {
@@ -102,7 +102,7 @@ private:
TEST_F(EventSourceTest, EmptyMessageEventShouldNotBeDispatched)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("\n");
@@ -112,14 +112,14 @@ TEST_F(EventSourceTest, EmptyMessageEventShouldNotBeDispatched)
TEST_F(EventSourceTest, DispatchSimpleMessageEvent)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("data:hello\n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
EXPECT_EQ(String(), event->lastEventId());
@@ -127,14 +127,14 @@ TEST_F(EventSourceTest, DispatchSimpleMessageEvent)
TEST_F(EventSourceTest, DispatchMessageEventWithLastEventId)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("id:99\ndata:hello\n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
EXPECT_EQ("99", event->lastEventId());
@@ -142,21 +142,21 @@ TEST_F(EventSourceTest, DispatchMessageEventWithLastEventId)
TEST_F(EventSourceTest, DispatchMessageEventWithCustomEventType)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("foo", listener);
enqueue("event:foo\ndata:hello\n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("foo", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
TEST_F(EventSourceTest, RetryTakesEffectEvenWhenNotDispatching)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
ASSERT_NE(999u, EventSource::defaultReconnectDelay);
@@ -169,8 +169,8 @@ TEST_F(EventSourceTest, RetryTakesEffectEvenWhenNotDispatching)
TEST_F(EventSourceTest, EventTypeShouldBeReset)
{
- RefPtrWillBeRawPtr<FakeEventListener> fooListener = FakeEventListener::create();
- RefPtrWillBeRawPtr<FakeEventListener> messageListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> fooListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> messageListener = FakeEventListener::create();
source()->addEventListener("foo", fooListener);
source()->addEventListener("message", messageListener);
@@ -178,34 +178,34 @@ 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());
+ RawPtr<MessageEvent> fooEvent = static_cast<MessageEvent*>(fooListener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, fooEvent->dataType());
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());
+ RawPtr<MessageEvent> messageEvent = static_cast<MessageEvent*>(messageListener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, messageEvent->dataType());
EXPECT_EQ("bye", dataAsString(scriptState(), messageEvent.get()));
}
TEST_F(EventSourceTest, DataShouldBeReset)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("data:hello\n\n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
TEST_F(EventSourceTest, LastEventIdShouldNotBeReset)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("id:99\ndata:hello\n\ndata:bye\n\n");
@@ -213,13 +213,13 @@ TEST_F(EventSourceTest, LastEventIdShouldNotBeReset)
ASSERT_EQ(2u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
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());
+ RawPtr<MessageEvent> event1 = static_cast<MessageEvent*>(listener->events()[1].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event1->dataType());
EXPECT_EQ("bye", dataAsString(scriptState(), event1.get()));
EXPECT_EQ("99", event1->lastEventId());
@@ -227,7 +227,7 @@ TEST_F(EventSourceTest, LastEventIdShouldNotBeReset)
TEST_F(EventSourceTest, VariousNewLinesShouldBeAllowed)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueueOneByOne("data:hello\r\n\rdata:bye\r\r");
@@ -235,12 +235,12 @@ TEST_F(EventSourceTest, VariousNewLinesShouldBeAllowed)
ASSERT_EQ(2u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
ASSERT_EQ("message", listener->events()[1]->type());
- RefPtrWillBeRawPtr<MessageEvent> event1 = static_cast<MessageEvent*>(listener->events()[1].get());
+ RawPtr<MessageEvent> event1 = static_cast<MessageEvent*>(listener->events()[1].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event1->dataType());
EXPECT_EQ("bye", dataAsString(scriptState(), event1.get()));
}
@@ -258,7 +258,7 @@ TEST_F(EventSourceTest, RetryWithEmptyValueShouldRestoreDefaultValue)
TEST_F(EventSourceTest, NonDigitRetryShouldBeIgnored)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
@@ -292,21 +292,21 @@ TEST_F(EventSourceTest, NonDigitRetryShouldBeIgnored)
TEST_F(EventSourceTest, UnrecognizedFieldShouldBeIgnored)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("data:hello\nhoge:fuga\npiyo\n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
TEST_F(EventSourceTest, CommentShouldBeIgnored)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("data:hello\n:event:a\n\n");
@@ -314,14 +314,14 @@ TEST_F(EventSourceTest, CommentShouldBeIgnored)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
}
TEST_F(EventSourceTest, BOMShouldBeIgnored)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("\xef\xbb\xbf" "data:hello\n\n");
@@ -329,14 +329,14 @@ TEST_F(EventSourceTest, BOMShouldBeIgnored)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
}
TEST_F(EventSourceTest, ColonlessLineShouldBeTreatedAsNameOnlyField)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("data:hello\nevent:a\nevent\n\n");
@@ -344,43 +344,43 @@ TEST_F(EventSourceTest, ColonlessLineShouldBeTreatedAsNameOnlyField)
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event0 = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event0->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event0.get()));
}
TEST_F(EventSourceTest, AtMostOneLeadingSpaceCanBeSkipped)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener(" type ", listener);
enqueue("data: hello \nevent: type \n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ(" type ", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ(" hello ", dataAsString(scriptState(), event.get()));
}
TEST_F(EventSourceTest, DataShouldAccumulate)
{
- RefPtrWillBeRawPtr<FakeEventListener> listener = FakeEventListener::create();
+ RawPtr<FakeEventListener> listener = FakeEventListener::create();
source()->addEventListener("message", listener);
enqueue("data:hello\ndata: world\ndata\n\n");
ASSERT_EQ(1u, listener->events().size());
ASSERT_EQ("message", listener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(listener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello\nworld\n", dataAsString(scriptState(), event.get()));
}
TEST_F(EventSourceTest, EventShouldNotAccumulate)
{
- RefPtrWillBeRawPtr<FakeEventListener> aListener = FakeEventListener::create();
- RefPtrWillBeRawPtr<FakeEventListener> bListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> aListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> bListener = FakeEventListener::create();
source()->addEventListener("a", aListener);
source()->addEventListener("b", bListener);
@@ -389,16 +389,16 @@ TEST_F(EventSourceTest, EventShouldNotAccumulate)
ASSERT_EQ(0u, aListener->events().size());
ASSERT_EQ(1u, bListener->events().size());
ASSERT_EQ("b", bListener->events()[0]->type());
- RefPtrWillBeRawPtr<MessageEvent> event = static_cast<MessageEvent*>(bListener->events()[0].get());
+ RawPtr<MessageEvent> event = static_cast<MessageEvent*>(bListener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, event->dataType());
EXPECT_EQ("hello", dataAsString(scriptState(), event.get()));
}
TEST_F(EventSourceTest, FeedDataOneByOne)
{
- RefPtrWillBeRawPtr<FakeEventListener> aListener = FakeEventListener::create();
- RefPtrWillBeRawPtr<FakeEventListener> bListener = FakeEventListener::create();
- RefPtrWillBeRawPtr<FakeEventListener> messageListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> aListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> bListener = FakeEventListener::create();
+ RawPtr<FakeEventListener> messageListener = FakeEventListener::create();
source()->addEventListener("a", aListener);
source()->addEventListener("b", bListener);
@@ -409,14 +409,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());
+ RawPtr<MessageEvent> bEvent = static_cast<MessageEvent*>(bListener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, bEvent->dataType());
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());
+ RawPtr<MessageEvent> messageEvent = static_cast<MessageEvent*>(messageListener->events()[0].get());
ASSERT_EQ(MessageEvent::DataTypeSerializedScriptValue, messageEvent->dataType());
EXPECT_EQ("bye", dataAsString(scriptState(), messageEvent.get()));
EXPECT_EQ("8", messageEvent->lastEventId());
« third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/core/page/EventSource.cpp ('k') | third_party/WebKit/Source/core/page/FocusController.h » ('j') | third_party/WebKit/Source/willbe.pl » ('J')

Powered by Google App Engine
This is Rietveld 408576698