#8 Change test code

test/test-0.5.x.js

@@ -87,18 +87,18 @@ describe('File stream reader error should be able to handled', (report, done) =>
 })
 
 let localFile = null
-let sysDirs = null
+let sysDirs = RNFetchBlob.fs.dirs
+let dirs = RNFetchBlob.fs.dirs
 
 describe('Upload from file storage', (report, done) => {
   let filename = ''
   let filepath = ''
-  fs.getSystemDirs().then((dirs) => {
-    sysDirs = dirs
-    filename = Platform.OS + '0.5.0-' + Date.now() + '-from-storage.png'
-    filepath = dirs.DocumentDir + '/' + filename
-    return RNFetchBlob.config({ path : filepath })
-                      .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
-  })
+
+  filename = Platform.OS + '0.5.0-' + Date.now() + '-from-storage.png'
+  filepath = dirs.DocumentDir + '/' + filename
+  RNFetchBlob
+  .config({ path : filepath })
+  .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
   .then((resp) => {
       let path = resp.path()
       localFile = path

test/test-android.js

@@ -17,7 +17,7 @@ const { Assert, Comparer, Info, prop } = RNTest
 const describe = RNTest.config({
   group : 'Android only functions',
   run : Platform.OS === 'android',
-  expand : false,
+  expand : true,
 })
 const { TEST_SERVER_URL, FILENAME, DROPBOX_TOKEN, styles } = prop()
 
@@ -26,24 +26,24 @@ let prefix = ((Platform.OS === 'android') ? 'file://' : '')
 // Android only tests
 
 let tmpFilePath = null
+const dirs = RNFetchBlob.fs.dirs
 
 describe('Download with notification', (report, done) => {
   let filePath = null
   let filename = `test-${Date.now()}.png`
-  RNFetchBlob.fs.getSystemDirs().then((dirs) => {
-    filePath = `${dirs.DownloadDir}/${filename}`
-    return RNFetchBlob.config({
-        path : filePath,
-        addAndroidDownloads : {
-          title : 'RNFetchBlob test download success',
-          description : `File description added by RNFetchblob`,
-          mediaScannable : true,
-          mime : "image/png",
-          notification : true
-        }
-      })
-      .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+
+  filePath = `${dirs.DownloadDir}/${filename}`
+  RNFetchBlob.config({
+    path : filePath,
+    addAndroidDownloads : {
+      title : 'RNFetchBlob test download success',
+      description : `File description added by RNFetchblob`,
+      mediaScannable : true,
+      mime : "image/png",
+      notification : true
+    }
   })
+  .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
   .then((resp) => {
     tmpFilePath = resp.path()
     report(<Info key={`image from ${tmpFilePath}`}>
@@ -57,30 +57,30 @@ describe('Download with notification', (report, done) => {
 })
 
 describe('MediaScanner tests ', (report, done) => {
-  let filePath = null
   let filename = `scannable-test-${Date.now()}.png`
-  let dirs = null
-  RNFetchBlob.fs.getSystemDirs().then((resp) => {
-    dirs = resp
-    filePath = `${dirs.DownloadDir}/${filename}`
-    return RNFetchBlob.config({
-        path : filePath,
-      })
-      .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+  let filePath = `${dirs.DownloadDir}/${filename}`
+  RNFetchBlob.config({
+    path : filePath,
   })
+  .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
   .then((resp) => {
     tmpFilePath = resp.path()
     return RNFetchBlob.fs.scanFile([
       { path:resp.path() }
     ])
-    .then(() => {
-      report(<Assert key="scan success" expect={true} actual={true}/>)
-      return RNFetchBlob
-              .config({
-                path : dirs.DCIMDir + '/beethoven-'+ Date.now() +'.mp3'
-              })
-              .fetch('GET', `${TEST_SERVER_URL}/public/beethoven.mp3`)
-    })
+  })
+  .then(() => {
+    report(<Assert key="scan success" expect={true} actual={true}/>)
+    console.log(dirs)
+    for(let i in dirs) {
+      console.log(i)
+    }
+    console.log(dirs.DCIMDir)
+    return RNFetchBlob
+            .config({
+              path : dirs.DCIMDir + '/beethoven-'+ Date.now() +'.mp3'
+            })
+            .fetch('GET', `${TEST_SERVER_URL}/public/beethoven.mp3`)
   })
   .then((resp) => {
     fs.scanFile([{

test/test-fs.js

@@ -19,26 +19,21 @@ const describe = RNTest.config({
 })
 
 let { TEST_SERVER_URL, FILENAME, DROPBOX_TOKEN, styles, image } = prop()
-let dirs = null
+let dirs = RNFetchBlob.fs.dirs
 
 describe('Get storage folders', (report, done) => {
-  fs.getSystemDirs().then((resp) => {
-    dirs = resp
-    console.log(dirs)
-    report(
-      <Assert key="system folders should exists" expect={resp} comparer={Comparer.exists} />,
-      <Assert key="check properties"
-        expect={['DocumentDir', 'CacheDir']}
-        comparer={Comparer.hasProperties}
-        actual={dirs}
-      />,
-      <Info key="System Folders">
-        <Text>{`${JSON.stringify(dirs)}`}</Text>
-      </Info>
-    )
-    done()
-  })
-
+  report(
+    <Assert key="system folders should exists" expect={resp} comparer={Comparer.exists} />,
+    <Assert key="check properties"
+      expect={['DocumentDir', 'CacheDir']}
+      comparer={Comparer.hasProperties}
+      actual={dirs}
+    />,
+    <Info key="System Folders">
+      <Text>{`${JSON.stringify(dirs)}`}</Text>
+    </Info>
+  )
+  done()
 })
 
 describe('ls API test', (report, done) => {
@@ -286,13 +281,10 @@ describe('cp API test', {timeout : 10000},(report, done) => {
 })
 
 describe('ASCII data test', (report, done) => {
-  let p = null
+  let p = dirs.DocumentDir + '/ASCII-test-' + Date.now()
   let expect = 'fetch-blob-'+Date.now()
-  fs.getSystemDirs()
-    .then((dirs) => {
-      p = dirs.DocumentDir + '/ASCII-test-' + Date.now()
-      return fs.createFile(p, 'utf8')
-    })
+
+  fs.createFile(p, 'utf8')
     .then(() => {
       return fs.writeStream(p, 'ascii', false)
     })
@@ -326,66 +318,56 @@ describe('ASCII data test', (report, done) => {
 })
 
 describe('ASCII file test', (report, done) => {
-  let p = ''
+  let p = dirs.DocumentDir + '/'
   let filename = ''
   let expect = []
   let base64 = RNFetchBlob.base64
-  fs.getSystemDirs().then((dirs) => {
-    p = dirs.DocumentDir + '/'
-    filename = 'ASCII-file-test' + Date.now() + '.txt'
-    expect = 'ascii test ' + Date.now()
-    return fs.createFile(p + filename, getASCIIArray(expect), 'ascii')
-  })
-  .then(() => {
-    fs.readStream(p + filename, 'base64').then((rs) => {
-      let actual = ''
-      rs.open()
-      rs.onData((chunk) => {
-        actual += chunk
-      })
-      rs.onEnd(() => {
-        report(<Assert key="written data verify"
-          expect={expect}
-          actual={base64.decode(actual)}/>)
-        done()
+  filename = 'ASCII-file-test' + Date.now() + '.txt'
+  expect = 'ascii test ' + Date.now()
+  fs.createFile(p + filename, getASCIIArray(expect), 'ascii')
+    .then(() => {
+      fs.readStream(p + filename, 'base64').then((rs) => {
+        let actual = ''
+        rs.open()
+        rs.onData((chunk) => {
+          actual += chunk
+        })
+        rs.onEnd(() => {
+          report(<Assert key="written data verify"
+            expect={expect}
+            actual={base64.decode(actual)}/>)
+          done()
+        })
       })
     })
-  })
 })
 
 describe('format conversion', (report, done) => {
-  let p = ''
-  fs.getSystemDirs().then((dirs) => {
-    p = dirs.DocumentDir + '/foo-' + Date.now()
-    return fs.createFile(p, [102, 111, 111], 'ascii')
-  })
-  .then(() => {
-    fs.readStream(p, 'utf8').then((stream) => {
-      let res = []
-      stream.open()
-      stream.onData((chunk) => {
-        res+=chunk
-      })
-      stream.onEnd(() => {
-        report(
-          <Assert key="write utf8 and read by ascii"
-            expect="foo"
-            actual={res}/>)
-            done()
+  let p = dirs.DocumentDir + '/foo-' + Date.now()
+  fs.createFile(p, [102, 111, 111], 'ascii')
+    .then(() => {
+      fs.readStream(p, 'utf8').then((stream) => {
+        let res = []
+        stream.open()
+        stream.onData((chunk) => {
+          res+=chunk
+        })
+        stream.onEnd(() => {
+          report(
+            <Assert key="write utf8 and read by ascii"
+              expect="foo"
+              actual={res}/>)
+              done()
+        })
       })
     })
-  })
 })
 
 describe('stat and lstat test', (report, done) => {
-  let p = ''
-  let dirs = null
+  let p = dirs.DocumentDir + '/' + 'ls-stat-test' + Date.now()
   let file = null
-  fs.getSystemDirs().then((resp) => {
-    dirs = resp
-    p = dirs.DocumentDir + '/' + 'ls-stat-test' + Date.now()
-    return fs.lstat(dirs.DocumentDir)
-  })
+
+  fs.lstat(dirs.DocumentDir)
   // stat a folder
   .then((stat) => {
     report(

test/test-init.js

@@ -51,7 +51,8 @@ describe('GET image from server', (report, done) => {
     })
 })
 
-require('./test-fs')
-require('./test-0.1.x-0.4.x')
-require('./test-0.5.x')
+
+// require('./test-fs')
+// require('./test-0.1.x-0.4.x')
+// require('./test-0.5.x')
 require('./test-android')