Service Worker Cache: Simplify exception/rejection processing

Source/modules/serviceworkers/CacheTest.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/Cache.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 244 matching lines @@
 
     // Lifetime is that of the text fixture.
     OwnPtr<DummyPageHolder> m_page;
 
     // Lifetime is per test instance.
     OwnPtr<ScriptState::Scope> m_scriptScope;
 };
 
 TEST_F(ServiceWorkerCacheTest, Basics)
 {
+    NonThrowableExceptionState exceptionState;

[jsbell, 2014/10/31 23:06:19]

Should I make this a member of the fixture instead? Private, with an accessor?
I'm not sure if that's better than making it explicit and local, though.

[jkarlin, 2014/11/03 18:51:04]

I'm in favor of making it a private member as it's used in several tests.

+
     ErrorWebCacheForTests* testCache;
     Cache* cache = Cache::create(testCache = new NotImplementedErrorCache());
     ASSERT(cache);
 
     const String url = "http://www.cachetest.org/";
 
     CacheQueryOptions options;
-    ScriptPromise matchPromise = cache->match(scriptState(), url, options);
+    ScriptPromise matchPromise = cache->match(scriptState(), url, options, exceptionState);
     EXPECT_EQ(kNotImplementedString, getRejectString(matchPromise));
 
     cache = Cache::create(testCache = new ErrorWebCacheForTests(WebServiceWorkerCacheErrorNotFound));
-    matchPromise = cache->match(scriptState(), url, options);
+    matchPromise = cache->match(scriptState(), url, options, exceptionState);
     ScriptValue scriptValue = getResolveValue(matchPromise);
     EXPECT_TRUE(scriptValue.isUndefined());
 
     cache = Cache::create(testCache = new ErrorWebCacheForTests(WebServiceWorkerCacheErrorExists));
-    matchPromise = cache->match(scriptState(), url, options);
+    matchPromise = cache->match(scriptState(), url, options, exceptionState);
     EXPECT_EQ("InvalidAccessError: Entry already exists.", getRejectString(matchPromise));
 }
 
 // Tests that arguments are faithfully passed on calls to Cache methods, except for methods which use batch operations,
 // which are tested later.
 TEST_F(ServiceWorkerCacheTest, BasicArguments)
 {
+    NonThrowableExceptionState exceptionState;
+
     ErrorWebCacheForTests* testCache;
     Cache* cache = Cache::create(testCache = new NotImplementedErrorCache());
     ASSERT(cache);
 
     const String url = "http://www.cache.arguments.test/";
     testCache->setExpectedUrl(&url);
 
     WebServiceWorkerCache::QueryParams expectedQueryParams;
     expectedQueryParams.ignoreVary = true;
     expectedQueryParams.cacheName = "this is a cache name";
     testCache->setExpectedQueryParams(&expectedQueryParams);
 
     CacheQueryOptions options;
     options.setIgnoreVary(1);
     options.setCacheName(expectedQueryParams.cacheName);
 
     Request* request = newRequestFromUrl(url);
     ASSERT(request);
     ScriptPromise matchResult = cache->match(scriptState(), request, options);
     EXPECT_EQ("dispatchMatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(matchResult));
 
-    ScriptPromise stringMatchResult = cache->match(scriptState(), url, options);
+    ScriptPromise stringMatchResult = cache->match(scriptState(), url, options, exceptionState);
     EXPECT_EQ("dispatchMatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(stringMatchResult));
 
     request = newRequestFromUrl(url);
     ASSERT(request);
     ScriptPromise matchAllResult = cache->matchAll(scriptState(), request, options);
     EXPECT_EQ("dispatchMatchAll", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(matchAllResult));
 
-    ScriptPromise stringMatchAllResult = cache->matchAll(scriptState(), url, options);
+    ScriptPromise stringMatchAllResult = cache->matchAll(scriptState(), url, options, exceptionState);
     EXPECT_EQ("dispatchMatchAll", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(stringMatchAllResult));
 
     ScriptPromise keysResult1 = cache->keys(scriptState());
     EXPECT_EQ("dispatchKeys", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(keysResult1));
 
     request = newRequestFromUrl(url);
     ASSERT(request);
     ScriptPromise keysResult2 = cache->keys(scriptState(), request, options);
     EXPECT_EQ("dispatchKeys", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(keysResult2));
 
-    ScriptPromise stringKeysResult2 = cache->keys(scriptState(), url, options);
+    ScriptPromise stringKeysResult2 = cache->keys(scriptState(), url, options, exceptionState);
     EXPECT_EQ("dispatchKeys", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(stringKeysResult2));
 }
 
 // Tests that arguments are faithfully passed to API calls that degrade to batch operations.
 TEST_F(ServiceWorkerCacheTest, BatchOperationArguments)
 {
+    NonThrowableExceptionState exceptionState;
+
     ErrorWebCacheForTests* testCache;
     Cache* cache = Cache::create(testCache = new NotImplementedErrorCache());
     ASSERT(cache);
 
     WebServiceWorkerCache::QueryParams expectedQueryParams;
     expectedQueryParams.prefixMatch = true;
     expectedQueryParams.cacheName = "this is another cache name";
     testCache->setExpectedQueryParams(&expectedQueryParams);
 
     CacheQueryOptions options;
@@ skipping 15 matching lines @@
         request->populateWebServiceWorkerRequest(deleteOperation.request);
         deleteOperation.matchParams = expectedQueryParams;
         expectedDeleteOperations[0] = deleteOperation;
     }
     testCache->setExpectedBatchOperations(&expectedDeleteOperations);
 
     ScriptPromise deleteResult = cache->deleteFunction(scriptState(), request, options);
     EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(deleteResult));
 
-    ScriptPromise stringDeleteResult = cache->deleteFunction(scriptState(), url, options);
+    ScriptPromise stringDeleteResult = cache->deleteFunction(scriptState(), url, options, exceptionState);
     EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(stringDeleteResult));
 
     WebVector<WebServiceWorkerCache::BatchOperation> expectedPutOperations(size_t(1));
     {
         WebServiceWorkerCache::BatchOperation putOperation;
         putOperation.operationType = WebServiceWorkerCache::OperationTypePut;
         request->populateWebServiceWorkerRequest(putOperation.request);
         response->populateWebServiceWorkerResponse(putOperation.response);
         expectedPutOperations[0] = putOperation;
     }
     testCache->setExpectedBatchOperations(&expectedPutOperations);
 
     request = newRequestFromUrl(url);
     ASSERT(request);
     ScriptPromise putResult = cache->put(scriptState(), request, response);
     EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(putResult));
 
