| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <meta charset=utf-8> | 2 <meta charset=utf-8> |
| 3 <title>Transactions have a request queue</title> | 3 <title>Transactions have a request queue</title> |
| 4 <link rel="author" href="mailto:odinho@opera.com" title="Odin Hørthe Omdal"> | 4 <link rel="author" href="mailto:odinho@opera.com" title="Odin Hørthe Omdal"> |
| 5 <script src=../../../resources/testharness.js></script> | 5 <script src=../../../resources/testharness.js></script> |
| 6 <script src=../../../resources/testharnessreport.js></script> | 6 <script src=../../../resources/testharnessreport.js></script> |
| 7 <script src=support.js></script> | 7 <script src=support.js></script> |
| 8 | 8 |
| 9 <script> | 9 <script> |
| 10 | 10 |
| 11 var db, t = async_test(document.title, {timeout: 10000}), | 11 var db, t = async_test(document.title, {timeout: 10000}), |
| 12 keys = { txn: [], txn2: [] }, | 12 keys = { txn: [], txn2: [] }, |
| 13 open_rq = createdb(t) | 13 open_rq = createdb(t) |
| 14 | 14 |
| 15 open_rq.onupgradeneeded = function(e) { | 15 open_rq.onupgradeneeded = function(e) { |
| 16 var i, os; | 16 var i, os; |
| 17 db = e.target.result; | 17 db = e.target.result; |
| 18 | 18 |
| 19 for (i = 1; i < 6; i++) | 19 for (i = 1; i < 6; i++) |
| 20 { | 20 { |
| 21 os = db.createObjectStore("os" + i, { autoIncrement: true, keyPath: "k"
}); | 21 os = db.createObjectStore("os" + i, { autoIncrement: true, keyPath: "k"
}); |
| 22 os.add({ os: "os" + i }); | 22 os.add({ os: "os" + i }); |
| 23 os.put({ os: "os" + i, k: i}); | 23 os.put({ os: "os" + i, k: i}); |
| 24 os.add({ os: "os" + i }); | 24 os.add({ os: "os" + i }); |
| 25 } | 25 } |
| 26 | |
| 27 // assert_object_equals(db.objectStoreNames, ["os1", "os2", "os3", "os4", "os
5" ], "objectStores"); | |
| 28 } | 26 } |
| 29 | 27 |
| 30 open_rq.onsuccess = function(e) { | 28 open_rq.onsuccess = function(e) { |
| 31 var txn = db.transaction(["os2", "os1", "os3", "os5"]) | 29 var txn = db.transaction(["os2", "os1", "os3", "os5"]) |
| 32 txn.objectStore("os1").openCursor().onsuccess = reg("txn") | 30 txn.objectStore("os1").openCursor().onsuccess = reg("txn") |
| 33 txn.objectStore("os3").openCursor().onsuccess = reg("txn") | 31 txn.objectStore("os3").openCursor().onsuccess = reg("txn") |
| 34 txn.objectStore("os1").get(2).onsuccess = reg("txn") | 32 txn.objectStore("os1").get(2).onsuccess = reg("txn") |
| 35 txn.objectStore("os2").get(3).onsuccess = reg("txn") | 33 txn.objectStore("os2").get(3).onsuccess = reg("txn") |
| 36 | 34 |
| 37 var txn2 = db.transaction(["os4", "os3", "os1", "os5"]) | 35 var txn2 = db.transaction(["os4", "os3", "os1", "os5"]) |
| (...skipping 22 matching lines...) Expand all Loading... |
| 60 if (v.value) v = v.value; | 58 if (v.value) v = v.value; |
| 61 keys[n].push(v.os + ": " + v.k); | 59 keys[n].push(v.os + ": " + v.k); |
| 62 }); | 60 }); |
| 63 } | 61 } |
| 64 | 62 |
| 65 var finish_to_go = 2; | 63 var finish_to_go = 2; |
| 66 function finish() { | 64 function finish() { |
| 67 if (--finish_to_go) | 65 if (--finish_to_go) |
| 68 return; | 66 return; |
| 69 | 67 |
| 70 assert_object_equals(keys['txn'], [ | 68 assert_array_equals(keys['txn'], [ |
| 71 "os1: 1", | 69 "os1: 1", |
| 72 "os3: 1", | 70 "os3: 1", |
| 73 "os1: 2", | 71 "os1: 2", |
| 74 "os2: 3", | 72 "os2: 3", |
| 75 "os2: 1", "os2: 1", "os2: 1", | 73 "os2: 1", "os2: 1", "os2: 1", |
| 76 "os1: 2", | 74 "os1: 2", |
| 77 ], 'transaction keys'); | 75 ], 'transaction keys'); |
| 78 | 76 |
| 79 assert_object_equals(keys['txn2'], [ | 77 assert_array_equals(keys['txn2'], [ |
| 80 "os4: 1", "os4: 5", "os4: 4", "os3: 1", | 78 "os4: 1", "os4: 5", "os4: 4", "os3: 1", |
| 81 "os4: 1", "os4: 5", "os4: 4", "os3: 1", | 79 "os4: 1", "os4: 5", "os4: 4", "os3: 1", |
| 82 "os4: 1", "os4: 5", "os4: 4", "os3: 1", | 80 "os4: 1", "os4: 5", "os4: 4", "os3: 1", |
| 83 "os1: 2", | 81 "os1: 2", |
| 84 "os4: 5", | 82 "os4: 5", |
| 85 ], 'transaction 2 keys'); | 83 ], 'transaction 2 keys'); |
| 86 | 84 |
| 87 t.done(); | 85 t.done(); |
| 88 } | 86 } |
| 89 </script> | 87 </script> |
| 90 | 88 |
| 91 <div id="log"></div> | 89 <div id="log"></div> |
| OLD | NEW |