From 5289361f659e99bf0e9a6bcde1579bfce6bca998 Mon Sep 17 00:00:00 2001
From: Joel Brandt <joelrbrandt@gmail.com>
Date: Mon, 12 Dec 2011 16:29:14 -0800
Subject: [PATCH 1/5] work on fileio tests

---
 test/SpecRunner.html              | 1 +
 test/spec/fileIO-test-files/file1 | 1 +
 test/spec/fileIO-test.js          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 test/spec/fileIO-test-files/file1

diff --git a/test/SpecRunner.html b/test/SpecRunner.html
index 934899d54..0ce06bb1e 100644
--- a/test/SpecRunner.html
+++ b/test/SpecRunner.html
@@ -25,6 +25,7 @@
 
   <!-- include spec files here... -->
   <script type="text/javascript" src="spec/SampleTest.js"></script>
+  <script type="text/javascript" src="spec/fileIO-test.js"></script>
   
   <!-- include source files here... -->
   <script type="text/javascript" src="../src/thirdparty/CodeMirror2/lib/CodeMirror.js"></script>
diff --git a/test/spec/fileIO-test-files/file1 b/test/spec/fileIO-test-files/file1
new file mode 100644
index 000000000..296743837
--- /dev/null
+++ b/test/spec/fileIO-test-files/file1
@@ -0,0 +1 @@
+Here is file1
diff --git a/test/spec/fileIO-test.js b/test/spec/fileIO-test.js
index 143f39fe4..1354c3fcf 100644
--- a/test/spec/fileIO-test.js
+++ b/test/spec/fileIO-test.js
@@ -4,7 +4,7 @@ describe("FileIO", function(){
 
         it("should run the test", function() {
             // verify editor content
-            expect("a").toEqual("a");
+            expect("a").toEqual("b");
         });
     });
 });

From 9b566ff28c8d3c340e4a3d86378b6e4ea6cbb1a5 Mon Sep 17 00:00:00 2001
From: Joel Brandt <joelrbrandt@gmail.com>
Date: Mon, 12 Dec 2011 17:09:36 -0800
Subject: [PATCH 2/5] renaming unit tests to match rename of API

---
 .../spec/{fileIO-test-files => NativeFileSystem-test-files}/file1 | 0
 test/spec/{fileIO-test.js => NativeFileSystem-test.js}            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/spec/{fileIO-test-files => NativeFileSystem-test-files}/file1 (100%)
 rename test/spec/{fileIO-test.js => NativeFileSystem-test.js} (100%)

diff --git a/test/spec/fileIO-test-files/file1 b/test/spec/NativeFileSystem-test-files/file1
similarity index 100%
rename from test/spec/fileIO-test-files/file1
rename to test/spec/NativeFileSystem-test-files/file1
diff --git a/test/spec/fileIO-test.js b/test/spec/NativeFileSystem-test.js
similarity index 100%
rename from test/spec/fileIO-test.js
rename to test/spec/NativeFileSystem-test.js

From f1a005a27fb9d1746c9e56cf527e4e7b3d987968 Mon Sep 17 00:00:00 2001
From: Joel Brandt <joelrbrandt@gmail.com>
Date: Mon, 12 Dec 2011 22:30:29 -0800
Subject: [PATCH 3/5] wrote initial unit test for directory reading API

---
 test/SpecRunner.html                          |  2 +
 .../NativeFileSystem-test-files/dir1/file2    |  1 +
 test/spec/NativeFileSystem-test.js            | 59 +++++++++++++++++--
 3 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 test/spec/NativeFileSystem-test-files/dir1/file2

diff --git a/test/SpecRunner.html b/test/SpecRunner.html
index 934899d54..1e383df4d 100644
--- a/test/SpecRunner.html
+++ b/test/SpecRunner.html
@@ -25,12 +25,14 @@
 
   <!-- include spec files here... -->
   <script type="text/javascript" src="spec/SampleTest.js"></script>
+  <script type="text/javascript" src="spec/NativeFileSystem-test.js"></script>
   
   <!-- include source files here... -->
   <script type="text/javascript" src="../src/thirdparty/CodeMirror2/lib/CodeMirror.js"></script>
   <script type="text/javascript" src="../src/thirdparty/CodeMirror2/mode/javascript/javascript.js"></script>
   <script type="text/javascript" src="../src/thirdparty/jquery-1.7.min.js"></script>
   <script type="text/javascript" src="../src/thirdparty/less-1.1.5.min.js"></script>
