WIP: fix several code signature problems, add test files

Author: jshcrowthe

src/database/api/Query.ts

@@ -217,8 +217,10 @@ export class Query {
    * @param context
    * @return {!firebase.Promise}
    */
-  once(eventType: string, userCallback?: (a: DataSnapshot, b?: string) => any,
-       cancelOrContext?, context?: Object) {
+  once(eventType: string, 
+       userCallback?: (a: DataSnapshot, b?: string) => any,
+       cancelOrContext?, 
+       context?: Object): Promise<DataSnapshot> {
     validateArgCount('Query.once', 1, 4, arguments.length);
     validateEventType('Query.once', 1, eventType, false);
     validateCallback('Query.once', 2, userCallback, true);

src/database/api/onDisconnect.ts

@@ -26,70 +26,70 @@ export class OnDisconnect {
   }
 
   /**
-   * @param {function(?Error)=} opt_onComplete
+   * @param {function(?Error)=} onComplete
    * @return {!firebase.Promise}
    */
-  cancel(opt_onComplete) {
+  cancel(onComplete?) {
     validateArgCount('OnDisconnect.cancel', 0, 1, arguments.length);
-    validateCallback('OnDisconnect.cancel', 1, opt_onComplete, true);
+    validateCallback('OnDisconnect.cancel', 1, onComplete, true);
     const deferred = new Deferred();
-    this.repo_.onDisconnectCancel(this.path_, deferred.wrapCallback(opt_onComplete));
+    this.repo_.onDisconnectCancel(this.path_, deferred.wrapCallback(onComplete));
     return deferred.promise;
   }
 
   /**
-   * @param {function(?Error)=} opt_onComplete
+   * @param {function(?Error)=} onComplete
    * @return {!firebase.Promise}
    */
-  remove(opt_onComplete) {
+  remove(onComplete?) {
     validateArgCount('OnDisconnect.remove', 0, 1, arguments.length);
     validateWritablePath('OnDisconnect.remove', this.path_);
-    validateCallback('OnDisconnect.remove', 1, opt_onComplete, true);
+    validateCallback('OnDisconnect.remove', 1, onComplete, true);
     const deferred = new Deferred();
-    this.repo_.onDisconnectSet(this.path_, null, deferred.wrapCallback(opt_onComplete));
+    this.repo_.onDisconnectSet(this.path_, null, deferred.wrapCallback(onComplete));
     return deferred.promise;
   }
 
   /**
    * @param {*} value
-   * @param {function(?Error)=} opt_onComplete
+   * @param {function(?Error)=} onComplete
    * @return {!firebase.Promise}
    */
-  set(value, opt_onComplete) {
+  set(value, onComplete?) {
     validateArgCount('OnDisconnect.set', 1, 2, arguments.length);
     validateWritablePath('OnDisconnect.set', this.path_);
     validateFirebaseDataArg('OnDisconnect.set', 1, value, this.path_, false);
-    validateCallback('OnDisconnect.set', 2, opt_onComplete, true);
+    validateCallback('OnDisconnect.set', 2, onComplete, true);
     const deferred = new Deferred();
-    this.repo_.onDisconnectSet(this.path_, value, deferred.wrapCallback(opt_onComplete));
+    this.repo_.onDisconnectSet(this.path_, value, deferred.wrapCallback(onComplete));
     return deferred.promise;
   }
 
   /**
    * @param {*} value
    * @param {number|string|null} priority
-   * @param {function(?Error)=} opt_onComplete
+   * @param {function(?Error)=} onComplete
    * @return {!firebase.Promise}
    */
-  setWithPriority(value, priority, opt_onComplete) {
+  setWithPriority(value, priority, onComplete?) {
     validateArgCount('OnDisconnect.setWithPriority', 2, 3, arguments.length);
     validateWritablePath('OnDisconnect.setWithPriority', this.path_);
     validateFirebaseDataArg('OnDisconnect.setWithPriority',
       1, value, this.path_, false);
     validatePriority('OnDisconnect.setWithPriority', 2, priority, false);
-    validateCallback('OnDisconnect.setWithPriority', 3, opt_onComplete, true);
+    validateCallback('OnDisconnect.setWithPriority', 3, onComplete, true);
 
     const deferred = new Deferred();
-    this.repo_.onDisconnectSetWithPriority(this.path_, value, priority, deferred.wrapCallback(opt_onComplete));
+    this.repo_.onDisconnectSetWithPriority(this.path_, value, priority, deferred.wrapCallback(onComplete));
     return deferred.promise;
   }
 
   /**
    * @param {!Object} objectToMerge
-   * @param {function(?Error)=} opt_onComplete
+   * @param {function(?Error)=} onComplete
    * @return {!firebase.Promise}
    */
-  update(objectToMerge, opt_onComplete) {
+  update(objectToMerge, onComplete?) {
     validateArgCount('OnDisconnect.update', 1, 2, arguments.length);
     validateWritablePath('OnDisconnect.update', this.path_);
     if (Array.isArray(objectToMerge)) {
@@ -105,9 +105,9 @@ export class OnDisconnect {
     }
     validateFirebaseMergeDataArg('OnDisconnect.update', 1, objectToMerge,
       this.path_, false);
-    validateCallback('OnDisconnect.update', 2, opt_onComplete, true);
+    validateCallback('OnDisconnect.update', 2, onComplete, true);
     const deferred = new Deferred();
-    this.repo_.onDisconnectUpdate(this.path_, objectToMerge, deferred.wrapCallback(opt_onComplete));
+    this.repo_.onDisconnectUpdate(this.path_, objectToMerge, deferred.wrapCallback(onComplete));
     return deferred.promise;
   }
 }

tests/database/connection.test.ts

@@ -1,16 +1,8 @@
 import { expect } from "chai";
-import { ConnectionTarget } from "../../src/database/api/test_access";
-import { TEST_PROJECT } from "./helpers/util";
+import { TEST_PROJECT, testRepoInfo } from "./helpers/util";
 import { Connection } from "../../src/database/realtime/Connection";
 
 describe('Connection', () => {
-  function testRepoInfo(url) {
-    const regex = /https:\/\/(.*).firebaseio.com/;
-    const match = url.match(regex);
-    if (!match) throw new Error('Couldnt get Namespace from passed URL');
-    const [,ns] = match;
-    return new ConnectionTarget(`${ns}.firebaseio.com`, false, ns, false);
-  }
   it('return the session id', function(done) {
     new Connection('1',
         testRepoInfo(TEST_PROJECT.databaseURL),

tests/database/helpers/events.ts

@@ -31,7 +31,7 @@ function rawPath(firebaseRef) {
  * @param {string=} opt_helperName
  * @return {{waiter: waiter, watchesInitializedWaiter: watchesInitializedWaiter, unregister: unregister, addExpectedEvents: addExpectedEvents}}
  */
-export function eventTestHelper(pathAndEvents, helperName?, eventAccumulator?: EventAccumulator | EventAccumulator[]) {
+export function eventTestHelper(pathAndEvents, helperName?) {
   var expectedPathAndEvents = [];
   var actualPathAndEvents = [];
   var pathEventListeners = {};
@@ -46,16 +46,6 @@ export function eventTestHelper(pathAndEvents, helperName?, eventAccumulator?: E
       // Get the ref of where the snapshot came from.
       var ref = type === 'value' ? snap.ref : snap.ref.parent;
 
-      if (eventAccumulator) {
-        if (Array.isArray(eventAccumulator)) {
-          eventAccumulator.forEach(ea => {
-            ea.addEvent();
-          })
-        } else {
-          eventAccumulator.addEvent();
-        }
-      }
-
       actualPathAndEvents.push([rawPath(ref), [type, snap.key]]);
 
       if (!pathEventListeners[ref].initialized) {

tests/database/helpers/util.ts

@@ -4,6 +4,8 @@ import '../../../src/database';
 import { Reference } from "../../../src/database/api/Reference";
 import { Query } from "../../../src/database/api/Query";
 import { expect } from "chai";
+import { ConnectionTarget } from "../../../src/database/api/test_access";
+
 
 export const TEST_PROJECT = require('../../config/project.json');
 
@@ -211,3 +213,11 @@ export function buildObjFromKey(key) {
   }
   return obj;
 };
+
+export function testRepoInfo(url) {
+  const regex = /https:\/\/(.*).firebaseio.com/;
+  const match = url.match(regex);
+  if (!match) throw new Error('Couldnt get Namespace from passed URL');
+  const [,ns] = match;
+  return new ConnectionTarget(`${ns}.firebaseio.com`, false, ns, false);
+}