Adapted the tests to the 'stream.Readable' and the 'stream.Writable' …

…addings
OpenMarshal · May 30, 2017 · 2d30e39 · 2d30e39
1 parent b88370a
commit 2d30e39
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/test/tests/persistence.js b/test/tests/persistence.js
@@ -15,7 +15,7 @@ module.exports = (test, options, index) => test('persistence', (isValid, server)
     const server2 = new webdav.WebDAVServer();
     const f1 = new webdav.VirtualFile('file1.txt');
     const f1Content = 'ok, This content is the test';
-    f1.write(f1Content, true, e => _(e, () => {
+    f1.write(true, (e, stream) => _(e, () => stream.end(f1Content, (e) => _(e, () => {
         server2.rootResource.addChild(f1, e => _(e, () => {
             server2.rootResource.addChild(new webdav.VirtualFile('file2.txt'), e => _(e, () => {
                 const folder1 = new webdav.VirtualFolder('folder1');
@@ -56,5 +56,5 @@ module.exports = (test, options, index) => test('persistence', (isValid, server)
                 }));
             }));
         }));
-    }))
+    }))))
 })
diff --git a/test/tests/readVirtualFile.js b/test/tests/readVirtualFile.js
@@ -29,7 +29,7 @@ module.exports = (test, options, index) => test('read a virtual file', (isValid,
     for(const fileName in files)
     {
         const file = new webdav.VirtualFile(fileName);
-        file.write(files[fileName].toString(), true, e => _(e, () => {
+        file.write(true, (e, stream) => _(e, () => stream.end(files[fileName].toString(), (e) => _(e, () => {
             server.rootResource.addChild(file, e => _(e, () => {
                 wfs.readFile('/' + fileName, (e, content) => {
                     if(e)
@@ -39,7 +39,7 @@ module.exports = (test, options, index) => test('read a virtual file', (isValid,
                 })
 
             }));
-        }))
+        }))))
     }
 
     wfs.readFile('/fileNotFound.txt', (e, content) => {

diff --git a/test/tests/source.js b/test/tests/source.js
@@ -1,6 +1,7 @@
 "use strict";
 var webdav = require('../../lib/index.js'),
-    request = require('request');
+    request = require('request'),
+    stream = require('stream');
 
 module.exports = (test, options, index) => test('source', (isValid, server) =>
 {
@@ -28,25 +29,28 @@ module.exports = (test, options, index) => test('source', (isValid, server) =>
     let unprocessed = 'unprocessed content';
 
     server.rootResource.addChild({
-        append(data, targetSource, callback)
+        write(targetSource, callback)
         {
-            if(targetSource)
-                unprocessed += data;
-            else
-                processed += data;
-            callback(null);
-        },
-        write(data, targetSource, callback)
-        {
-            if(targetSource)
-                unprocessed = data;
-            else
-                processed = data;
-            callback(null);
+            callback(null, new stream.Writable({
+                write: (chunk, encoding, callback) => {
+                    if(targetSource)
+                        unprocessed = chunk;
+                    else
+                        processed = chunk;
+
+                    callback(null);
+                }
+            }));
         },
         read(targetSource, callback)
         {
-            callback(null, targetSource ? unprocessed : processed);
+            callback(null, new stream.Readable({
+                read: function(size)
+                {
+                    this.push(targetSource ? unprocessed : processed);
+                    this.push(null);
+                }
+            }));
         },
         webName(callback)
         {

diff --git a/test/tests/statVirtual.js b/test/tests/statVirtual.js
@@ -17,7 +17,7 @@ module.exports = (test, options, index) => test('stat of virtual resources', (is
     const folder = new webdav.VirtualFolder('testFolder');
     server.rootResource.addChild(folder, e => _(e, () => {
         const file = new webdav.VirtualFile('testFile.txt');
-        file.write(content, true, e => _(e, () => {
+        file.write(true, (e, stream) => _(e, () => stream.end(content, (e) => _(e, () => {
             folder.addChild(file, e => _(e, () => {
 
                 var wfs = Client(
@@ -36,6 +36,6 @@ module.exports = (test, options, index) => test('stat of virtual resources', (is
                     isValid(!!e);
                 })
             }));
-        }))
+        }))))
     }));
 })