From 90d1979cbfcc16aa7d4d907956d4ecc9814ca07c Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 8 Sep 2016 11:55:57 +0800 Subject: [PATCH 1/2] Clean up fs tests and wrap in namespace --- node/node-tests.ts | 153 +++++++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 68 deletions(-) diff --git a/node/node-tests.ts b/node/node-tests.ts index 890d050d76..cf10b8a029 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -102,30 +102,94 @@ namespace events_tests { //////////////////////////////////////////////////// /// File system tests : http://nodejs.org/api/fs.html //////////////////////////////////////////////////// -fs.writeFile("thebible.txt", - "Do unto others as you would have them do unto you.", - assert.ifError); -fs.write(1234, "test"); - -fs.writeFile("Harry Potter", - "\"You be wizzing, Harry,\" jived Dumbledore.", +namespace fs_tests { { - encoding: "ascii" - }, - assert.ifError); + fs.writeFile("thebible.txt", + "Do unto others as you would have them do unto you.", + assert.ifError); + + fs.write(1234, "test"); + + fs.writeFile("Harry Potter", + "\"You be wizzing, Harry,\" jived Dumbledore.", + { + encoding: "ascii" + }, + assert.ifError); + } -var content: string, - buffer: Buffer; - -content = fs.readFileSync('testfile', 'utf8'); -content = fs.readFileSync('testfile', {encoding : 'utf8'}); -buffer = fs.readFileSync('testfile'); -buffer = fs.readFileSync('testfile', {flag : 'r'}); -fs.readFile('testfile', 'utf8', (err, data) => content = data); -fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data); -fs.readFile('testfile', (err, data) => buffer = data); -fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data); + { + var content: string; + var buffer: Buffer; + + content = fs.readFileSync('testfile', 'utf8'); + content = fs.readFileSync('testfile', {encoding : 'utf8'}); + buffer = fs.readFileSync('testfile'); + buffer = fs.readFileSync('testfile', {flag : 'r'}); + fs.readFile('testfile', 'utf8', (err, data) => content = data); + fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data); + fs.readFile('testfile', (err, data) => buffer = data); + fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data); + } + + { + var errno: string; + fs.readFile('testfile', (err, data) => { + if (err && err.errno) { + errno = err.errno; + } + }); + } + + { + fs.mkdtemp('/tmp/foo-', (err, folder) => { + console.log(folder); + // Prints: /tmp/foo-itXde2 + }); + } + + { + var tempDir: string; + tempDir = fs.mkdtempSync('/tmp/foo-'); + } + + { + fs.watch('/tmp/foo-', (event, filename) => { + console.log(event, filename); + }); + + fs.watch('/tmp/foo-', 'utf8', (event, filename) => { + console.log(event, filename); + }); + + fs.watch('/tmp/foo-', { + recursive: true, + persistent: true, + encoding: 'utf8' + }, (event, filename) => { + console.log(event, filename); + }); + } + + { + fs.access('/path/to/folder', (err) => {}); + + fs.access(Buffer.from(''), (err) => {}); + + fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => {}); + + fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => {}); + + fs.accessSync('/path/to/folder'); + + fs.accessSync(Buffer.from('')); + + fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK); + + fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK); + } +} class Networker extends events.EventEmitter { constructor() { @@ -135,53 +199,6 @@ class Networker extends events.EventEmitter { } } -var errno: string; -fs.readFile('testfile', (err, data) => { - if (err && err.errno) { - errno = err.errno; - } -}); - -fs.mkdtemp('/tmp/foo-', (err, folder) => { - console.log(folder); - // Prints: /tmp/foo-itXde2 -}); - -var tempDir: string; -tempDir = fs.mkdtempSync('/tmp/foo-'); - -fs.watch('/tmp/foo-', (event, filename) => { - console.log(event, filename); -}); - -fs.watch('/tmp/foo-', 'utf8', (event, filename) => { - console.log(event, filename); -}); - -fs.watch('/tmp/foo-', { - recursive: true, - persistent: true, - encoding: 'utf8' -}, (event, filename) => { - console.log(event, filename); -}); - -fs.access('/path/to/folder', (err) => {}); - -fs.access(Buffer.from(''), (err) => {}); - -fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => {}); - -fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => {}); - -fs.accessSync('/path/to/folder'); - -fs.accessSync(Buffer.from('')); - -fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK); - -fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK); - /////////////////////////////////////////////////////// /// Buffer tests : https://nodejs.org/api/buffer.html /////////////////////////////////////////////////////// From 02afdc49e54b3a3ce34c677339a24158084f7a7a Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 8 Sep 2016 12:08:36 +0800 Subject: [PATCH 2/2] Clean up fs tests and wrap in namespace --- node/node-4-tests.ts | 84 ++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/node/node-4-tests.ts b/node/node-4-tests.ts index 5a25f1fa20..52f1ee1705 100644 --- a/node/node-4-tests.ts +++ b/node/node-4-tests.ts @@ -92,30 +92,59 @@ namespace events_tests { //////////////////////////////////////////////////// /// File system tests : http://nodejs.org/api/fs.html //////////////////////////////////////////////////// -fs.writeFile("thebible.txt", - "Do unto others as you would have them do unto you.", - assert.ifError); -fs.write(1234, "test"); - -fs.writeFile("Harry Potter", - "\"You be wizzing, Harry,\" jived Dumbledore.", +namespace fs_tests { { - encoding: "ascii" - }, - assert.ifError); + fs.writeFile("thebible.txt", + "Do unto others as you would have them do unto you.", + assert.ifError); -var content: string, - buffer: Buffer; + fs.write(1234, "test"); -content = fs.readFileSync('testfile', 'utf8'); -content = fs.readFileSync('testfile', {encoding : 'utf8'}); -buffer = fs.readFileSync('testfile'); -buffer = fs.readFileSync('testfile', {flag : 'r'}); -fs.readFile('testfile', 'utf8', (err, data) => content = data); -fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data); -fs.readFile('testfile', (err, data) => buffer = data); -fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data); + fs.writeFile("Harry Potter", + "\"You be wizzing, Harry,\" jived Dumbledore.", + { + encoding: "ascii" + }, + assert.ifError); + } + + { + var content: string; + var buffer: Buffer; + + content = fs.readFileSync('testfile', 'utf8'); + content = fs.readFileSync('testfile', {encoding : 'utf8'}); + buffer = fs.readFileSync('testfile'); + buffer = fs.readFileSync('testfile', {flag : 'r'}); + fs.readFile('testfile', 'utf8', (err, data) => content = data); + fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data); + fs.readFile('testfile', (err, data) => buffer = data); + fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data); + } + + { + var errno: number; + fs.readFile('testfile', (err, data) => { + if (err && err.errno) { + errno = err.errno; + } + }); + } + + { + fs.mkdtemp('/tmp/foo-', (err, folder) => { + console.log(folder); + // Prints: /tmp/foo-itXde2 + }); + } + + { + var tempDir: string; + tempDir = fs.mkdtempSync('/tmp/foo-'); + } + +} class Networker extends events.EventEmitter { constructor() { @@ -125,21 +154,6 @@ class Networker extends events.EventEmitter { } } -var errno: number; -fs.readFile('testfile', (err, data) => { - if (err && err.errno) { - errno = err.errno; - } -}); - -fs.mkdtemp('/tmp/foo-', (err, folder) => { - console.log(folder); - // Prints: /tmp/foo-itXde2 -}); - -var tempDir: string; -tempDir = fs.mkdtempSync('/tmp/foo-'); - /////////////////////////////////////////////////////// /// Buffer tests : https://nodejs.org/api/buffer.html ///////////////////////////////////////////////////////