Decouple ScriptPromise creation from ScriptPromiseResolver.

Source/bindings/v8/ScriptPromiseResolverTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
         , m_handleScope(m_isolate)
         , m_context(m_isolate, v8::Context::New(m_isolate))
         , m_contextScope(m_context.newLocal(m_isolate))
     {
     }
 
     void SetUp()
     {
         m_perContextData = V8PerContextData::create(m_context.newLocal(m_isolate));
         m_perContextData->init();
-        m_resolver = ScriptPromiseResolver::create();
-        m_promise = m_resolver->promise();
+        m_promise = ScriptPromise::createPending();
+        m_resolver = ScriptPromiseResolver::create(m_promise);
     }
 
     void TearDown()
     {
         m_resolver = 0;
         m_promise.clear();
         m_perContextData.clear();
     }
 
     V8PromiseCustom::PromiseState state()
@@ skipping 22 matching lines @@
     OwnPtr<V8PerContextData> m_perContextData;
 };
 
 TEST_F(ScriptPromiseResolverTest, initialState)
 {
     EXPECT_TRUE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Pending, state());
     EXPECT_TRUE(result()->IsUndefined());
 }
 
-TEST_F(ScriptPromiseResolverTest, fulfill)
-{
-    EXPECT_TRUE(m_resolver->isPending());
-    EXPECT_EQ(V8PromiseCustom::Pending, state());
-    EXPECT_TRUE(result()->IsUndefined());
-
-    m_resolver->fulfill(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
-
-    EXPECT_FALSE(m_resolver->isPending());
-    EXPECT_EQ(V8PromiseCustom::Fulfilled, state());
-    ASSERT_TRUE(result()->IsNumber());
-    EXPECT_EQ(3, result().As<v8::Integer>()->Value());
-}
-
 TEST_F(ScriptPromiseResolverTest, resolve)
 {
     EXPECT_TRUE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Pending, state());
     EXPECT_TRUE(result()->IsUndefined());
 
     m_resolver->resolve(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
 
     EXPECT_FALSE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Fulfilled, state());
     ASSERT_TRUE(result()->IsNumber());
     EXPECT_EQ(3, result().As<v8::Integer>()->Value());
 }
 
 TEST_F(ScriptPromiseResolverTest, reject)
 {
     EXPECT_TRUE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Pending, state());
     EXPECT_TRUE(result()->IsUndefined());
 
     m_resolver->reject(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
 
     EXPECT_FALSE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Rejected, state());
     ASSERT_TRUE(result()->IsNumber());
     EXPECT_EQ(3, result().As<v8::Integer>()->Value());
 }
 
-TEST_F(ScriptPromiseResolverTest, fulfillOverFulfill)
+TEST_F(ScriptPromiseResolverTest, resolveOverResolve)
 {
     EXPECT_TRUE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Pending, state());
     EXPECT_TRUE(result()->IsUndefined());
 
-    m_resolver->fulfill(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
+    m_resolver->resolve(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
 
     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, m_isolate), m_isolate));
+    m_resolver->resolve(ScriptValue(v8::Integer::New(4, m_isolate), m_isolate));
     EXPECT_FALSE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Fulfilled, state());
     ASSERT_TRUE(result()->IsNumber());
     EXPECT_EQ(3, result().As<v8::Integer>()->Value());
 }
 
-TEST_F(ScriptPromiseResolverTest, rejectOverFulfill)
+TEST_F(ScriptPromiseResolverTest, rejectOverResolve)
 {
     EXPECT_TRUE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Pending, state());
     EXPECT_TRUE(result()->IsUndefined());
 
-    m_resolver->fulfill(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
+    m_resolver->resolve(ScriptValue(v8::Integer::New(3, m_isolate), m_isolate));
 
     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, m_isolate), m_isolate));
     EXPECT_FALSE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Fulfilled, state());
     ASSERT_TRUE(result()->IsNumber());
     EXPECT_EQ(3, result().As<v8::Integer>()->Value());
 }
 
-TEST_F(ScriptPromiseResolverTest, detach)
-{
-    EXPECT_TRUE(m_resolver->isPending());
-    EXPECT_EQ(V8PromiseCustom::Pending, state());
-    EXPECT_TRUE(result()->IsUndefined());
-
-    m_resolver->detach();
-
-    EXPECT_FALSE(m_resolver->isPending());
-    EXPECT_EQ(V8PromiseCustom::Rejected, state());
-    EXPECT_TRUE(result()->IsUndefined());
-}
-
 } // namespace
 
 } // namespace WebCore