Adding support checks for FileSystem APIs and making APIs not webkit-specific.

tests/html/fileapi_test.dart

Index: tests/html/fileapi_test.dart
diff --git a/tests/html/fileapi_test.dart b/tests/html/fileapi_test.dart
index f7155b615824eb1d92f5dd3c962daccc825302b2..dbd89ff5686a5e75168e1badd39738dbfacd9c3c 100644
--- a/tests/html/fileapi_test.dart
+++ b/tests/html/fileapi_test.dart
@@ -1,6 +1,6 @@
 library fileapi;
 import '../../pkg/unittest/lib/unittest.dart';
-import '../../pkg/unittest/lib/html_config.dart';
+import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
 
 void fail(message) {
@@ -12,68 +12,91 @@ void fail(message) {
 FileSystem fs;
 
 main() {
-  useHtmlConfiguration();
-  test('getFileSystem', () {
-    window.webkitRequestFileSystem(Window.TEMPORARY, 100, expectAsync1(
-      (FileSystem fileSystem) {
-        fs = fileSystem;
-      }),
-      (e) {
-        fail('Got file error: ${e.code}');
-      });
-  });
-  group('getDirectory', () {
+  useHtmlIndividualConfiguration();
 
-    test('directoryDoesntExist', () {
-      fs.root.getDirectory(
-          'directory2',
-          options: {},
-          successCallback: (e) {
-            fail('Should not be reached');
-          },
-          errorCallback: expectAsync1((FileError e) {
-            expect(e.code, equals(FileError.NOT_FOUND_ERR));
-          }));
+  group('supported', () {
+    test('supported', () {
+      expect(FileSystem.supported, true);
     });
+  });
 
-    test('directoryCreate', () {
-      fs.root.getDirectory(
-          'directory3',
-          options: {'create': true},
-          successCallback: expectAsync1((DirectoryEntry e) {
-            expect(e.name, equals('directory3'));
-          }),
-          errorCallback: (e) {
-            fail('Got file error: ${e.code}');
-          });
+  getFileSystem() {
+    window.requestFileSystem(Window.TEMPORARY, 100,
+        expectAsync1((FileSystem fileSystem) {
+          fs = fileSystem;
+        }),
+        (e) {
+          fail('Got file error: ${e.code}');
+        });
+  }
+
+  group('fileSystem', () {
+    test('getFileSystem', () {
+      var expectation = FileSystem.supported ? returnsNormally : throws;
+      expect(() {
+        getFileSystem();
+      }, expectation);
     });
   });
 
-  group('getFile', () {
+  group('getDirectory', () {
+    if (FileSystem.supported) {
+      test('getFileSystem', getFileSystem);

[Emily Fortuna, 2013/01/11 21:05:13]

this seems like the same test as on line 33?

[blois, 2013/01/11 21:24:09]

The tests rely on the FileSystem being fetched first (order-dependent tests, not
great).

Since the tests are now using the individual config, each group needs to get the
FS. Easiest to just make it a test to avoid too many levels of async in the
other tests.

[Emily Fortuna, 2013/01/11 21:25:23]

gotcha.
On 2013/01/11 21:24:09, blois wrote:

 
-    test('fileDoesntExist', () {
-      fs.root.getFile(
-          'file2',
-          options: {},
-          successCallback: (e) {
-            fail('Should not be reached');
-          },
-          errorCallback: expectAsync1((FileError e) {
-            expect(e.code, equals(FileError.NOT_FOUND_ERR));
-          }));
-    });
+      test('directoryDoesntExist', () {
+        fs.root.getDirectory(
+            'directory2',
+            options: {},
+            successCallback: (e) {
+              fail('Should not be reached');
+            },
+            errorCallback: expectAsync1((FileError e) {
+              expect(e.code, equals(FileError.NOT_FOUND_ERR));
+            }));
+        });
+
+      test('directoryCreate', () {
+        fs.root.getDirectory(
+            'directory3',
+            options: {'create': true},
+            successCallback: expectAsync1((DirectoryEntry e) {
+              expect(e.name, equals('directory3'));
+            }),
+            errorCallback: (e) {
+              fail('Got file error: ${e.code}');
+            });
+        });
+    }
+  });
 
-    test('fileCreate', () {
-      fs.root.getFile(
-          'file4',
-          options: {'create': true},
-          successCallback: expectAsync1((FileEntry e) {
-            expect(e.name, equals('file4'));
-            expect(e.isFile, isTrue);
-          }),
-          errorCallback: (e) {
-            fail('Got file error: ${e.code}');
-          });
+  group('getFile', () {
+    if (FileSystem.supported) {
+      test('getFileSystem', getFileSystem);
+
+      test('fileDoesntExist', () {
+        fs.root.getFile(
+            'file2',
+            options: {},
+            successCallback: (e) {
+              fail('Should not be reached');
+            },
+            errorCallback: expectAsync1((FileError e) {
+              expect(e.code, equals(FileError.NOT_FOUND_ERR));
+            }));
       });
+
+      test('fileCreate', () {
+        fs.root.getFile(
+            'file4',
+            options: {'create': true},
+            successCallback: expectAsync1((FileEntry e) {
+              expect(e.name, equals('file4'));
+              expect(e.isFile, isTrue);
+            }),
+            errorCallback: (e) {
+              fail('Got file error: ${e.code}');
+            });
+        });
+    }
   });
 }