Skip to content

GitLab

T
tangled
Commit af99b7dc authored by dbeam's avatar dbeam Committed by Commit bot
Browse files
Options

Make bookmark manager load tests work again. 

Also just update some closure URLs.

R=arv@chromium.org
TBR=xians@chromium.org,zmo@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/681303005

Cr-Commit-Position: refs/heads/master@{#302123}
parent ea73a785
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 40 deletions
chrome/browser/resources/bookmark_manager/js/bmm_test.html
View file @ af99b7dc
...@@ -3,19 +3,22 @@ ...@@ -3,19 +3,22 @@
<head> <head>
<!-- TODO(arv): Check in Closure unit tests and make this run as part of the <!-- TODO(arv): Check in Closure unit tests and make this run as part of the
tests --> tests -->
<script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.js"></script> <script src="https://cdn.rawgit.com/google/closure-library/master/closure/goog/base.js"></script>
<script src="cr.js"></script> <script src="../../../../../ui/webui/resources/js/cr.js"></script>
<script src="bmm/treeiterator.js"></script>
<script src="bmm.js"></script> <script src="bmm.js"></script>
<title>Bookmark Manager Loading Test</title>
<script> <script>
goog.require('goog.testing.jsunit'); goog.require('goog.testing.jsunit');
goog.require('goog.testing.AsyncTestCase');
</script> </script>
</head> </head>
<body> <body>
<script> <script>
var asyncTestCase = goog.testing.AsyncTestCase.createAndInstall(document.title);
var tree = { var tree = {
id: 0, id: 0,
children: [ children: [
...@@ -53,26 +56,11 @@ chrome.bookmarkManagerPrivate.getSubtree.load = function(node) { ...@@ -53,26 +56,11 @@ chrome.bookmarkManagerPrivate.getSubtree.load = function(node) {
} }
}; };
function setUp() { function continueTesting() {
callbacks = {} asyncTestCase.continueTesting();
}
function testLoadSingle() {
var calls = 0;
function f(node) {
calls++;
assertEquals(tree, node);
}
var p = bmm.loadTree();
p.then(f);
chrome.bookmarkManagerPrivate.getSubtree.load(tree);
assertEquals(1, calls);
assertEquals(1, callbacks[''].$calls);
} }
function testLoadMultiple() { function testLoad() {
var calls1 = 0; var calls1 = 0;
var calls2 = 0; var calls2 = 0;
function f1(node) { function f1(node) {
...@@ -86,29 +74,37 @@ function testLoadMultiple() { ...@@ -86,29 +74,37 @@ function testLoadMultiple() {
var p = bmm.loadTree(); var p = bmm.loadTree();
var p2 = bmm.loadTree(); var p2 = bmm.loadTree();
p.then(f1); var r = [
p2.then(f2); p.then(f1),
p2.then(f2),
];
chrome.bookmarkManagerPrivate.getSubtree.load(tree); chrome.bookmarkManagerPrivate.getSubtree.load(tree);
var root = Promise.all(r).then(function() {
assertEquals(1, calls1); assertEquals(1, calls1);
assertEquals(1, calls2); assertEquals(1, calls2);
assertEquals(1, callbacks[''].$calls); assertEquals(1, callbacks[''].$calls);
} });
function testLoadSubtree() {
var calls = 0; var calls3 = 0;
function f(node) { function f3(node) {
calls++; calls3++;
assertEquals(tree.children[0], node); assertEquals(tree.children[0], node);
} }
var p = bmm.loadSubtree(1);
p.then(f); var p3 = bmm.loadSubtree(1);
var s = p3.then(f3);
chrome.bookmarkManagerPrivate.getSubtree.load(tree.children[0]); chrome.bookmarkManagerPrivate.getSubtree.load(tree.children[0]);
assertEquals(1, calls); var subtree = s.then(function() {
assertEquals(1, calls3);
assertEquals(1, callbacks[1].$calls); assertEquals(1, callbacks[1].$calls);
});
Promise.all([root, subtree]).then(continueTesting);
} }
</script> </script>
......
chrome/browser/resources/chromeos/login/screen_context_test.html
View file @ af99b7dc
<!DOCTYPE html> <!DOCTYPE html>
<title></title> <title></title>
<script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.js"></script> <script src="https://cdn.rawgit.com/google/closure-library/master/closure/goog/base.js"></script>
<script src="../../../../../ui/webui/resources/js/cr.js"></script> <script src="../../../../../ui/webui/resources/js/cr.js"></script>
<script src="screen_context.js"></script> <script src="screen_context.js"></script>
<script> <script>
......
content/browser/resources/gpu/timeline_test.html
View file @ af99b7dc
...@@ -8,7 +8,7 @@ found in the LICENSE file. ...@@ -8,7 +8,7 @@ found in the LICENSE file.
<head> <head>
<title></title> <title></title>
<link rel="stylesheet" href="timeline.css"> <link rel="stylesheet" href="timeline.css">
<!--<script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.js"></script>--> <!--<script src="https://cdn.rawgit.com/google/closure-library/master/closure/goog/base.js"></script>-->
<script src="../../../../ui/webui/resources/js/cr.js"></script> <script src="../../../../ui/webui/resources/js/cr.js"></script>
<script src="../../../../ui/webui/resources/js/cr/event_target.js"></script> <script src="../../../../ui/webui/resources/js/cr/event_target.js"></script>
<script src="../../../../ui/webui/resources/js/cr/ui.js"></script> <script src="../../../../ui/webui/resources/js/cr/ui.js"></script>
......
content/browser/resources/media/disjoint_range_set_test.html
View file @ af99b7dc
...@@ -7,7 +7,7 @@ found in the LICENSE file. ...@@ -7,7 +7,7 @@ found in the LICENSE file.
--> -->
<head> <head>
<title></title> <title></title>
<script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.js"></script> <script src="https://cdn.rawgit.com/google/closure-library/master/closure/goog/base.js"></script>
<script src="../../../../ui/webui/resources/js/cr.js"></script> <script src="../../../../ui/webui/resources/js/cr.js"></script>
<script src="disjoint_range_set.js"></script> <script src="disjoint_range_set.js"></script>
<script> <script>
......
ui/webui/resources/js/cr/ui/menu_test.html
View file @ af99b7dc
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.js"> <script src="https://cdn.rawgit.com/google/closure-library/master/closure/goog/base.js"></script>
</script>
<script src="../../cr.js"></script> <script src="../../cr.js"></script>
<script src="../event_target.js"></script> <script src="../event_target.js"></script>
<script src="../ui.js"></script> <script src="../ui.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment