Index: Source/bindings/v8/ScriptPromiseResolverTest.cpp |
diff --git a/Source/bindings/v8/ScriptPromiseResolverTest.cpp b/Source/bindings/v8/ScriptPromiseResolverTest.cpp |
index 3e719203dd0146af34f820f5bab12ffbd8a1d2f9..4b47f9a88e768f674b816ac1cf309dd0b8e9daea 100644 |
--- a/Source/bindings/v8/ScriptPromiseResolverTest.cpp |
+++ b/Source/bindings/v8/ScriptPromiseResolverTest.cpp |
@@ -31,6 +31,7 @@ |
#include "config.h" |
#include "bindings/v8/ScriptPromiseResolver.h" |
+#include "bindings/v8/ScriptPromise.h" |
#include "bindings/v8/V8Binding.h" |
#include "bindings/v8/custom/V8PromiseCustom.h" |
@@ -56,12 +57,12 @@ public: |
m_perContextData = V8PerContextData::create(m_context.newLocal(m_isolate)); |
m_perContextData->init(); |
m_resolver = ScriptPromiseResolver::create(); |
- m_promise = m_resolver->promise(); |
+ m_promise = m_resolver.promise(); |
} |
void TearDown() |
{ |
- m_resolver = 0; |
+ m_resolver.detach(); |
m_promise.clear(); |
m_perContextData.clear(); |
} |
@@ -79,7 +80,7 @@ public: |
v8::Local<v8::Object> promise() |
{ |
ASSERT(!m_promise.hasNoValue()); |
- return m_promise.v8Object(); |
+ return m_promise.v8Value().As<v8::Object>(); |
} |
protected: |
@@ -87,27 +88,27 @@ protected: |
v8::HandleScope m_handleScope; |
ScopedPersistent<v8::Context> m_context; |
v8::Context::Scope m_contextScope; |
- RefPtr<ScriptPromiseResolver> m_resolver; |
- ScriptObject m_promise; |
+ ScriptPromiseResolver m_resolver; |
+ ScriptPromise m_promise; |
OwnPtr<V8PerContextData> m_perContextData; |
}; |
TEST_F(ScriptPromiseResolverTest, initialState) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
} |
TEST_F(ScriptPromiseResolverTest, fulfill) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
- m_resolver->fulfill(ScriptValue(v8::Integer::New(3))); |
+ m_resolver.fulfill(ScriptValue(v8::Integer::New(3))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Fulfilled, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
@@ -115,13 +116,13 @@ TEST_F(ScriptPromiseResolverTest, fulfill) |
TEST_F(ScriptPromiseResolverTest, resolve) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
- m_resolver->resolve(ScriptValue(v8::Integer::New(3))); |
+ m_resolver.resolve(ScriptValue(v8::Integer::New(3))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Fulfilled, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
@@ -129,13 +130,13 @@ TEST_F(ScriptPromiseResolverTest, resolve) |
TEST_F(ScriptPromiseResolverTest, reject) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
- m_resolver->reject(ScriptValue(v8::Integer::New(3))); |
+ m_resolver.reject(ScriptValue(v8::Integer::New(3))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Rejected, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
@@ -143,19 +144,19 @@ TEST_F(ScriptPromiseResolverTest, reject) |
TEST_F(ScriptPromiseResolverTest, fulfillOverFulfill) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
- m_resolver->fulfill(ScriptValue(v8::Integer::New(3))); |
+ m_resolver.fulfill(ScriptValue(v8::Integer::New(3))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Fulfilled, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
- m_resolver->fulfill(ScriptValue(v8::Integer::New(4))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ m_resolver.fulfill(ScriptValue(v8::Integer::New(4))); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Fulfilled, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
@@ -163,19 +164,19 @@ TEST_F(ScriptPromiseResolverTest, fulfillOverFulfill) |
TEST_F(ScriptPromiseResolverTest, rejectOverFulfill) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
- m_resolver->fulfill(ScriptValue(v8::Integer::New(3))); |
+ m_resolver.fulfill(ScriptValue(v8::Integer::New(3))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Fulfilled, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
- m_resolver->reject(ScriptValue(v8::Integer::New(4))); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ m_resolver.reject(ScriptValue(v8::Integer::New(4))); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Fulfilled, state()); |
ASSERT_TRUE(result()->IsNumber()); |
EXPECT_EQ(3, result().As<v8::Integer>()->Value()); |
@@ -183,13 +184,13 @@ TEST_F(ScriptPromiseResolverTest, rejectOverFulfill) |
TEST_F(ScriptPromiseResolverTest, detach) |
{ |
- EXPECT_TRUE(m_resolver->isPending()); |
+ EXPECT_TRUE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Pending, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
- m_resolver->detach(); |
+ m_resolver.detach(); |
- EXPECT_FALSE(m_resolver->isPending()); |
+ EXPECT_FALSE(m_resolver.isPending()); |
EXPECT_EQ(V8PromiseCustom::Rejected, state()); |
EXPECT_TRUE(result()->IsUndefined()); |
} |