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

Side by Side Diff: Source/modules/cachestorage/CacheTest.cpp

Issue 1125683002: Avoid nearly identical toImplArray() and toImplHeapArray() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/cachestorage/Cache.h" 6 #include "modules/cachestorage/Cache.h"
7 7
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ScriptFunction.h" 9 #include "bindings/core/v8/ScriptFunction.h"
10 #include "bindings/core/v8/ScriptPromise.h" 10 #include "bindings/core/v8/ScriptPromise.h"
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 545
546 WebVector<WebServiceWorkerRequest> webRequests(size_t(2)); 546 WebVector<WebServiceWorkerRequest> webRequests(size_t(2));
547 webRequests[0].setURL(KURL(ParsedURLString, url1)); 547 webRequests[0].setURL(KURL(ParsedURLString, url1));
548 webRequests[1].setURL(KURL(ParsedURLString, url2)); 548 webRequests[1].setURL(KURL(ParsedURLString, url2));
549 549
550 Cache* cache = createCache(new KeysTestCache(webRequests)); 550 Cache* cache = createCache(new KeysTestCache(webRequests));
551 551
552 ScriptPromise result = cache->keys(scriptState(), exceptionState()); 552 ScriptPromise result = cache->keys(scriptState(), exceptionState());
553 ScriptValue scriptValue = getResolveValue(result); 553 ScriptValue scriptValue = getResolveValue(result);
554 554
555 Vector<v8::Local<v8::Value>> requests = toImplArray<v8::Local<v8::Value>>(sc riptValue.v8Value(), 0, isolate(), exceptionState()); 555 Vector<v8::Local<v8::Value>> requests = toImplArray<Vector<v8::Local<v8::Val ue>>>(scriptValue.v8Value(), 0, isolate(), exceptionState());
556 EXPECT_EQ(expectedUrls.size(), requests.size()); 556 EXPECT_EQ(expectedUrls.size(), requests.size());
557 for (int i = 0, minsize = std::min(expectedUrls.size(), requests.size()); i < minsize; ++i) { 557 for (int i = 0, minsize = std::min(expectedUrls.size(), requests.size()); i < minsize; ++i) {
558 Request* request = V8Request::toImplWithTypeCheck(isolate(), requests[i] ); 558 Request* request = V8Request::toImplWithTypeCheck(isolate(), requests[i] );
559 EXPECT_TRUE(request); 559 EXPECT_TRUE(request);
560 if (request) 560 if (request)
561 EXPECT_EQ(expectedUrls[i], request->url()); 561 EXPECT_EQ(expectedUrls[i], request->url());
562 } 562 }
563 } 563 }
564 564
565 class MatchAllAndBatchTestCache : public NotImplementedErrorCache { 565 class MatchAllAndBatchTestCache : public NotImplementedErrorCache {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 webResponses[0].setResponseType(WebServiceWorkerResponseTypeDefault); 597 webResponses[0].setResponseType(WebServiceWorkerResponseTypeDefault);
598 webResponses[1].setURL(KURL(ParsedURLString, url2)); 598 webResponses[1].setURL(KURL(ParsedURLString, url2));
599 webResponses[1].setResponseType(WebServiceWorkerResponseTypeDefault); 599 webResponses[1].setResponseType(WebServiceWorkerResponseTypeDefault);
600 600
601 Cache* cache = createCache(new MatchAllAndBatchTestCache(webResponses)); 601 Cache* cache = createCache(new MatchAllAndBatchTestCache(webResponses));
602 602
603 CacheQueryOptions options; 603 CacheQueryOptions options;
604 ScriptPromise result = cache->matchAll(scriptState(), stringToRequestInfo("h ttp://some.url/"), options, exceptionState()); 604 ScriptPromise result = cache->matchAll(scriptState(), stringToRequestInfo("h ttp://some.url/"), options, exceptionState());
605 ScriptValue scriptValue = getResolveValue(result); 605 ScriptValue scriptValue = getResolveValue(result);
606 606
607 Vector<v8::Local<v8::Value>> responses = toImplArray<v8::Local<v8::Value>>(s criptValue.v8Value(), 0, isolate(), exceptionState()); 607 Vector<v8::Local<v8::Value>> responses = toImplArray<Vector<v8::Local<v8::Va lue>>>(scriptValue.v8Value(), 0, isolate(), exceptionState());
608 EXPECT_EQ(expectedUrls.size(), responses.size()); 608 EXPECT_EQ(expectedUrls.size(), responses.size());
609 for (int i = 0, minsize = std::min(expectedUrls.size(), responses.size()); i < minsize; ++i) { 609 for (int i = 0, minsize = std::min(expectedUrls.size(), responses.size()); i < minsize; ++i) {
610 Response* response = V8Response::toImplWithTypeCheck(isolate(), response s[i]); 610 Response* response = V8Response::toImplWithTypeCheck(isolate(), response s[i]);
611 EXPECT_TRUE(response); 611 EXPECT_TRUE(response);
612 if (response) 612 if (response)
613 EXPECT_EQ(expectedUrls[i], response->url()); 613 EXPECT_EQ(expectedUrls[i], response->url());
614 } 614 }
615 615
616 result = cache->deleteFunction(scriptState(), stringToRequestInfo("http://so me.url/"), options, exceptionState()); 616 result = cache->deleteFunction(scriptState(), stringToRequestInfo("http://so me.url/"), options, exceptionState());
617 scriptValue = getResolveValue(result); 617 scriptValue = getResolveValue(result);
(...skipping 29 matching lines...) Expand all
647 647
648 ScriptPromise addResult = cache->add(scriptState(), requestToRequestInfo(req uest), exceptionState()); 648 ScriptPromise addResult = cache->add(scriptState(), requestToRequestInfo(req uest), exceptionState());
649 649
650 EXPECT_EQ(kNotImplementedString, getRejectString(addResult)); 650 EXPECT_EQ(kNotImplementedString, getRejectString(addResult));
651 EXPECT_EQ(1, fetcher()->fetchCount()); 651 EXPECT_EQ(1, fetcher()->fetchCount());
652 EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCall ed()); 652 EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCall ed());
653 } 653 }
654 654
655 } // namespace 655 } // namespace
656 } // namespace blink 656 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/tests/results/core/V8TestTypedefs.cpp ('k') | Source/modules/webdatabase/SQLTransaction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698