OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "core/dom/DOMException.h" | 31 #include "core/dom/DOMException.h" |
32 #include "core/dom/ExceptionCode.h" | 32 #include "core/dom/ExceptionCode.h" |
33 #include "core/dom/ExecutionContext.h" | 33 #include "core/dom/ExecutionContext.h" |
34 #include "core/testing/NullExecutionContext.h" | 34 #include "core/testing/NullExecutionContext.h" |
35 #include "modules/indexeddb/IDBDatabaseCallbacks.h" | 35 #include "modules/indexeddb/IDBDatabaseCallbacks.h" |
36 #include "modules/indexeddb/IDBKey.h" | 36 #include "modules/indexeddb/IDBKey.h" |
37 #include "modules/indexeddb/IDBOpenDBRequest.h" | 37 #include "modules/indexeddb/IDBOpenDBRequest.h" |
38 #include "modules/indexeddb/IDBValue.h" | 38 #include "modules/indexeddb/IDBValue.h" |
39 #include "modules/indexeddb/MockWebIDBDatabase.h" | 39 #include "modules/indexeddb/MockWebIDBDatabase.h" |
40 #include "platform/SharedBuffer.h" | 40 #include "platform/SharedBuffer.h" |
| 41 #include "public/platform/modules/indexeddb/WebIDBCallbacks.h" |
41 #include "testing/gtest/include/gtest/gtest.h" | 42 #include "testing/gtest/include/gtest/gtest.h" |
42 #include "wtf/PassRefPtr.h" | 43 #include "wtf/PassRefPtr.h" |
43 #include "wtf/Vector.h" | 44 #include "wtf/Vector.h" |
44 #include "wtf/dtoa/utils.h" | 45 #include "wtf/dtoa/utils.h" |
45 #include <memory> | 46 #include <memory> |
46 #include <v8.h> | 47 #include <v8.h> |
47 | 48 |
48 namespace blink { | 49 namespace blink { |
49 namespace { | 50 namespace { |
50 | 51 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 // Stop the request lest it be GCed and its destructor | 87 // Stop the request lest it be GCed and its destructor |
87 // finds the object in a pending state (and asserts.) | 88 // finds the object in a pending state (and asserts.) |
88 scope.getExecutionContext()->stopActiveDOMObjects(); | 89 scope.getExecutionContext()->stopActiveDOMObjects(); |
89 } | 90 } |
90 | 91 |
91 TEST(IDBRequestTest, ConnectionsAfterStopping) { | 92 TEST(IDBRequestTest, ConnectionsAfterStopping) { |
92 V8TestingScope scope; | 93 V8TestingScope scope; |
93 const int64_t transactionId = 1234; | 94 const int64_t transactionId = 1234; |
94 const int64_t version = 1; | 95 const int64_t version = 1; |
95 const int64_t oldVersion = 0; | 96 const int64_t oldVersion = 0; |
96 const IDBDatabaseMetadata metadata; | 97 const WebIDBMetadata metadata; |
97 Persistent<IDBDatabaseCallbacks> callbacks = IDBDatabaseCallbacks::create(); | 98 Persistent<IDBDatabaseCallbacks> callbacks = IDBDatabaseCallbacks::create(); |
98 | 99 |
99 { | 100 { |
100 std::unique_ptr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create(); | 101 std::unique_ptr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create(); |
101 EXPECT_CALL(*backend, abort(transactionId)).Times(1); | |
102 EXPECT_CALL(*backend, close()).Times(1); | 102 EXPECT_CALL(*backend, close()).Times(1); |
103 IDBOpenDBRequest* request = IDBOpenDBRequest::create( | 103 IDBOpenDBRequest* request = IDBOpenDBRequest::create( |
104 scope.getScriptState(), callbacks, transactionId, version); | 104 scope.getScriptState(), callbacks, transactionId, version); |
105 EXPECT_EQ(request->readyState(), "pending"); | 105 EXPECT_EQ(request->readyState(), "pending"); |
| 106 std::unique_ptr<WebIDBCallbacks> callbacks = request->createWebCallbacks(); |
106 | 107 |
107 scope.getExecutionContext()->stopActiveDOMObjects(); | 108 scope.getExecutionContext()->stopActiveDOMObjects(); |
108 request->onUpgradeNeeded(oldVersion, std::move(backend), metadata, | 109 callbacks->onUpgradeNeeded(oldVersion, backend.release(), metadata, |
109 WebIDBDataLossNone, String()); | 110 WebIDBDataLossNone, String()); |
110 } | 111 } |
111 | 112 |
112 { | 113 { |
113 std::unique_ptr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create(); | 114 std::unique_ptr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create(); |
114 EXPECT_CALL(*backend, close()).Times(1); | 115 EXPECT_CALL(*backend, close()).Times(1); |
115 IDBOpenDBRequest* request = IDBOpenDBRequest::create( | 116 IDBOpenDBRequest* request = IDBOpenDBRequest::create( |
116 scope.getScriptState(), callbacks, transactionId, version); | 117 scope.getScriptState(), callbacks, transactionId, version); |
117 EXPECT_EQ(request->readyState(), "pending"); | 118 EXPECT_EQ(request->readyState(), "pending"); |
| 119 std::unique_ptr<WebIDBCallbacks> callbacks = request->createWebCallbacks(); |
118 | 120 |
119 scope.getExecutionContext()->stopActiveDOMObjects(); | 121 scope.getExecutionContext()->stopActiveDOMObjects(); |
120 request->onSuccess(std::move(backend), metadata); | 122 callbacks->onSuccess(backend.release(), metadata); |
121 } | 123 } |
122 } | 124 } |
123 | 125 |
124 } // namespace | 126 } // namespace |
125 } // namespace blink | 127 } // namespace blink |
OLD | NEW |