Switching getting/dismissing cards to new protocol

chrome/browser/resources/google_now/cards_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 cards.js.
  * @constructor
  * @extends {testing.Test}
  */
 function GoogleNowCardsUnitTest () {
   testing.Test.call(this);
 }
 
 GoogleNowCardsUnitTest.prototype = {
   __proto__: testing.Test.prototype,
 
   /** @override */
   extraLibraries: [
     'cards.js'
   ]
 };
 
 var testCardId = 'TEST CARD ID';
 var testNotification = {testNotificationField: 'TEST NOTIFICATION VALUE'};
 var expectedShowAlarmId = 'card-show-TEST CARD ID';
 var expectedHideAlarmId = 'card-hide-TEST CARD ID';
 var testActionUrls = {testField: 'TEST VALUE'};
-var testDismissal = {testDismissalField: 'TEST DISMISSAL VALUE'};
+var testDismissals = [
+  {testDismissalField: 'TEST DISMISSAL VALUE 1'},
+  {testDismissalField: 'TEST DISMISSAL VALUE 2'}
+];
+var testGroupRank = 271;
 
 function setUpCardManagerTest(fixture) {
   fixture.makeAndRegisterMockApis([
       'chrome.alarms.clear',
       'chrome.alarms.create',
       'chrome.notifications.clear',
       'instrumented.alarms.onAlarm.addListener',
       'instrumented.notifications.create',
       'instrumented.notifications.update',
       'instrumented.storage.local.get'
@@ skipping 21 matching lines @@
 }
 
 TEST_F('GoogleNowCardsUnitTest', 'BuildCardManager', function() {
   // Tests that buildCardSet() call completes with no problems.
   var test = setUpCardManagerTest(this);
 
   assertEquals('object', typeof test.cardSet);
   assertEquals('function', typeof test.alarmCallback);
 });
 
-TEST_F('GoogleNowCardsUnitTest', 'CreateCard', function() {
-  // Creates a new card with no trigger.
+TEST_F('GoogleNowCardsUnitTest', 'CreateCardEmptyTrigger', function() {
+  // Creates a new card with empty trigger.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedShowAlarmId);
   var chromeNotificationsCreateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_create(
           chromeNotificationsCreateSavedArgs.match(eq(testCardId)),
           chromeNotificationsCreateSavedArgs.match(eqJSON(testNotification)),
           chromeNotificationsCreateSavedArgs.match(ANYTHING)).
       will(invokeCallback(chromeNotificationsCreateSavedArgs, 2, testCardId));
 
   // Call tested method.
-  var notificationData = test.cardSet.update({
-    notificationId: testCardId,
+  var notificationData = test.cardSet.update(testCardId, {
     notification: testNotification,
     actionUrls: testActionUrls,
-    dismissal: testDismissal,
-    version: 0});
-
-  // Check the return value.
-  assertEquals(
-      JSON.stringify({
-        actionUrls: testActionUrls,
-        cardCreateInfo: {
-          notification: testNotification,
-          timeHide: undefined,
-          version: 0
-        },
-        dismissalParameters: testDismissal
-      }),
-    JSON.stringify(notificationData));
-});
-
-TEST_F('GoogleNowCardsUnitTest', 'CreateCardEmptyTrigger', function() {
-  // Creates a new card with empty trigger.
-
-  // Setup and expectations.
-  var test = setUpCardManagerTest(this);
-  this.mockApis.expects(once()).
-      chrome_alarms_clear(expectedHideAlarmId);
-  this.mockApis.expects(once()).
-      chrome_alarms_clear(expectedShowAlarmId);
-  this.mockApis.expects(once()).
-      instrumented_notifications_create(
-          testCardId, eqJSON(testNotification), ANYTHING);
-
-  // Call tested method.
-  var notificationData = test.cardSet.update({
-    notificationId: testCardId,
-    notification: testNotification,
-    actionUrls: testActionUrls,
-    dismissal: testDismissal,
+    dismissals: testDismissals,
+    groupRank: testGroupRank,
     version: 0,
     trigger: {}});
 
   // Check the return value.
   assertEquals(
       JSON.stringify({
         actionUrls: testActionUrls,
         cardCreateInfo: {
           notification: testNotification,
-          timeHide: undefined,
+          hideTime: undefined,
           version: 0
         },
-        dismissalParameters: testDismissal
-     }),
+        dismissals: testDismissals
+      }),
     JSON.stringify(notificationData));
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'CreateCardHideTime', function() {
   // Creates a new card with trigger specifying hide time.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedShowAlarmId);
   var chromeNotificationsCreateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_create(
           chromeNotificationsCreateSavedArgs.match(eq(testCardId)),
           chromeNotificationsCreateSavedArgs.match(eqJSON(testNotification)),
           chromeNotificationsCreateSavedArgs.match(ANYTHING)).
       will(invokeCallback(chromeNotificationsCreateSavedArgs, 2, testCardId));
   this.mockApis.expects(once()).
       chrome_alarms_create(expectedHideAlarmId, eqJSON({when: 1313000}));
 
   // Call tested method.
-  var notificationData = test.cardSet.update({
-    notificationId: testCardId,
+  var notificationData = test.cardSet.update(testCardId, {
     notification: testNotification,
     actionUrls: testActionUrls,
-    dismissal: testDismissal,
+    dismissals: testDismissals,
+    groupRank: testGroupRank,
     version: 0,
-    trigger: {hideTimeSec: 1013}});
+    trigger: {hideTime: 1313000}});
 
   // Check the return value.
   assertEquals(
       JSON.stringify({
         actionUrls: testActionUrls,
         cardCreateInfo: {
           notification: testNotification,
-          timeHide: 1313000,
+          hideTime: 1313000,
           version: 0
         },
-        dismissalParameters: testDismissal
+        dismissals: testDismissals
       }),
     JSON.stringify(notificationData));
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'UpdateCardSameVersion', function() {
   // Updates a card with another card with same version.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedShowAlarmId);
   var chromeNotificationsCreateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_update(
           chromeNotificationsCreateSavedArgs.match(eq(testCardId)),
           chromeNotificationsCreateSavedArgs.match(eqJSON(testNotification)),
           chromeNotificationsCreateSavedArgs.match(ANYTHING)).
       will(invokeCallback(chromeNotificationsCreateSavedArgs, 2, true));
 
   // Call tested method.
-  var notificationData = test.cardSet.update({
-    notificationId: testCardId,
+  var notificationData = test.cardSet.update(testCardId, {
     notification: testNotification,
     actionUrls: testActionUrls,
-    dismissal: testDismissal,
-    version: 0},
+    dismissals: testDismissals,
+    groupRank: testGroupRank,
+    version: 0,
+    trigger: {}},
       0);
 
   // Check the return value.
   assertEquals(
       JSON.stringify({
         actionUrls: testActionUrls,
         cardCreateInfo: {
           notification: testNotification,
           version: 0,
           previousVersion: 0
         },
-        dismissalParameters: testDismissal
+        dismissals: testDismissals
       }),
     JSON.stringify(notificationData));
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'UpdateCardSameVersionHideTime', function() {
   // Updates a card with another card with same version and specifying hide
   // time.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedShowAlarmId);
   var chromeNotificationsCreateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_update(
           chromeNotificationsCreateSavedArgs.match(eq(testCardId)),
           chromeNotificationsCreateSavedArgs.match(eqJSON(testNotification)),
           chromeNotificationsCreateSavedArgs.match(ANYTHING)).
       will(invokeCallback(chromeNotificationsCreateSavedArgs, 2, testCardId));
   this.mockApis.expects(once()).
       chrome_alarms_create(expectedHideAlarmId, eqJSON({when: 1313000}));
 
   // Call tested method.
-  test.cardSet.update({
-                        notificationId: testCardId,
+  test.cardSet.update(testCardId, {
                         notification: testNotification,
                         actionUrls: testActionUrls,
-                        dismissal: testDismissal,
+                        dismissals: testDismissals,
+                        groupRank: testGroupRank,
                         version: 0,
-                        trigger: {hideTimeSec: 1013}},
+                        trigger: {hideTime: 1313000}},
                       0);
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'UpdateCardDifferentVersion', function() {
   // Updates a card with another card with different version.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedShowAlarmId);
   this.mockApis.expects(once()).
       instrumented_notifications_create(
           testCardId, eqJSON(testNotification), ANYTHING);
 
   // Call tested method.
-  test.cardSet.update({
-                        notificationId: testCardId,
+  test.cardSet.update(testCardId, {
                         notification: testNotification,
                         actionUrls: testActionUrls,
-                        dismissal: testDismissal,
-                        version: 0},
+                        dismissals: testDismissals,
+                        groupRank: testGroupRank,
+                        version: 0,
+                        trigger: {}},
                       1);
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'CreateCardTriggerShowNow', function() {
   // Creates a new card with trigger that requires showing the card immediately.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedShowAlarmId);
   this.mockApis.expects(once()).
       instrumented_notifications_create(
           testCardId, eqJSON(testNotification), ANYTHING);
 
   // Call tested method.
-  test.cardSet.update({
-    notificationId: testCardId,
+  test.cardSet.update(testCardId, {
     notification: testNotification,
     actionUrls: testActionUrls,
-    dismissal: testDismissal,
+    dismissals: testDismissals,
+    groupRank: testGroupRank,
     version: 0,
-    trigger: {showTimeSec: 0}});
+    trigger: {showTime: Date.now()}});
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'CreateCardTriggerShowLater', function() {
   // Creates a new card with trigger that requires showing the card later.
   // We are supposed to schedule an alarm to show the notification later.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedHideAlarmId);
   this.mockApis.expects(once()).
       chrome_alarms_create(expectedShowAlarmId, eqJSON({when: 539000}));
 
   // Call tested method.
-  test.cardSet.update({
-    notificationId: testCardId,
+  test.cardSet.update(testCardId, {
     notification: testNotification,
     actionUrls: testActionUrls,
-    dismissal: testDismissal,
+    dismissals: testDismissals,
+    groupRank: testGroupRank,
     version: 0,
-    trigger: {showTimeSec: 239}});
+    trigger: {showTime: 539000}});
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'ClearCard', function() {
   // Clears a card.
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_notifications_clear(testCardId, ANYTHING);
   this.mockApis.expects(once()).
@@ skipping 38 matching lines @@
           storageGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           storageGetSavedArgs,
           1,
           {
             notificationsData: {
               'TEST CARD ID': {
               actionUrls: testActionUrls,
               cardCreateInfo: {
                 notification: testNotification,
-                timeHide: 1313000,
+                hideTime: 1313000,
                 version: 0}}}}));
   var chromeNotificationsCreateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_create(
           chromeNotificationsCreateSavedArgs.match(eq(testCardId)),
           chromeNotificationsCreateSavedArgs.match(eqJSON(testNotification)),
           chromeNotificationsCreateSavedArgs.match(ANYTHING)).
       will(invokeCallback(chromeNotificationsCreateSavedArgs, 2, testCardId));
   this.mockApis.expects(once()).
       chrome_alarms_create(expectedHideAlarmId, eqJSON({when: 1313000}));
@@ skipping 13 matching lines @@
           storageGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           storageGetSavedArgs,
           1,
           {
             notificationsData: {
               'TEST CARD ID': {
               actionUrls: testActionUrls,
               cardCreateInfo: {
                 notification: testNotification,
-                timeHide: 1313000,
+                hideTime: 1313000,
                 version: 0,
                 previousVersion:0}}}}));
   var chromeNotificationsCreateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_update(
           testCardId, eqJSON(testNotification), ANYTHING);
 
   // Call tested method.
   test.alarmCallback({name: expectedShowAlarmId});
 });
 
 TEST_F('GoogleNowCardsUnitTest', 'onAlarmHide', function() {
   // Tests onAlarm for the 'hide' alarm.
   var test = setUpCardManagerTest(this);
   this.mockApis.expects(once()).
       chrome_notifications_clear(testCardId, ANYTHING);
+  this.mockApis.expects(once()).
+      chrome_alarms_clear(expectedShowAlarmId);
+  this.mockApis.expects(once()).
+      chrome_alarms_clear(expectedHideAlarmId);
+
 
   // Call tested method.
   test.alarmCallback({name: expectedHideAlarmId});
 });