ServiceWorker: Implement navigator.serviceWorker.getRegistration [3/3]

Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 187 matching lines @@
         ServiceWorkerContainer* container = ServiceWorkerContainer::create(executionContext());
         ScriptState::Scope scriptScope(scriptState());
         Dictionary options = Dictionary::createEmpty(isolate());
         EXPECT_TRUE(options.set("scope", scope));
         ScriptPromise promise = container->unregisterServiceWorker(scriptState(), scope);
         expectRejected(scriptState(), promise, valueTest);
 
         container->willBeDetachedFromFrame();
     }
 
+    void testGetRegistrationRejected(const String& documentURL, const ScriptValueTest& valueTest)
+    {
+        provide(adoptPtr(new NotReachedWebServiceWorkerProvider()));
+
+        ServiceWorkerContainer* container = ServiceWorkerContainer::create(executionContext());
+        ScriptState::Scope scriptScope(scriptState());
+        ScriptPromise promise = container->getRegistration(scriptState(), documentURL);
+        expectRejected(scriptState(), promise, valueTest);
+
+        container->willBeDetachedFromFrame();
+    }
+
 private:
     OwnPtr<DummyPageHolder> m_page;
 };
 
 TEST_F(ServiceWorkerContainerTest, Register_NonSecureOriginIsRejected)
 {
     setPageURL("http://www.example.com/");
     testRegisterRejected(
         "http://www.example.com/worker.js",
         "http://www.example.com/",
@@ skipping 27 matching lines @@
 }
 
 TEST_F(ServiceWorkerContainerTest, Unregister_CrossOriginScopeIsRejected)
 {
     setPageURL("https://www.example.com");
     testUnregisterRejected(
         "https://example.com/", // Differs by host
         ExpectDOMException("SecurityError", "The scope must match the current origin."));
 }
 
+TEST_F(ServiceWorkerContainerTest, GetRegistration_NonSecureOriginIsRejected)
+{
+    setPageURL("http://www.example.com/");
+    testGetRegistrationRejected(
+        "http://www.example.com/",
+        ExpectDOMException("NotSupportedError", "Only secure origins are allowed. http://goo.gl/lq4gCo"));
+}
+

[nhiroki, 2014/09/10 07:45:04]

Can you test the CrossOriginDocument case?

[Kunihiko Sakamoto, 2014/09/10 09:34:51]

Done.

 class StubWebServiceWorkerProvider {
 public:
     StubWebServiceWorkerProvider()
         : m_registerCallCount(0)
         , m_unregisterCallCount(0)
     {
     }
 
     // Creates a WebServiceWorkerProvider. This can outlive the
     // StubWebServiceWorkerProvider, but |registerServiceWorker| and
@@ skipping 77 matching lines @@
 
         EXPECT_EQ(1ul, stubProvider.unregisterCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/y/")), stubProvider.unregisterScope());
     }
 
     container->willBeDetachedFromFrame();
 }
 
 } // namespace
 } // namespace blink