[IndexedDB] Adding transaction and value support to observers

third_party/WebKit/LayoutTests/storage/indexeddb/resources/observer-tests.js

 if (this.importScripts) {
   importScripts('../../../resources/testharness.js');
   importScripts('generic-idb-operations.js');
   importScripts('observer-helpers.js');
   importScripts('testharness-helpers.js');
 }
 
 setup({timeout: 20000});
 
 var openDB = function(t, dbName, openFunc) {
@@ skipping 72 matching lines @@
     obs.observe(db, txn, {operationTypes: ['add']});
     txn.oncomplete = observers_added_callback;
     txn.onerror = t.unreached_func('transaction should not fail')
   }));
 }, 'IDB Observers: Operation filtering');
 
 indexeddb_observers_test(function(t, db1_name, db2_name, observers_added_callback) {
   var expectedChanges = {
     dbName: db1_name,
     records: {
+      'store2': [{type: 'add', key: 'z', value: 'z'}]
+    }
+  };
+
+  var connection = null;
+  var observeFunction = function(changes) {
+    compareChanges(changes, expectedChanges);
+    assert_true(connection != null);

[pwnall, 2017/01/10 01:41:11]

Can you add a description for the meaning of this failure? Based on what I'm
reading below, it seems like you're testing that the observer callback is only
called after the open call succeeded?

[dmurph, 2017/01/10 20:40:06]

Done.

+    obs.unobserve(connection);
+    t.done();
+  };
+
+  var obs = new IDBObserver(t.step_func(observeFunction));
+
+  openDB(t, db1_name, t.step_func(function(db) {
+    connection = db;
+    var txn = db.transaction(['store2'], 'readonly');
+    obs.observe(db, txn, {operationTypes: ['add'], values: true});
+    txn.oncomplete = observers_added_callback;
+    txn.onerror = t.unreached_func('transaction should not fail')
+  }));
+}, 'IDB Observers: Values');
+
+
+indexeddb_observers_test(function(t, db1_name, db2_name, observers_added_callback) {
+  var expectedChanges = {
+    dbName: db1_name,
+    records: {
       'store2': [{type: 'add', key: 'z'}]

[pwnall, 2017/01/10 01:41:11]

comma at the end of the line, to minimize future churn

[dmurph, 2017/01/10 20:40:06]

Done.

     }
   };
+
+  var connection = null;
+  var observeFunction = function(changes) {
+    compareChanges(changes, expectedChanges);
+    assert_true(connection != null);
+    obs.unobserve(connection);
+    assert_true(changes.transaction != null);
+    var store2 = changes.transaction.objectStore('store2');
+    var request = store2.get('z');
+    request.onsuccess = t.step_func(function() {
+      assert_equals(request.result, 'z');
+      t.done();
+    });
+  };
+
+  var obs = new IDBObserver(t.step_func(observeFunction));
+
+  openDB(t, db1_name, t.step_func(function(db) {
+    connection = db;
+    var txn = db.transaction(['store2'], 'readonly');
+    obs.observe(db, txn, {operationTypes: ['add'], transaction: true});
+    txn.oncomplete = observers_added_callback;
+    txn.onerror = t.unreached_func('transaction should not fail')
+  }));
+}, 'IDB Observers: Transaction');
+
+indexeddb_observers_test(function(t, db1_name, db2_name, observers_added_callback) {
+  var expectedChanges = {
+    dbName: db1_name,
+    records: {
+      'store2': [{type: 'add', key: 'z'}]
+    }
+  };
 
   var connection = null;
   var observeFunction = function(changes) {
     compareChanges(changes, expectedChanges);
     assert_true(connection != null);
     obs.unobserve(connection);
     t.done();
   };
 
   var obs = new IDBObserver(t.step_func(observeFunction));
@@ skipping 114 matching lines @@
   var expectedChanges2 = {
     dbName: db1_name,
     records: {
       'store2': [{type: 'add', key: 'z'}]
     }
   };
 
   var connection = null;
   var changeNumber = 0;
   var observeFunction = function(changes) {
-    assert_true(connection != null);
-    if (changeNumber === 0) {
+    assert_true(connection != null, "connection is null");

[pwnall, 2017/01/10 01:41:11]

The comment appears to be redundant with the condition.

[dmurph, 2017/01/10 20:40:06]

Done.

+    if (changes.records.has('store1')) {
       compareChanges(changes, expectedChanges1);
-    } else if(changeNumber === 1) {
+    } else if(changes.records.has('store2')) {
       compareChanges(changes, expectedChanges2);
+    }
+    ++changeNumber;
+    assert_less_than_equal(changeNumber, 2, "incorrect pendingObserves");
+    if (changeNumber == 2) {
       obs.unobserve(connection);
       t.done();
     }
-    ++changeNumber;
-    assert_less_than_equal(changeNumber, 1, "incorrect pendingObserves");
   };
 
   var obs = new IDBObserver(t.step_func(observeFunction));
 
   openDB(t, db1_name, t.step_func(function(db) {
     connection = db;
     var txn = db.transaction(['store1', 'store2'], 'readonly');
     obs.observe(db, txn, {operationTypes: ['put']});
     obs.observe(db, txn, {operationTypes: ['add']});
     txn.oncomplete = observers_added_callback;
@@ skipping 295 matching lines @@
   openDB(t, db2_name, t.step_func(function(db) {
     connection2 = db;
     var txn = db.transaction(['store3'], 'readonly');
     obs.observe(db, txn, {operationTypes: ['clear', 'put', 'add', 'delete']});
     txn.oncomplete = cb3;
     txn.onerror = t.unreached_func('transaction should not fail');
   }));
 }, 'IDB Observers: Close connection removes observers');
 
 done();