diff --git a/testing/web-platform/tests/storage/estimate-indexeddb.https.any.js b/testing/web-platform/tests/storage/estimate-indexeddb.https.any.js index dc37f6a08c0eb..f46dffb969407 100644 --- a/testing/web-platform/tests/storage/estimate-indexeddb.https.any.js +++ b/testing/web-platform/tests/storage/estimate-indexeddb.https.any.js @@ -1,20 +1,7 @@ -test(t => { - assert_true('estimate' in navigator.storage); - assert_equals(typeof navigator.storage.estimate, 'function'); - assert_true(navigator.storage.estimate() instanceof Promise); -}, 'estimate() method exists and returns a Promise'); -promise_test(async t => { - const estimate = await navigator.storage.estimate(); - assert_equals(typeof estimate, 'object'); - assert_true('usage' in estimate); - assert_equals(typeof estimate.usage, 'number'); - assert_true('quota' in estimate); - assert_equals(typeof estimate.quota, 'number'); -}, 'estimate() resolves to dictionary with members'); promise_test(async t => { const arraySize = 1e6; diff --git a/testing/web-platform/tests/storage/storagemanager-estimate.https.any.js b/testing/web-platform/tests/storage/storagemanager-estimate.https.any.js index f0fd595d5da09..f0cac421e4f3e 100644 --- a/testing/web-platform/tests/storage/storagemanager-estimate.https.any.js +++ b/testing/web-platform/tests/storage/storagemanager-estimate.https.any.js @@ -1,60 +1,16 @@ -test(function(t) { - assert_true(navigator.storage.estimate() instanceof Promise); -}, 'estimate() method returns a Promise'); +test(t => { + assert_true('estimate' in navigator.storage); + assert_equals(typeof navigator.storage.estimate, 'function'); + assert_true(navigator.storage.estimate() instanceof Promise); +}, 'estimate() method exists and returns a Promise'); -promise_test(function(t) { - return navigator.storage.estimate().then(function(result) { - assert_equals(typeof result, 'object'); - assert_true('usage' in result); - assert_equals(typeof result.usage, 'number'); - assert_true('quota' in result); - assert_equals(typeof result.quota, 'number'); - }); +promise_test(async t => { + const result = await navigator.storage.estimate(); + assert_equals(typeof result, 'object'); + assert_true('usage' in result); + assert_equals(typeof result.usage, 'number'); + assert_true('quota' in result); + assert_equals(typeof result.quota, 'number'); }, 'estimate() resolves to dictionary with members'); - -promise_test(function(t) { - const large_value = new Uint8Array(1e6); - const dbname = `db-${location}-${t.name}`; - let db, before, after; - - indexedDB.deleteDatabase(dbname); - return new Promise((resolve, reject) => { - const open = indexedDB.open(dbname); - open.onerror = () => { reject(open.error); }; - open.onupgradeneeded = () => { - const connection = open.result; - connection.createObjectStore('store'); - }; - open.onsuccess = () => { - const connection = open.result; - t.add_cleanup(() => { - connection.close(); - indexedDB.deleteDatabase(dbname); - }); - resolve(connection); - }; - }) - .then(connection => { - db = connection; - return navigator.storage.estimate(); - }) - .then(estimate => { - before = estimate.usage; - return new Promise((resolve, reject) => { - const tx = db.transaction('store', 'readwrite'); - tx.objectStore('store').put(large_value, 'key'); - tx.onabort = () => { reject(tx.error); }; - tx.oncomplete = () => { resolve(); }; - }); - }) - .then(() => { - return navigator.storage.estimate(); - }) - .then(estimate => { - after = estimate.usage; - assert_greater_than(after, before, - 'estimated usage should increase'); - }); -}, 'estimate() shows usage increase after 1MB IndexedDB record is stored');