Switch Budget API LayoutTests to the new Mojo JS bindings

This change rewrites the Budget API layout tests to use the new Mojo
JS bindings.

Bug: 699569
Change-Id: I4af6e3a78c16cf4ecc6aeedc5317eaf1021ca9eb
Reviewed-on: https://chromium-review.googlesource.com/595234
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Yuzhu Shen <yzshen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491073}

third_party/WebKit/LayoutTests/http/tests/budget/budget-service-mock.js

@@ -8,89 +8,78 @@ const TEST_BUDGET_COST = 1.2;
 const TEST_BUDGET_AT = 2;
 const TEST_BUDGET_TIME = new Date().getTime();
 
-let budgetServiceMock = loadMojoModules(
-    'budgetServiceMock',
-    ['third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom',
-     'mojo/public/js/bindings'
-    ]).then(mojo => {
-  const [budgetService, bindings] = mojo.modules;
+class BudgetServiceMock {
+  constructor() {
+    // Values to return for the next getBudget and getCost calls.
+    this.cost_ = {};
+    this.budget_ = [];
+    this.error_ = blink.mojom.BudgetServiceErrorType.NONE;
+    this.bindingSet_ = new mojo.BindingSet(blink.mojom.BudgetService);
 
-  class BudgetServiceMock {
-    constructor() {
-      // Register process-wide (worker) interface override.
-      mojo.interfaces.addInterfaceOverrideForTesting(
-          budgetService.BudgetService.name,
-          handle => this.bindingSet_.addBinding(this, handle));
-
-      // Register frame interface override.
-      mojo.frameInterfaces.addInterfaceOverrideForTesting(
-          budgetService.BudgetService.name,
-          handle => this.bindingSet_.addBinding(this, handle));
-
-      // Values to return for the next getBudget and getCost calls.
-      this.cost_ = {};
-      this.budget_ = [];
-      this.error_ = budgetService.BudgetServiceErrorType.NONE;
-      this.bindingSet_ = new bindings.BindingSet(budgetService.BudgetService);
-    }
+    this.interceptor_ = new MojoInterfaceInterceptor(
+        blink.mojom.BudgetService.name);
+    this.interceptor_.oninterfacerequest =
+        e => this.bindingSet_.addBinding(this, e.handle);
+    this.interceptor_.start();
+  }
 
-    // This is called directly from test JavaScript to set up the return value
-    // for the getCost Mojo call. The operationType mapping is needed to mirror
-    // the mapping that happens in the Mojo layer.
-    setCost(operationType, cost) {
-      let mojoOperationType = budgetService.BudgetOperationType.INVALID_OPERATION;
-      if (operationType == "silent-push")
-        mojoOperationType = budgetService.BudgetOperationType.SILENT_PUSH;
+  // This is called directly from test JavaScript to set up the return value
+  // for the getCost Mojo call. The operationType mapping is needed to mirror
+  // the mapping that happens in the Mojo layer.
+  setCost(operationType, cost) {
+    let mojoOperationType = blink.mojom.BudgetOperationType.INVALID_OPERATION;
+    if (operationType == "silent-push")
+      mojoOperationType = blink.mojom.BudgetOperationType.SILENT_PUSH;
 
-      this.cost_[mojoOperationType] = cost;
-    }
+    this.cost_[mojoOperationType] = cost;
+  }
 
 
-    // This is called directly from test JavaScript to set up the budget that is
-    // returned from a later getBudget Mojo call. This adds an entry into the
-    // budget array.
-    addBudget(addTime, addBudget) {
-      this.budget_.push({ time: addTime, budget_at: addBudget });
-    }
+  // This is called directly from test JavaScript to set up the budget that is
+  // returned from a later getBudget Mojo call. This adds an entry into the
+  // budget array.
+  addBudget(addTime, addBudget) {
+    this.budget_.push({ time: addTime, budgetAt: addBudget });
+  }
 
-    // This is called from test JavaScript. It sets whether the next reserve
-    // call should return success or not.
-    setReserveSuccess(success) {
-      this.success_ = success;
-    }
+  // This is called from test JavaScript. It sets whether the next reserve
+  // call should return success or not.
+  setReserveSuccess(success) {
+    this.success_ = success;
+  }
 
-    // Called from test JavaScript, this sets the error to be returned by the
-    // Mojo service to the BudgetService in Blink. This error is never surfaced
-    // to the test JavaScript, but the test code may get an exception if one of
-    // these is set.
-    setError(errorName) {
-      switch (errorName) {
-        case "database-error":
-          this.error_ = budgetService.BudgetServiceErrorType.DATABASE_ERROR;
-          break;
-        case "not-supported":
-          this.error_ = budgetService.BudgetServiceErrorType.NOT_SUPPORTED;
-          break;
-        case "no-error":
-          this.error_ = budgetService.BudgetServiceErrorType.NONE;
-          break;
-      }
+  // Called from test JavaScript, this sets the error to be returned by the
+  // Mojo service to the BudgetService in Blink. This error is never surfaced
+  // to the test JavaScript, but the test code may get an exception if one of
+  // these is set.
+  setError(errorName) {
+    switch (errorName) {
+      case "database-error":
+        this.error_ = blink.mojom.BudgetServiceErrorType.DATABASE_ERROR;
+        break;
+      case "not-supported":
+        this.error_ = blink.mojom.BudgetServiceErrorType.NOT_SUPPORTED;
+        break;
+      case "no-error":
+        this.error_ = blink.mojom.BudgetServiceErrorType.NONE;
+        break;
     }
+  }
 
-    // This provides an implementation for the Mojo serivce getCost call.
-    getCost(operationType) {
-      return Promise.resolve({ cost: this.cost_[operationType] });
-    }
+  // This provides an implementation for the Mojo serivce getCost call.
+  async getCost(operationType) {
+    return { cost: this.cost_[operationType] };
+  }
 
-    // This provides an implementation for the Mojo serivce getBudget call.
-    getBudget() {
-      return Promise.resolve({ error_type: this.error_, budget: this.budget_ });
-    }
+  // This provides an implementation for the Mojo serivce getBudget call.
+  async getBudget() {
+    return { errorType: this.error_, budget: this.budget_ };
+  }
 
-    // This provides an implementation for the Mojo serivce reserve call.
-    reserve() {
-      return Promise.resolve({ error_type: this.error_, success: this.success_ });
-    }
+  // This provides an implementation for the Mojo serivce reserve call.
+  async reserve() {
+    return { errorType: this.error_, success: this.success_ };
   }
-  return new BudgetServiceMock();
-});
+}
+
+let budgetServiceMock = new BudgetServiceMock();

third_party/WebKit/LayoutTests/http/tests/budget/get-budget-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "BudgetService.GetBudget should return correct results."
-PASS BudgetService.GetBudget should return correct results. 
-PASS BudgetService.GetBudget should return correct results. 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/http/tests/budget/get-budget-in-service-worker.html

@@ -6,35 +6,34 @@
     <script src="../resources/testharnessreport.js"></script>
     <script src="../serviceworker/resources/test-helpers.js"></script>
     <script src="../notifications/resources/test-helpers.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
-    <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function(test) {
+      const TEST_BUDGET_AT = 2;
+      const TEST_BUDGET_TIME = new Date().getTime();
+
+      promise_test(async function(test) {
         const script = 'resources/instrumentation-service-worker.js';
         const scope = 'resources/scope/' + location.pathname;
-        let port;
-
-        return budgetServiceMock.then(mock => {
-          mock.addBudget(TEST_BUDGET_TIME, TEST_BUDGET_AT);
-          return getActiveServiceWorkerWithMessagePort(test, script, scope);
-        }).then(function(workerInfo) {
-          port = workerInfo.port;
 
-          port.addEventListener('message', function(event) {
-            if (typeof event.data != 'object' || !event.data.command)
-              assert_unreached('Invalid message from the service worker');
+        let workerInfo =
+            await getActiveServiceWorkerWithMessagePort(test, script, scope);
+        let port = workerInfo.port;
 
-            assert_equals(event.data.command, 'getBudget');
-            assert_true(event.data.success,
-                'getBudget should succeed. Error message: ' + event.data.errorMessage);
-            assert_equals(event.data.budgetAt, TEST_BUDGET_AT);
-            assert_equals(event.data.time, TEST_BUDGET_TIME);
-          });
+        let data = await sendCommand(port, {
+            command: 'mockAddBudget',
+            budgetAt: TEST_BUDGET_AT,
+            time: TEST_BUDGET_TIME
+        });
+        assert_equals(data.command, 'mockAddBudget');
+        assert_true(data.success);
 
-          return sendCommand(port, { command: 'getBudget' });
-      });
+        data = await sendCommand(port, { command: 'getBudget' });
+        assert_equals(data.command, 'getBudget');
+        assert_true(data.success,
+            'getBudget should succeed. Error message: ' + data.errorMessage);
+        assert_equals(data.budgetAt, TEST_BUDGET_AT);
+        assert_equals(data.time, TEST_BUDGET_TIME);
       }, 'getBudget should succeed from Service Worker');
     </script>
   </body>

third_party/WebKit/LayoutTests/http/tests/budget/get-budget.html

@@ -4,35 +4,34 @@
     <title>Budget API: Make basic getBudget call.</title>
     <script src="../resources/testharness.js"></script>
     <script src="../resources/testharnessreport.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
+    <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+    <script src="/gen/third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.js"></script>
     <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function() {
-        return budgetServiceMock.then(mock => {
-          assert_own_property(Navigator.prototype, 'budget');
-          mock.addBudget(TEST_BUDGET_TIME, TEST_BUDGET_AT);
-          return navigator.budget.getBudget();
-        }).then(budget => {
-          assert_equals(budget.length, 1);
-          assert_equals(budget[0].budgetAt, TEST_BUDGET_AT);
-          assert_equals(budget[0].time, TEST_BUDGET_TIME);
-        });
+      promise_test(async function() {
+        assert_own_property(Navigator.prototype, 'budget');
+        budgetServiceMock.addBudget(TEST_BUDGET_TIME, TEST_BUDGET_AT);
+
+        let budget = await navigator.budget.getBudget();
+        assert_equals(budget.length, 1);
+        assert_equals(budget[0].budgetAt, TEST_BUDGET_AT);
+        assert_equals(budget[0].time, TEST_BUDGET_TIME);
       }, 'BudgetService.GetBudget should return correct results.');
 
-      promise_test(function() {
-        return budgetServiceMock.then(mock => {
-          assert_own_property(Navigator.prototype, 'budget');
-          mock.setError("database-error");
-          return navigator.budget.getBudget();
-        }).then(budget => {
+      promise_test(async function() {
+        assert_own_property(Navigator.prototype, 'budget');
+        budgetServiceMock.setError("database-error");
+
+        try {
+          let budget = await navigator.budget.getBudget();
           assert_unreached('getBudget should have failed.');
-        }, function(error) {
+        } catch (error) {
           assert_equals(error.name, 'DataError');
           assert_equals(error.message, "Error reading the budget database.");
-        });
-      }, 'BudgetService.GetBudget should return correct results.');
+        };
+      }, 'BudgetService.GetBudget should return database error.');
     </script>
   </body>
 </html>

third_party/WebKit/LayoutTests/http/tests/budget/get-cost-fails-in-service-worker.html

@@ -6,33 +6,22 @@
     <script src="../resources/testharnessreport.js"></script>
     <script src="../serviceworker/resources/test-helpers.js"></script>
     <script src="../notifications/resources/test-helpers.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
-    <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function(test) {
+      promise_test(async function(test) {
         const script = 'resources/instrumentation-service-worker.js';
         const scope = 'resources/scope/' + location.pathname;
-        let port;
 
-        return budgetServiceMock.then(mock => {
-          return getActiveServiceWorkerWithMessagePort(test, script, scope);
-        }).then(function(workerInfo) {
-          port = workerInfo.port;
+        let workerInfo =
+            await getActiveServiceWorkerWithMessagePort(test, script, scope);
+        let port = workerInfo.port;
 
-          port.addEventListener('message', function(event) {
-            if (typeof event.data != 'object' || !event.data.command)
-              assert_unreached('Invalid message from the service worker');
-
-            assert_equals(event.data.command, 'getCostInvalidType');
-            assert_false(event.data.success,
-                'getCost should fail with invalid arguments.');
-            assert_equals(event.data.errorMessage, "Failed to execute 'getCost' on 'BudgetService': The provided value 'frobinator' is not a valid enum value of type OperationType.");
-          });
-
-          return sendCommand(port, { command: 'getCostInvalidType' });
-        });
+        let data = await sendCommand(port, { command: 'getCostInvalidType' });
+        assert_equals(event.data.command, 'getCostInvalidType');
+        assert_false(event.data.success,
+            'getCost should fail with invalid arguments.');
+        assert_equals(event.data.errorMessage, "Failed to execute 'getCost' on 'BudgetService': The provided value 'frobinator' is not a valid enum value of type OperationType.");
       }, 'getCost with invalid arugment should fail from Service Worker');
     </script>
   </body>

third_party/WebKit/LayoutTests/http/tests/budget/get-cost-in-service-worker.html

@@ -6,34 +6,32 @@
     <script src="../resources/testharnessreport.js"></script>
     <script src="../serviceworker/resources/test-helpers.js"></script>
     <script src="../notifications/resources/test-helpers.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
-    <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function(test) {
+      const TEST_BUDGET_COST = 1.2;
+
+      promise_test(async function(test) {
         const script = 'resources/instrumentation-service-worker.js';
         const scope = 'resources/scope/' + location.pathname;
-        let port;
-
-        return budgetServiceMock.then(mock => {
-          mock.setCost("silent-push", TEST_BUDGET_COST);
-          return getActiveServiceWorkerWithMessagePort(test, script, scope);
-        }).then(function(workerInfo) {
-          port = workerInfo.port;
 
-          port.addEventListener('message', function(event) {
-            if (typeof event.data != 'object' || !event.data.command)
-              assert_unreached('Invalid message from the service worker');
+        let workerInfo =
+            await getActiveServiceWorkerWithMessagePort(test, script, scope);
+        let port = workerInfo.port;
 
-            assert_equals(event.data.command, 'getCost');
-            assert_true(event.data.success,
-                'getCost should succeed. Error message: ' + event.data.errorMessage);
-            assert_equals(event.data.cost, TEST_BUDGET_COST);
-          });
-
-          return sendCommand(port, { command: 'getCost' });
+        let data = await sendCommand(port, {
+            command: 'mockSetCost',
+            operation: 'silent-push',
+            cost: TEST_BUDGET_COST
         });
+        assert_equals(data.command, 'mockSetCost');
+        assert_true(data.success);
+
+        data = await sendCommand(port, { command: 'getCost' });
+        assert_equals(data.command, 'getCost');
+        assert_true(data.success,
+            'getCost should succeed. Error message: ' + data.errorMessage);
+        assert_equals(data.cost, TEST_BUDGET_COST);
       }, 'getCost should succeed from Service Worker');
     </script>
   </body>

third_party/WebKit/LayoutTests/http/tests/budget/get-cost.html

@@ -4,31 +4,30 @@
     <title>Budget API: Make basic getCost calls.</title>
     <script src="../resources/testharness.js"></script>
     <script src="../resources/testharnessreport.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
+    <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+    <script src="/gen/third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.js"></script>
     <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function() {
-        return budgetServiceMock.then(mock => {
-          assert_own_property(Navigator.prototype, 'budget');
-          mock.setCost("silent-push", TEST_BUDGET_COST);
-          return navigator.budget.getCost("silent-push");
-        }).then(cost => {
-          assert_equals(cost, TEST_BUDGET_COST);
-        });
+      promise_test(async function() {
+        assert_own_property(Navigator.prototype, 'budget');
+        budgetServiceMock.setCost("silent-push", TEST_BUDGET_COST);
+
+        let cost = await navigator.budget.getCost("silent-push");
+        assert_equals(cost, TEST_BUDGET_COST);
       }, 'BudgetService.GetCost should return correct results.');
 
-      promise_test(function() {
-        return budgetServiceMock.then(mock => {
-          assert_own_property(Navigator.prototype, 'budget');
-          return navigator.budget.getCost("frobinator");
-        }).then(cost => {
+      promise_test(async function() {
+        assert_own_property(Navigator.prototype, 'budget');
+
+        try {
+          let cost = await navigator.budget.getCost("frobinator");
           assert_unreached('getCost should have failed with an invalid argument.');
-        }, function(error) {
+        } catch (error) {
           assert_equals(error.name, 'TypeError');
           assert_equals(error.message, "Failed to execute 'getCost' on 'BudgetService': The provided value 'frobinator' is not a valid enum value of type OperationType.");
-        });
+        }
       }, 'BudgetService.GetCost should return Type Error if an invalid argument is provided.');
     </script>
   </body>

third_party/WebKit/LayoutTests/http/tests/budget/reserve-in-service-worker.html

@@ -6,33 +6,28 @@
     <script src="../resources/testharnessreport.js"></script>
     <script src="../serviceworker/resources/test-helpers.js"></script>
     <script src="../notifications/resources/test-helpers.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
-    <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function(test) {
+      promise_test(async function(test) {
         const script = 'resources/instrumentation-service-worker.js';
         const scope = 'resources/scope/' + location.pathname;
-        let port;
 
-        return budgetServiceMock.then(mock => {
-          mock.setReserveSuccess(true);
-          return getActiveServiceWorkerWithMessagePort(test, script, scope);
-        }).then(function(workerInfo) {
-          port = workerInfo.port;
+        let workerInfo =
+            await getActiveServiceWorkerWithMessagePort(test, script, scope);
+        let port = workerInfo.port;
 
-          port.addEventListener('message', function(event) {
-            if (typeof event.data != 'object' || !event.data.command)
-              assert_unreached('Invalid message from the service worker');
-
-            assert_equals(event.data.command, 'reserve');
-            assert_true(event.data.success,
-                'reserve should succeed. Error message: ' + event.data.errorMessage);
-          });
-
-          return sendCommand(port, { command: 'reserve' });
+        let data = await sendCommand(port, {
+            command: 'mockSetReserveSuccess',
+            success: true
         });
+        assert_equals(data.command, 'mockSetReserveSuccess');
+        assert_true(data.success);
+
+        data = await sendCommand(port, { command: 'reserve' });
+        assert_equals(data.command, 'reserve');
+        assert_true(data.success,
+            'reserve should succeed. Error message: ' + data.errorMessage);
       }, 'reserve should succeed from Service Worker');
     </script>
   </body>

third_party/WebKit/LayoutTests/http/tests/budget/reserve.html

@@ -4,31 +4,30 @@
     <title>Budget API: Make basic reserve calls.</title>
     <script src="../resources/testharness.js"></script>
     <script src="../resources/testharnessreport.js"></script>
-    <script src="/js-test-resources/mojo-helpers.js"></script>
+    <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+    <script src="/gen/third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.js"></script>
     <script src="budget-service-mock.js"></script>
   </head>
   <body>
     <script>
-      promise_test(function() {
-        return budgetServiceMock.then(mock => {
-          assert_own_property(Navigator.prototype, 'budget');
-          mock.setReserveSuccess(true);
-          return navigator.budget.reserve("silent-push");
-        }).then(success => {
-          assert_equals(success, true);
-        });
+      promise_test(async function() {
+        assert_own_property(Navigator.prototype, 'budget');
+        budgetServiceMock.setReserveSuccess(true);
+
+        let success = await navigator.budget.reserve("silent-push");
+        assert_equals(success, true);
       }, 'BudgetService.Reserve should return correct results.');
 
-      promise_test(function() {
-        return budgetServiceMock.then(mock => {
-          assert_own_property(Navigator.prototype, 'budget');
-          return navigator.budget.reserve("frobinator");
-        }).then(success => {
+      promise_test(async function() {
+        assert_own_property(Navigator.prototype, 'budget');
+
+        try {
+          let success = await navigator.budget.reserve("frobinator");
           assert_unreached('reserve should have failed with an invalid argument.');
-        }, function(error) {
+        } catch (error) {
           assert_equals(error.name, 'TypeError');
           assert_equals(error.message, "Failed to execute 'reserve' on 'BudgetService': The provided value 'frobinator' is not a valid enum value of type OperationType.");
-        });
+        }
       }, 'BudgetService.Reserve should return Type Error if an invalid argument is provided.');
     </script>
   </body>

third_party/WebKit/LayoutTests/http/tests/budget/resources/instrumentation-service-worker.js

+importScripts('/gen/layout_test_data/mojo/public/js/mojo_bindings.js');
+importScripts('/gen/url/mojo/origin.mojom.js');
+importScripts('/gen/third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.js');
+importScripts('../budget-service-mock.js');
+
 // Allows a document to exercise the Budget API within a service worker by sending commands.
 
 self.addEventListener('message', function(workerEvent) {
@@ -10,6 +15,30 @@ self.addEventListener('message', function(workerEvent) {
     var options = event.data.options || {};
     switch (event.data.command) {
 
+      case 'mockAddBudget':
+        budgetServiceMock.addBudget(event.data.time, event.data.budgetAt);
+        port.postMessage({
+          command: event.data.command,
+          success: true
+        });
+        break;
+
+      case 'mockSetCost':
+        budgetServiceMock.setCost(event.data.operation, event.data.cost);
+        port.postMessage({
+          command: event.data.command,
+          success: true
+        });
+        break;
+
+      case 'mockSetReserveSuccess':
+        budgetServiceMock.setReserveSuccess(event.data.success);
+        port.postMessage({
+          command: event.data.command,
+          success: true
+        });
+        break;
+
       case 'getCost':
         navigator.budget.getCost('silent-push').then(function(cost) {
           port.postMessage({