Attempt Manager Refactor and Opt-In Pipeline Refactor

chrome/browser/resources/google_now/utility_unittest.gtestjs

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Test fixture for utility.js.
  * @constructor
  * @extends {testing.Test}
  */
 function GoogleNowUtilityUnitTest () {
@@ skipping 774 matching lines @@
   var storageObject = {};
   storageObject[testAttemptStorageKey] = delaySeconds;
   return storageObject;
 }
 
 function setupAttemptManagerTest(fixture) {
   Math.random = function() { return testRandomValue; }
 
   fixture.makeMockLocalFunctions([
     'attempt',
-    'planForNextCallback',
     'isRunningCallback'
   ]);
   fixture.makeAndRegisterMockApis([
     'chrome.alarms.clear',
     'chrome.alarms.create',
     'chrome.storage.local.remove',
     'chrome.storage.local.set',
     'fillFromChromeLocalStorage',
     'instrumented.alarms.get'
   ]);
@@ skipping 95 matching lines @@
 
 TEST_F('GoogleNowUtilityUnitTest', 'AttemptManagerExponGrowth', function() {
   // Tests that retry time grows exponentially. We don't need to check the case
   // of growing more than once, since the object doesn't have state, and the
   // test checks all its inputs and outputs of the tested code.
 
   // Setup.
   var test = setupAttemptManagerTest(this);
   var testStoredRetryDelay = 433;
 
-  // Call planForNext, which prepares next attempt. Current retry time
-  // is less than 1/2 of the maximum delay.
+  // Call scheduleRetry, which schedules a retry.
+  // Current retry time is less than 1/2 of the maximum delay.
   // Expectations.
   var expectedRetryDelaySeconds =
       testStoredRetryDelay * 2 * (1 + testRandomValue * 0.2);
   expectChromeLocalStorageGet(
       this,
       createTestAttemptStorageEntryRequest(),
       createTestAttemptStorageEntry(testStoredRetryDelay),
       true);
   this.mockApis.expects(once()).chrome_alarms_create(
       testAttemptAlarmName,
       eqJSON({
         delayInMinutes: expectedRetryDelaySeconds / 60,
         periodInMinutes: testMaximumDelaySeconds / 60}));
   this.mockApis.expects(once()).chrome_storage_local_set(
       eqJSON(createTestAttemptStorageEntry(expectedRetryDelaySeconds)));
-  this.mockLocalFunctions.expects(once()).planForNextCallback();
   // Invocation.
-  test.attempts.planForNext(
-      this.mockLocalFunctions.functions().planForNextCallback);
+  var thenCalled = false;
+  var catchCalled = false;
+  test.attempts.scheduleRetry().then(function(request) {
+    thenCalled = true;
+  }).catch(function(request) {
+    catchCalled = true;
+  });
+  assertTrue(thenCalled);
+  assertFalse(catchCalled);
 });
 
 TEST_F('GoogleNowUtilityUnitTest', 'AttemptManagerGrowthLimit', function() {
   // Tests that retry time stops growing at the maximum value.
 
   // Setup.
   var test = setupAttemptManagerTest(this);
   var testStoredRetryDelay = 1500;
 
-  // Call planForNext, which prepares next attempt. Current retry time
-  // is greater than 1/2 of the maximum delay.
+  // Call scheduleRetry, which schedules a retry.
+  // Current retry time is greater than 1/2 of the maximum delay.
   // Expectations.
   var expectedRetryDelaySeconds = testMaximumDelaySeconds;
   expectChromeLocalStorageGet(
       this,
       createTestAttemptStorageEntryRequest(),
       createTestAttemptStorageEntry(testStoredRetryDelay),
       true);
   this.mockApis.expects(once()).chrome_alarms_create(
       testAttemptAlarmName,
       eqJSON({
         delayInMinutes: expectedRetryDelaySeconds / 60,
         periodInMinutes: testMaximumDelaySeconds / 60
       }));
   this.mockApis.expects(once()).chrome_storage_local_set(
       eqJSON(createTestAttemptStorageEntry(expectedRetryDelaySeconds)));
-  this.mockLocalFunctions.expects(once()).planForNextCallback();
   // Invocation.
-  test.attempts.planForNext(
-      this.mockLocalFunctions.functions().planForNextCallback);
+  var thenCalled = false;
+  var catchCalled = false;
+  test.attempts.scheduleRetry().then(function(request) {
+    thenCalled = true;
+  }).catch(function(request) {
+    catchCalled = true;
+  });
+  assertTrue(thenCalled);
+  assertFalse(catchCalled);
 });
 
 TEST_F('GoogleNowUtilityUnitTest', 'AttemptManagerAlarm', function() {
   // Tests that firing the alarm invokes the attempt.
 
   // Setup.
   var test = setupAttemptManagerTest(this);
   var onAlarmHandlerContainer = getMockHandlerContainer('alarms.onAlarm');
   assertEquals(1, onAlarmHandlerContainer.length);
 
   // Fire the alarm and check that this invokes the attempt callback.
   // Expectations.
   var alarmsGetSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_alarms_get(
           alarmsGetSavedArgs.match(eq(testAttemptAlarmName)),
           alarmsGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(alarmsGetSavedArgs, 1, {testField: 'TEST VALUE'}));
   this.mockLocalFunctions.expects(once()).attempt();
   // Invocation.
   onAlarmHandlerContainer[0]({name: testAttemptAlarmName});
 });