-    ScriptPromise stringPutResult = cache->put(scriptState(), url, response);
+    ScriptPromise stringPutResult = cache->put(scriptState(), url, response, exceptionState);
     EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
     EXPECT_EQ(kNotImplementedString, getRejectString(stringPutResult));
 
     // FIXME: test add & addAll.
 }
 
 class MatchTestCache : public NotImplementedErrorCache {
 public:
     MatchTestCache(WebServiceWorkerResponse& response)
         : m_response(response) { }
 
     // From WebServiceWorkerCache:
     virtual void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheMatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess(&m_response);
     }
 
 private:
     WebServiceWorkerResponse& m_response;
 };
 
 TEST_F(ServiceWorkerCacheTest, MatchResponseTest)
 {
+    NonThrowableExceptionState exceptionState;
+
     const String requestUrl = "http://request.url/";
     const String responseUrl = "http://match.response.test/";
 
     WebServiceWorkerResponse webResponse;
     webResponse.setURL(KURL(ParsedURLString, responseUrl));
     webResponse.setResponseType(WebServiceWorkerResponseTypeDefault);
 
     Cache* cache = Cache::create(new MatchTestCache(webResponse));
     CacheQueryOptions options;
 
-    ScriptPromise result = cache->match(scriptState(), requestUrl, options);
+    ScriptPromise result = cache->match(scriptState(), requestUrl, options, exceptionState);
     ScriptValue scriptValue = getResolveValue(result);
     Response* response = V8Response::toImplWithTypeCheck(isolate(), scriptValue.v8Value());
     ASSERT_TRUE(response);
     EXPECT_EQ(responseUrl, response->url());
 }
 
 class KeysTestCache : public NotImplementedErrorCache {
 public:
     KeysTestCache(WebVector<WebServiceWorkerRequest>& requests)
         : m_requests(requests) { }
@@ skipping 53 matching lines @@
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess(&m_responses);
     }
 
 private:
     WebVector<WebServiceWorkerResponse>& m_responses;
 };
 
 TEST_F(ServiceWorkerCacheTest, MatchAllAndBatchResponseTest)
 {
+    NonThrowableExceptionState exceptionState;
+
     const String url1 = "http://first.response/";
     const String url2 = "http://second.response/";
 
     Vector<String> expectedUrls(size_t(2));
     expectedUrls[0] = url1;
     expectedUrls[1] = url2;
 
     WebVector<WebServiceWorkerResponse> webResponses(size_t(2));
     webResponses[0].setURL(KURL(ParsedURLString, url1));
     webResponses[0].setResponseType(WebServiceWorkerResponseTypeDefault);
     webResponses[1].setURL(KURL(ParsedURLString, url2));
     webResponses[1].setResponseType(WebServiceWorkerResponseTypeDefault);
 
     Cache* cache = Cache::create(new MatchAllAndBatchTestCache(webResponses));
 
     CacheQueryOptions options;
-    ScriptPromise result = cache->matchAll(scriptState(), "http://some.url/", options);
+    ScriptPromise result = cache->matchAll(scriptState(), "http://some.url/", options, exceptionState);
     ScriptValue scriptValue = getResolveValue(result);
 
-    NonThrowableExceptionState exceptionState;
     Vector<v8::Handle<v8::Value> > responses = toImplArray<v8::Handle<v8::Value> >(scriptValue.v8Value(), 0, isolate(), exceptionState);
     EXPECT_EQ(expectedUrls.size(), responses.size());
     for (int i = 0, minsize = std::min(expectedUrls.size(), responses.size()); i < minsize; ++i) {
         Response* response = V8Response::toImplWithTypeCheck(isolate(), responses[i]);
         EXPECT_TRUE(response);
         if (response)
             EXPECT_EQ(expectedUrls[i], response->url());
     }
 
-    result = cache->deleteFunction(scriptState(), "http://some.url/", options);
+    result = cache->deleteFunction(scriptState(), "http://some.url/", options, exceptionState);
     scriptValue = getResolveValue(result);
     EXPECT_TRUE(scriptValue.v8Value()->IsBoolean());
     EXPECT_EQ(true, scriptValue.v8Value()->BooleanValue());
 }
 
 } // namespace
 } // namespace blink