+  <script type="text/javascript" src="../src/NativeFileSystem.js"></script>
 
   <script type="text/javascript">
     (function() {
diff --git a/test/spec/NativeFileSystem-test-files/dir1/file2 b/test/spec/NativeFileSystem-test-files/dir1/file2
new file mode 100644
index 000000000..b14ef684b
--- /dev/null
+++ b/test/spec/NativeFileSystem-test-files/dir1/file2
@@ -0,0 +1 @@
+this is file2 in dir1
diff --git a/test/spec/NativeFileSystem-test.js b/test/spec/NativeFileSystem-test.js
index 1354c3fcf..0fe8aa0f0 100644
--- a/test/spec/NativeFileSystem-test.js
+++ b/test/spec/NativeFileSystem-test.js
@@ -1,11 +1,58 @@
 describe("FileIO", function(){
 
-    describe("Reading", function() {
+  describe("Reading", function() {
 
-        it("should run the test", function() {
-            // verify editor content
-            expect("a").toEqual("b");
-        });
+    beforeEach(function() {
+      this.addMatchers({
+        toContainDirectoryWithName: function(expected) {
+          for (var i = 0 ; i < this.actual.length; ++i) {
+            if (this.actual[i].isDirectory && this.actual[i].name === expected) {
+              return true;
+            }
+          }
+          return false;
+        }
+        , toContainFileWithName: function(expected) {
+          for (var i = 0 ; i < this.actual.length; ++i) {
+            if (this.actual[i].isFile && this.actual[i].name === expected) {
+              return true;
+            }
+          }
+          return false;                   
+        }
+      });
     });
+
+    it("should read a directory from disk", function() {
+
+      //TODO: Make this relative -- right now, asking for "." gives "/"
+      //Want to be able to simply use:
+      //  var path = "spec/NativeFileSystem-test-files";
+      var path = window.location.href;
+      path = path.substr("file://".length);
+      path = path.substr(0,path.lastIndexOf("/")+1);
+      path = path + "spec/NativeFileSystem-test-files";
+
+      var entries = null;
+      var readComplete = false;
+
+      var nfs = window.NativeFileSystem.requestNativeFileSystem(path);
+      var reader = nfs.createReader()
+
+      // TODO: not sure what parameters error callback will take because it's not implemented yet
+      reader.readEntries(
+        function(e) { entries = e; readComplete = true; }
+      , function()  { readComplete = true; }
+      );            
+
+      waitsFor(function() { return readComplete; }, 1000);
+
+      runs(function() {
+        expect(entries).toContainDirectoryWithName("dir1");
+        expect(entries).toContainFileWithName("file1");
+        expect(entries).not.toContainFileWithName("file2");
+      });
+
+    });
+  });
 });
-    

From dbafe137c0105859797dc64daca86effd72b4755 Mon Sep 17 00:00:00 2001
From: Joel Brandt <joelrbrandt@gmail.com>
Date: Mon, 12 Dec 2011 22:36:43 -0800
Subject: [PATCH 4/5] renamed the spec

---
 test/spec/NativeFileSystem-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/spec/NativeFileSystem-test.js b/test/spec/NativeFileSystem-test.js
index 0fe8aa0f0..876897c3b 100644
--- a/test/spec/NativeFileSystem-test.js
+++ b/test/spec/NativeFileSystem-test.js
@@ -1,4 +1,4 @@
-describe("FileIO", function(){
+describe("NativeFileSystem", function(){
 
   describe("Reading", function() {
 

From 01cf6a7a06a0693e149b4524ffe7f784b6ce2f37 Mon Sep 17 00:00:00 2001
From: Joel Brandt <joelrbrandt@gmail.com>
Date: Mon, 12 Dec 2011 23:09:44 -0800
Subject: [PATCH 5/5] made the callbacks a little cleaner

---
 test/spec/NativeFileSystem-test.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/spec/NativeFileSystem-test.js b/test/spec/NativeFileSystem-test.js
index 876897c3b..98e10b691 100644
--- a/test/spec/NativeFileSystem-test.js
+++ b/test/spec/NativeFileSystem-test.js
@@ -37,13 +37,13 @@ describe("NativeFileSystem", function(){
       var readComplete = false;
 
       var nfs = window.NativeFileSystem.requestNativeFileSystem(path);
-      var reader = nfs.createReader()
+      var reader = nfs.createReader();
 
+      var successCallback = function(e) { entries = e; readComplete = true; }
       // TODO: not sure what parameters error callback will take because it's not implemented yet
-      reader.readEntries(
-        function(e) { entries = e; readComplete = true; }
-      , function()  { readComplete = true; }
-      );            
+      var errorCallback = function() { readComplete = true; }
+
+      reader.readEntries(successCallback, errorCallback);            
 
       waitsFor(function() { return readComplete; }, 1000);
 
@@ -52,7 +52,6 @@ describe("NativeFileSystem", function(){
         expect(entries).toContainFileWithName("file1");
         expect(entries).not.toContainFileWithName("file2");
       });
-
     });
   });
 });