Index: chrome/test/data/extensions/api_test/media_galleries/iphoto/test.js |
diff --git a/chrome/test/data/extensions/api_test/media_galleries/picasa/test.js b/chrome/test/data/extensions/api_test/media_galleries/iphoto/test.js |
similarity index 50% |
copy from chrome/test/data/extensions/api_test/media_galleries/picasa/test.js |
copy to chrome/test/data/extensions/api_test/media_galleries/iphoto/test.js |
index bc10f07a87738429db24170d4a33255730faf57f..fb32b6b08f47045eb7efe2f9cee4166b97dc352f 100644 |
--- a/chrome/test/data/extensions/api_test/media_galleries/picasa/test.js |
+++ b/chrome/test/data/extensions/api_test/media_galleries/iphoto/test.js |
@@ -30,53 +30,38 @@ function verifyAllJPEGs(parentDirectoryEntry, filenames, doneCallback) { |
verifyNextJPEG(); |
} |
-function GalleryPropertiesTest(picasaGallery) { |
+function GalleryPropertiesTest(iphotoGallery) { |
var galleryProperties = |
- mediaGalleries.getMediaFileSystemMetadata(picasaGallery); |
+ mediaGalleries.getMediaFileSystemMetadata(iphotoGallery); |
chrome.test.assertFalse(galleryProperties.isRemovable); |
chrome.test.succeed(); |
} |
-function RootListingTest(picasaGallery) { |
+function RootListingTest(iphotoGallery) { |
function verify(directoryEntry, entries) { |
- chrome.test.assertEq(2, entries.length); |
- chrome.test.assertTrue(entries[0].isDirectory); |
- chrome.test.assertTrue(entries[1].isDirectory); |
- chrome.test.assertEq("albums", entries[0].name); |
- chrome.test.assertEq("folders", entries[1].name); |
- chrome.test.succeed(); |
- } |
- |
- verifyDirectoryEntry(picasaGallery.root, verify); |
-} |
- |
-function AlbumsListingTest(picasaGallery) { |
- function verify(directoryEntry, entries) { |
- chrome.test.assertEq(2, entries.length); |
+ chrome.test.assertEq(1, entries.length); |
chrome.test.assertTrue(entries[0].isDirectory); |
- chrome.test.assertTrue(entries[1].isDirectory); |
- chrome.test.assertEq("Album 1 Name 1899-12-30", entries[0].name); |
- chrome.test.assertEq("Album 2 Name 1899-12-30", entries[1].name); |
+ chrome.test.assertEq("Albums", entries[0].name); |
chrome.test.succeed(); |
} |
- getAndVerifyDirectoryEntry(picasaGallery.root, "albums", verify); |
+ verifyDirectoryEntry(iphotoGallery.root, verify); |
} |
-function FoldersListingTest(picasaGallery) { |
+function AlbumsListingTest(iphotoGallery) { |
function verify(directoryEntry, entries) { |
chrome.test.assertEq(2, entries.length); |
chrome.test.assertTrue(entries[0].isDirectory); |
chrome.test.assertTrue(entries[1].isDirectory); |
- chrome.test.assertEq("folder1 1899-12-30", entries[0].name); |
- chrome.test.assertEq("folder2 1899-12-30", entries[1].name); |
+ chrome.test.assertEq("Album1", entries[0].name); |
+ chrome.test.assertEq("Album2", entries[1].name); |
chrome.test.succeed(); |
} |
- getAndVerifyDirectoryEntry(picasaGallery.root, "folders", verify); |
+ getAndVerifyDirectoryEntry(iphotoGallery.root, "Albums", verify); |
} |
-function Album1ListingTest(picasaGallery) { |
+function Album1ListingTest(iphotoGallery) { |
function verify(directoryEntry, entries) { |
chrome.test.assertEq(2, entries.length); |
chrome.test.assertTrue(entries[0].isFile); |
@@ -88,54 +73,22 @@ function Album1ListingTest(picasaGallery) { |
chrome.test.succeed); |
} |
- getAndVerifyDirectoryEntry(picasaGallery.root, |
- "albums/Album 1 Name 1899-12-30", verify); |
+ getAndVerifyDirectoryEntry(iphotoGallery.root, |
+ "Albums/Album1", verify); |
} |
-function Album2ListingTest(picasaGallery) { |
- function verify(directoryEntry, entries) { |
- chrome.test.assertEq(2, entries.length); |
- chrome.test.assertTrue(entries[0].isFile); |
- chrome.test.assertTrue(entries[1].isFile); |
- chrome.test.assertEq("InBoth.jpg", entries[0].name); |
- chrome.test.assertEq("InSecondAlbumOnly.jpg", entries[1].name); |
- |
- verifyAllJPEGs(directoryEntry, ["InBoth.jpg", "InSecondAlbumOnly.jpg"], |
- chrome.test.succeed); |
- } |
- |
- getAndVerifyDirectoryEntry(picasaGallery.root, |
- "albums/Album 2 Name 1899-12-30", verify); |
-} |
- |
-function Folder1ListingTest(picasaGallery) { |
- function verify(directoryEntry, entries) { |
- chrome.test.assertEq(2, entries.length); |
- chrome.test.assertTrue(entries[0].isFile); |
- chrome.test.assertTrue(entries[1].isFile); |
- chrome.test.assertEq("InBoth.jpg", entries[0].name); |
- chrome.test.assertEq("InSecondAlbumOnly.jpg", entries[1].name); |
- |
- verifyAllJPEGs(directoryEntry, ["InBoth.jpg", "InSecondAlbumOnly.jpg"], |
- chrome.test.succeed); |
- } |
- |
- getAndVerifyDirectoryEntry(picasaGallery.root, |
- "folders/folder1 1899-12-30", verify); |
-} |
- |
-function Folder2ListingTest(picasaGallery) { |
+function Album2ListingTest(iphotoGallery) { |
function verify(directoryEntry, entries) { |
chrome.test.assertEq(1, entries.length); |
chrome.test.assertTrue(entries[0].isFile); |
- chrome.test.assertEq("InFirstAlbumOnly.jpg", entries[0].name); |
+ chrome.test.assertEq("InBoth.jpg", entries[0].name); |
- verifyAllJPEGs(directoryEntry, ["InFirstAlbumOnly.jpg"], |
+ verifyAllJPEGs(directoryEntry, ["InBoth.jpg"], |
chrome.test.succeed); |
} |
- getAndVerifyDirectoryEntry(picasaGallery.root, |
- "folders/folder2 1899-12-30", verify); |
+ getAndVerifyDirectoryEntry(iphotoGallery.root, |
+ "Albums/Album2", verify); |
} |
function getTest(testFunction) { |
@@ -146,12 +99,12 @@ function getTest(testFunction) { |
function getMediaFileSystemsCallback(results) { |
for (var i = 0; i < results.length; ++i) { |
var properties = mediaGalleries.getMediaFileSystemMetadata(results[i]); |
- if (properties.name == "Picasa") { |
+ if (properties.name == "iPhoto") { |
testFunction(results[i]); |
return; |
} |
} |
- chrome.test.fail("Picasa gallery not found"); |
+ chrome.test.fail("iPhoto gallery not found"); |
} |
return function() { |
@@ -169,10 +122,7 @@ chrome.test.getConfig(function(config) { |
getTest(GalleryPropertiesTest), |
getTest(RootListingTest), |
getTest(AlbumsListingTest), |
- getTest(FoldersListingTest), |
getTest(Album1ListingTest), |
getTest(Album2ListingTest), |
- getTest(Folder1ListingTest), |
- getTest(Folder2ListingTest), |
]); |
}); |