From 62ec72a8ec1c104db01af5e3d448560d3cab8d71 Mon Sep 17 00:00:00 2001 From: CometS1 Date: Sun, 23 Sep 2018 22:39:11 -0400 Subject: [PATCH 1/4] Added test for fs.read when attempting to read a file that does not exist --- tests/spec/fs.read.spec.js | 61 +++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/tests/spec/fs.read.spec.js b/tests/spec/fs.read.spec.js index 1a574215..b77f9b8c 100644 --- a/tests/spec/fs.read.spec.js +++ b/tests/spec/fs.read.spec.js @@ -2,28 +2,28 @@ var Filer = require('../../src'); var util = require('../lib/test-utils.js'); var expect = require('chai').expect; -describe('fs.read', function() { +describe('fs.read', function () { beforeEach(util.setup); afterEach(util.cleanup); - it('should be a function', function() { + it('should be a function', function () { var fs = util.fs(); expect(fs.read).to.be.a('function'); }); - it('should read data from a file', function(done) { + it('should read data from a file', function (done) { var fs = util.fs(); var wbuffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]); var rbuffer = new Filer.Buffer(wbuffer.length); rbuffer.fill(0); - fs.open('/myfile', 'w+', function(error, fd) { - if(error) throw error; - fs.write(fd, wbuffer, 0, wbuffer.length, 0, function(error, result) { - if(error) throw error; + fs.open('/myfile', 'w+', function (error, fd) { + if (error) throw error; + fs.write(fd, wbuffer, 0, wbuffer.length, 0, function (error, result) { + if (error) throw error; expect(result).to.equal(wbuffer.length); - fs.read(fd, rbuffer, 0, rbuffer.length, 0, function(error, result) { + fs.read(fd, rbuffer, 0, rbuffer.length, 0, function (error, result) { expect(error).not.to.exist; expect(result).to.equal(rbuffer.length); expect(wbuffer).to.deep.equal(rbuffer); @@ -33,26 +33,26 @@ describe('fs.read', function() { }); }); - it('should update the current file position', function(done) { + it('should update the current file position', function (done) { var fs = util.fs(); var wbuffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]); var rbuffer = new Filer.Buffer(wbuffer.length); rbuffer.fill(0); var _result = 0; - fs.open('/myfile', 'w+', function(error, fd) { - if(error) throw error; + fs.open('/myfile', 'w+', function (error, fd) { + if (error) throw error; - fs.write(fd, wbuffer, 0, wbuffer.length, 0, function(error, result) { - if(error) throw error; + fs.write(fd, wbuffer, 0, wbuffer.length, 0, function (error, result) { + if (error) throw error; expect(result).to.equal(wbuffer.length); - fs.read(fd, rbuffer, 0, rbuffer.length / 2, undefined, function(error, result) { - if(error) throw error; + fs.read(fd, rbuffer, 0, rbuffer.length / 2, undefined, function (error, result) { + if (error) throw error; _result += result; - fs.read(fd, rbuffer, rbuffer.length / 2, rbuffer.length, undefined, function(error, result) { - if(error) throw error; + fs.read(fd, rbuffer, rbuffer.length / 2, rbuffer.length, undefined, function (error, result) { + if (error) throw error; _result += result; expect(error).not.to.exist; expect(_result).to.equal(rbuffer.length); @@ -64,20 +64,20 @@ describe('fs.read', function() { }); }); - it('should fail to read a directory', function(done) { + it('should fail to read a directory', function (done) { var fs = util.fs(); var buf = new Filer.Buffer(20); var buf2 = new Filer.Buffer(20); buf.fill(0); buf2.fill(0); - fs.mkdir('/mydir', function(error) { - if(error) throw error; + fs.mkdir('/mydir', function (error) { + if (error) throw error; - fs.open('/mydir', 'r', function(error, fd) { - if(error) throw error; + fs.open('/mydir', 'r', function (error, fd) { + if (error) throw error; - fs.read(fd, buf, 0, buf.length, 0, function(error, result) { + fs.read(fd, buf, 0, buf.length, 0, function (error, result) { expect(error).to.exist; expect(error.code).to.equal('EISDIR'); expect(result).to.equal(0); @@ -87,4 +87,17 @@ describe('fs.read', function() { }); }); }); -}); + + it('should fail to read a file that does not exist', function (done) { + var buffer = new Filer.Buffer(0); + var fs = util.fs(); + + var fd = 0; + + fs.read(fd, buffer, 0, buffer.length, undefined, function (error, result) { + expect(error).to.exist; + expect(result).not.to.exist; + done(); + }); + }); +}); \ No newline at end of file From 9036e715d2879699ba07cfcaedc2650577671969 Mon Sep 17 00:00:00 2001 From: CometS1 Date: Sun, 23 Sep 2018 22:52:01 -0400 Subject: [PATCH 2/4] Added test for fs.read when attempting to read a file that does not exist --- tests/spec/fs.read.spec.js | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/spec/fs.read.spec.js b/tests/spec/fs.read.spec.js index b77f9b8c..fb9978ed 100644 --- a/tests/spec/fs.read.spec.js +++ b/tests/spec/fs.read.spec.js @@ -2,28 +2,28 @@ var Filer = require('../../src'); var util = require('../lib/test-utils.js'); var expect = require('chai').expect; -describe('fs.read', function () { +describe('fs.read', function() { beforeEach(util.setup); afterEach(util.cleanup); - it('should be a function', function () { + it('should be a function', function() { var fs = util.fs(); expect(fs.read).to.be.a('function'); }); - it('should read data from a file', function (done) { + it('should read data from a file', function(done) { var fs = util.fs(); var wbuffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]); var rbuffer = new Filer.Buffer(wbuffer.length); rbuffer.fill(0); - fs.open('/myfile', 'w+', function (error, fd) { - if (error) throw error; - fs.write(fd, wbuffer, 0, wbuffer.length, 0, function (error, result) { - if (error) throw error; + fs.open('/myfile', 'w+', function(error, fd) { + if(error) throw error; + fs.write(fd, wbuffer, 0, wbuffer.length, 0, function(error, result) { + if(error) throw error; expect(result).to.equal(wbuffer.length); - fs.read(fd, rbuffer, 0, rbuffer.length, 0, function (error, result) { + fs.read(fd, rbuffer, 0, rbuffer.length, 0, function(error, result) { expect(error).not.to.exist; expect(result).to.equal(rbuffer.length); expect(wbuffer).to.deep.equal(rbuffer); @@ -33,26 +33,26 @@ describe('fs.read', function () { }); }); - it('should update the current file position', function (done) { + it('should update the current file position', function(done) { var fs = util.fs(); var wbuffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]); var rbuffer = new Filer.Buffer(wbuffer.length); rbuffer.fill(0); var _result = 0; - fs.open('/myfile', 'w+', function (error, fd) { - if (error) throw error; + fs.open('/myfile', 'w+', function(error, fd) { + if(error) throw error; - fs.write(fd, wbuffer, 0, wbuffer.length, 0, function (error, result) { - if (error) throw error; + fs.write(fd, wbuffer, 0, wbuffer.length, 0, function(error, result) { + if(error) throw error; expect(result).to.equal(wbuffer.length); - fs.read(fd, rbuffer, 0, rbuffer.length / 2, undefined, function (error, result) { - if (error) throw error; + fs.read(fd, rbuffer, 0, rbuffer.length / 2, undefined, function(error, result) { + if(error) throw error; _result += result; - fs.read(fd, rbuffer, rbuffer.length / 2, rbuffer.length, undefined, function (error, result) { - if (error) throw error; + fs.read(fd, rbuffer, rbuffer.length / 2, rbuffer.length, undefined, function(error, result) { + if(error) throw error; _result += result; expect(error).not.to.exist; expect(_result).to.equal(rbuffer.length); @@ -64,20 +64,20 @@ describe('fs.read', function () { }); }); - it('should fail to read a directory', function (done) { + it('should fail to read a directory', function(done) { var fs = util.fs(); var buf = new Filer.Buffer(20); var buf2 = new Filer.Buffer(20); buf.fill(0); buf2.fill(0); - fs.mkdir('/mydir', function (error) { - if (error) throw error; + fs.mkdir('/mydir', function(error) { + if(error) throw error; - fs.open('/mydir', 'r', function (error, fd) { - if (error) throw error; + fs.open('/mydir', 'r', function(error, fd) { + if(error) throw error; - fs.read(fd, buf, 0, buf.length, 0, function (error, result) { + fs.read(fd, buf, 0, buf.length, 0, function(error, result) { expect(error).to.exist; expect(error.code).to.equal('EISDIR'); expect(result).to.equal(0); @@ -88,13 +88,13 @@ describe('fs.read', function () { }); }); - it('should fail to read a file that does not exist', function (done) { + it('should fail to read a file that does not exist', function(done) { var buffer = new Filer.Buffer(0); var fs = util.fs(); var fd = 0; - fs.read(fd, buffer, 0, buffer.length, undefined, function (error, result) { + fs.read(fd, buffer, 0, buffer.length, undefined, function(error, result) { expect(error).to.exist; expect(result).not.to.exist; done(); From d870b7fa51f98dacfd753f96095d76e66f31d077 Mon Sep 17 00:00:00 2001 From: CometS1 Date: Wed, 26 Sep 2018 22:09:30 -0400 Subject: [PATCH 3/4] Modified read test for non-existent file to act more similar to earlier tests --- tests/spec/fs.read.spec.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/spec/fs.read.spec.js b/tests/spec/fs.read.spec.js index fb9978ed..c176f256 100644 --- a/tests/spec/fs.read.spec.js +++ b/tests/spec/fs.read.spec.js @@ -89,15 +89,16 @@ describe('fs.read', function() { }); it('should fail to read a file that does not exist', function(done) { - var buffer = new Filer.Buffer(0); var fs = util.fs(); var fd = 0; + var rbuffer = new Filer.Buffer(8); + rbuffer.fill(0); - fs.read(fd, buffer, 0, buffer.length, undefined, function(error, result) { + fs.read(fd, rbuffer, 0, rbuffer.length, 0, function(error, result) { expect(error).to.exist; expect(result).not.to.exist; done(); }); }); -}); \ No newline at end of file +}); From c36b592cfde93e4a59db7e84be16a21ecc3774b0 Mon Sep 17 00:00:00 2001 From: CometS1 Date: Wed, 10 Oct 2018 22:10:23 -0400 Subject: [PATCH 4/4] Added check in read test for error code --- tests/spec/fs.read.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec/fs.read.spec.js b/tests/spec/fs.read.spec.js index c176f256..991db446 100644 --- a/tests/spec/fs.read.spec.js +++ b/tests/spec/fs.read.spec.js @@ -98,6 +98,7 @@ describe('fs.read', function() { fs.read(fd, rbuffer, 0, rbuffer.length, 0, function(error, result) { expect(error).to.exist; expect(result).not.to.exist; + expect(error.code).to.equal('EBADF'); done(); }); });