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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/extensions/api_test/settings/simple_test/background.js

Issue 10890002: Make V8ValueConverter.FromV8Value behave similarly to JSON.stringify (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no more function Created 8 years, 3 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/renderer/resources/extensions/storage_custom_bindings.js ('k') | content/public/renderer/v8_value_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/api_test/settings/simple_test/background.js
diff --git a/chrome/test/data/extensions/api_test/settings/simple_test/background.js b/chrome/test/data/extensions/api_test/settings/simple_test/background.js
index 0ac0b5ea10d9e23294698e44b4311a3ee12e63c1..02fe31824bc320dfbc0d42a85148af4a0763a538 100644
--- a/chrome/test/data/extensions/api_test/settings/simple_test/background.js
+++ b/chrome/test/data/extensions/api_test/settings/simple_test/background.js
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+var assertEq = chrome.test.assertEq;
+var assertTrue = chrome.test.assertTrue;
+var succeed = chrome.test.succeed;
+
function test(stage0) {
var apis = [
chrome.storage.sync,
@@ -19,15 +23,15 @@ chrome.test.runTests([
this.get('foo', stage1.bind(this));
}
function stage1(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.get(['foo', 'bar'], stage2.bind(this));
}
function stage2(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.get(undefined, stage3.bind(this));
}
function stage3(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.succeed();
}
test(stage0);
@@ -45,21 +49,21 @@ chrome.test.runTests([
this.get(['foo', 'baz'], stage2.bind(this));
}
function stage2(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo': 'bar',
'baz': 'qux'
}, settings);
this.get(['nothing', 'baz', 'hello', 'ignore'], stage3.bind(this));
}
function stage3(settings) {
- chrome.test.assertEq({
+ assertEq({
'baz' : 'qux',
'hello': 'world'
}, settings);
this.get(null, stage4.bind(this));
}
function stage4(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo' : 'bar',
'baz' : 'qux',
'hello': 'world'
@@ -94,7 +98,7 @@ chrome.test.runTests([
this.get(null, stage3.bind(this));
}
function stage3(settings) {
- chrome.test.assertEq({
+ assertEq({
'baz' : 'qux',
'hello': 'world'
}, settings);
@@ -104,7 +108,7 @@ chrome.test.runTests([
this.get(null, stage5.bind(this));
}
function stage5(settings) {
- chrome.test.assertEq({
+ assertEq({
'hello': 'world'
}, settings);
this.remove('hello', stage6.bind(this));
@@ -113,7 +117,7 @@ chrome.test.runTests([
this.get(null, stage7.bind(this));
}
function stage7(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.succeed();
}
test(stage0);
@@ -137,7 +141,7 @@ chrome.test.runTests([
this.get(null, stage3.bind(this));
}
function stage3(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo' : 'otherBar',
'baz' : 'otherQux',
'hello': 'world'
@@ -152,7 +156,7 @@ chrome.test.runTests([
this.get(null, stage5.bind(this));
}
function stage5(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo' : 'otherBar',
'baz' : 'anotherQux',
'hello': 'otherWorld',
@@ -171,7 +175,7 @@ chrome.test.runTests([
this.get(null, stage2.bind(this));
}
function stage2(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.succeed();
}
test(stage0);
@@ -192,7 +196,7 @@ chrome.test.runTests([
this.get(null, stage3.bind(this));
}
function stage3(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.succeed();
}
test(stage0);
@@ -209,21 +213,21 @@ chrome.test.runTests([
this.get(['foo.bar', 'one'], stage2.bind(this));
}
function stage2(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo.bar' : 'baz',
'one' : {'two': 'three'}
}, settings);
this.get('one.two', stage3.bind(this));
}
function stage3(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.remove(['foo.bar', 'one.two'], stage4.bind(this));
}
function stage4() {
this.get(null, stage5.bind(this));
}
function stage5(settings) {
- chrome.test.assertEq({
+ assertEq({
'one' : {'two': 'three'}
}, settings);
this.succeed();
@@ -239,14 +243,14 @@ chrome.test.runTests([
}, stage1.bind(this));
}
function stage1(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo': 'defaultBar',
'baz': [1, 2, 3]
}, settings);
this.get(null, stage2.bind(this));
}
function stage2(settings) {
- chrome.test.assertEq({}, settings);
+ assertEq({}, settings);
this.set({'foo': 'bar'}, stage3.bind(this));
}
function stage3() {
@@ -256,7 +260,7 @@ chrome.test.runTests([
}, stage4.bind(this));
}
function stage4(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo': 'bar',
'baz': [1, 2, 3]
}, settings);
@@ -269,7 +273,7 @@ chrome.test.runTests([
}, stage6.bind(this));
}
function stage6(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo': 'bar',
'baz': {}
}, settings);
@@ -282,7 +286,7 @@ chrome.test.runTests([
}, stage8.bind(this));
}
function stage8(settings) {
- chrome.test.assertEq({
+ assertEq({
'foo': 'defaultBar',
'baz': {}
}, settings);
@@ -295,38 +299,66 @@ chrome.test.runTests([
function quota() {
// Just check that the constants are defined; no need to be forced to
// update them here as well if/when they change.
- chrome.test.assertTrue(chrome.storage.sync.QUOTA_BYTES > 0);
- chrome.test.assertTrue(chrome.storage.sync.QUOTA_BYTES_PER_ITEM > 0);
- chrome.test.assertTrue(chrome.storage.sync.MAX_ITEMS > 0);
+ assertTrue(chrome.storage.sync.QUOTA_BYTES > 0);
+ assertTrue(chrome.storage.sync.QUOTA_BYTES_PER_ITEM > 0);
+ assertTrue(chrome.storage.sync.MAX_ITEMS > 0);
- chrome.test.assertTrue(chrome.storage.local.QUOTA_BYTES > 0);
- chrome.test.assertEq('undefined',
- typeof chrome.storage.local.QUOTA_BYTES_PER_ITEM);
- chrome.test.assertEq('undefined',
- typeof chrome.storage.local.MAX_ITEMS);
+ assertTrue(chrome.storage.local.QUOTA_BYTES > 0);
+ assertEq('undefined', typeof chrome.storage.local.QUOTA_BYTES_PER_ITEM);
+ assertEq('undefined', typeof chrome.storage.local.MAX_ITEMS);
var area = chrome.storage.sync;
function stage0() {
area.getBytesInUse(null, stage1);
}
function stage1(bytesInUse) {
- chrome.test.assertEq(0, bytesInUse);
+ assertEq(0, bytesInUse);
area.set({ a: 42, b: 43, c: 44 }, stage2);
}
function stage2() {
area.getBytesInUse(null, stage3);
}
function stage3(bytesInUse) {
- chrome.test.assertEq(9, bytesInUse);
+ assertEq(9, bytesInUse);
area.getBytesInUse('a', stage4);
}
function stage4(bytesInUse) {
- chrome.test.assertEq(3, bytesInUse);
+ assertEq(3, bytesInUse);
area.getBytesInUse(['a', 'b'], stage5);
}
function stage5(bytesInUse) {
- chrome.test.assertEq(6, bytesInUse);
- chrome.test.succeed();
+ assertEq(6, bytesInUse);
+ succeed();
+ }
+ area.clear(stage0);
+ },
+
+ function nullsInArgs() {
+ var area = chrome.storage.local;
+ function stage0() {
+ area.get({
+ foo: 'foo',
+ bar: null,
+ baz: undefined
+ }, stage1);
+ }
+ function stage1(values) {
+ assertEq({
+ foo: 'foo',
+ bar: null,
+ }, values);
+ area.set({
+ foo: 'foo',
+ bar: null,
+ baz: undefined
+ }, area.get.bind(area, stage2));
+ }
+ function stage2(values) {
+ assertEq({
+ foo: 'foo',
+ bar: null,
+ }, values);
+ succeed();
}
area.clear(stage0);
},
@@ -366,5 +398,5 @@ chrome.test.runTests([
}));
}));
}));
- }
+ },
]);
« no previous file with comments | « chrome/renderer/resources/extensions/storage_custom_bindings.js ('k') | content/public/renderer/v8_value_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698