Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2253)

Unified Diff: chrome/browser/resources/google_now/cards_unittest.gtestjs

Issue 25097002: Cleaning data associated with the card upon deletion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing missing argument. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/google_now/cards.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/google_now/cards_unittest.gtestjs
diff --git a/chrome/browser/resources/google_now/cards_unittest.gtestjs b/chrome/browser/resources/google_now/cards_unittest.gtestjs
index aca37c65cce1e398dc8bf9f77c530866f0545b31..731b1fc3aeba352ee9038bc3ddf75020330dbed2 100644
--- a/chrome/browser/resources/google_now/cards_unittest.gtestjs
+++ b/chrome/browser/resources/google_now/cards_unittest.gtestjs
@@ -36,10 +36,12 @@ function setUpCardManagerTest(fixture) {
'chrome.alarms.clear',
'chrome.alarms.create',
'chrome.notifications.clear',
+ 'chrome.storage.local.set',
'instrumented.alarms.onAlarm.addListener',
'instrumented.notifications.create',
'instrumented.notifications.update',
- 'instrumented.storage.local.get'
+ 'instrumented.storage.local.get',
+ 'tasks.add'
]);
chrome.runtime = {}; // No error.
@@ -306,7 +308,7 @@ TEST_F('GoogleNowCardsUnitTest', 'ClearCard', function() {
chrome_alarms_clear(expectedHideAlarmId);
// Call tested method.
- test.cardSet.clear(testCardId);
+ test.cardSet.clear(testCardId, false);
});
TEST_F('GoogleNowCardsUnitTest', 'onAlarmUnrecognized', function() {
@@ -398,13 +400,82 @@ TEST_F('GoogleNowCardsUnitTest', 'onAlarmShowHasDataUpdate', function() {
TEST_F('GoogleNowCardsUnitTest', 'onAlarmHide', function() {
// Tests onAlarm for the 'hide' alarm.
var test = setUpCardManagerTest(this);
+ var tasksAddSavedArgs = new SaveMockArguments();
+ this.mockApis.expects(once()).
+ tasks_add(
+ tasksAddSavedArgs.match(eq(CLEAR_CARD_TASK_NAME)),
+ tasksAddSavedArgs.match(ANYTHING)).
+ will(invokeCallback(tasksAddSavedArgs,1));
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);
-
+ var storageGetSavedArgs = new SaveMockArguments();
+ this.mockApis.expects(once()).
+ instrumented_storage_local_get(
+ storageGetSavedArgs.match(
+ eqJSON(['notificationsData', 'notificationGroups'])),
+ storageGetSavedArgs.match(ANYTHING)).
+ will(invokeCallback(
+ storageGetSavedArgs,
+ 1,
+ {
+ notificationsData: {
+ 'TEST CARD ID': {testField: 'TEST VALUE'},
+ 'TEST CARD ID 1': {testField: 'TEST VALUE 1'}
+ },
+ notificationGroups: {
+ groupA: {
+ cards: [
+ {
+ chromeNotificationId: 'TEST CARD ID',
+ testField: 'TEST VALUE',
+ },
+ {
+ chromeNotificationId: 'TEST CARD ID 1',
+ testField: 'TEST VALUE 1',
+ }
+ ]
+ },
+ groupB: {
+ cards: [
+ {
+ chromeNotificationId: 'TEST CARD ID 0',
+ testField: 'TEST VALUE 0',
+ },
+ {
+ chromeNotificationId: 'TEST CARD ID',
+ testField: 'TEST VALUE',
+ }
+ ]
+ }
+ }}));
+ this.mockApis.expects(once()).
+ chrome_storage_local_set(eqJSON({
+ notificationsData: {
+ 'TEST CARD ID 1': {testField: 'TEST VALUE 1'}
+ },
+ notificationGroups: {
+ groupA: {
+ cards: [
+ {
+ chromeNotificationId: 'TEST CARD ID 1',
+ testField: 'TEST VALUE 1',
+ }
+ ]
+ },
+ groupB: {
+ cards: [
+ {
+ chromeNotificationId: 'TEST CARD ID 0',
+ testField: 'TEST VALUE 0',
+ }
+ ]
+ }
+ }
+ }));
// Call tested method.
test.alarmCallback({name: expectedHideAlarmId});
« no previous file with comments | « chrome/browser/resources/google_now/cards.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698