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

Unified Diff: chrome/test/data/extensions/api_test/media_galleries/access_attached/test.js

Issue 24242010: Media Galleries: Refactor test to not need RunSecondPhase(). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
Index: chrome/test/data/extensions/api_test/media_galleries/access_attached/test.js
===================================================================
--- chrome/test/data/extensions/api_test/media_galleries/access_attached/test.js (revision 224775)
+++ chrome/test/data/extensions/api_test/media_galleries/access_attached/test.js (working copy)
@@ -6,29 +6,36 @@
var galleries;
var testResults = [];
+var expectedFileSystems;
+var testGalleryName;
-function testGalleries(expectedFileSystems, testGalleryName) {
- chrome.test.assertEq(expectedFileSystems, galleries.length);
-
- for (var i = 0; i < galleries.length; i++) {
- var metadata = mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
- if (metadata.name == testGalleryName) {
- chrome.test.succeed();
- return;
- } else {
- testResults.push(metadata.name);
- }
- }
- chrome.test.fail(testResults + ' vs ' + testGalleryName);
-};
-
var mediaFileSystemsListCallback = function(results) {
galleries = results;
};
-chrome.test.runTests([
- function mediaGalleriesAccessAttached() {
- mediaGalleries.getMediaFileSystems(
- chrome.test.callbackPass(mediaFileSystemsListCallback));
- },
-]);
+chrome.test.getConfig(function(config) {
+ customArg = JSON.parse(config.customArg);
+ expectedFileSystems = customArg[0];
+ testGalleryName = customArg[1];
+
+ chrome.test.runTests([
+ function mediaGalleriesAccessAttached() {
+ mediaGalleries.getMediaFileSystems(
+ chrome.test.callbackPass(mediaFileSystemsListCallback));
+ },
+ function testGalleries() {
+ chrome.test.assertEq(expectedFileSystems, galleries.length);
+
+ for (var i = 0; i < galleries.length; i++) {
+ var metadata = mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
+ if (metadata.name == testGalleryName) {
+ chrome.test.succeed();
+ return;
+ } else {
+ testResults.push(metadata.name);
+ }
+ }
+ chrome.test.fail(testResults + ' vs ' + testGalleryName);
+ },
+ ]);
+})

Powered by Google App Engine
This is Rietveld 408576698