Add config API to testkit

test/react-native-testkit/components/reporter.js

@@ -6,7 +6,10 @@ import {
   View,
   Platform,
   ScrollView,
+  ListView,
   Image,
+  TouchableOpacity,
+  RecyclerViewBackedScrollView,
 } from 'react-native';
 
 import Assert from './assert.js'
@@ -14,55 +17,107 @@ import RNTEST from '../index.js'
 
 export default class Reporter extends Component {
 
+  constructor(props:any) {
+    super(props)
+    this.tests = {
+      common : []
+    }
+    this.testGroups = ['common']
+    this.ds = null
+    this.updateDataSource()
+
+  }
+
+  componentWillUpdate(nextProps, nextState) {
+    this.updateDataSource()
+  }
+
   render() {
+
     return (
-      <ScrollView key="rn-test-scroller" style={styles.container}>
-        {this.renderTests()}
-      </ScrollView>)
+      <ListView
+        style={styles.container}
+        dataSource={this.ds}
+        renderRow={this.renderTest.bind(this)}
+        renderScrollComponent={props => <RecyclerViewBackedScrollView {...props} />}
+        renderSectionHeader={(data, id) => {
+          return (
+            <View style={styles.sectionHeader}>
+              <Text style={styles.sectionText}>{id}</Text>
+            </View>
+          )
+        }}
+      />)
   }
 
-  renderTests() {
+  renderTest(t) {
+    let pass = true
+    let foundActions = false
     let tests = RNTEST.TestContext.getTests()
-    return tests.map((t, i) => {
 
-      let pass = true
-      let foundActions = false
+    if(Array.isArray(t.result) && !t.expired) {
+      t.result = t.result.map((r) => {
+        if(r.type.name === 'Assert' || r.type.name === 'Info') {
+          foundActions = true
+          let comp = r.props.comparer ? r.props.comparer(r.props.expect, r.props.actual) : (r.props.actual === r.props.expect)
+          pass = pass && comp
+        }
+        return React.cloneElement(r, {desc : r.key})
+      })
+    }
+    if(tests[t.sn].running)
+      t.status = 'running'
+    else if(tests[t.sn].executed) {
+      t.status = foundActions ? (pass ? 'pass' : 'fail') : 'skipped'
+      t.status = t.expired ? 'timeout' : t.status
+    }
+    else
+      t.status = 'waiting'
 
-      if(Array.isArray(t.result) && !t.expired) {
-        t.result = t.result.map((r) => {
-          if(r.type.name === 'Assert' || r.type.name === 'Info') {
-            foundActions = true
-            let comp = r.props.comparer ? r.props.comparer(r.props.expect, r.props.actual) : (r.props.actual === r.props.expect)
-            pass = pass && comp
-          }
-          return React.cloneElement(r, {desc : r.key})
-        })
-      }
-      if(tests[i].running)
-        t.status = 'running'
-      else if(tests[i].executed) {
-        t.status = foundActions ? (pass ? 'pass' : 'fail') : 'skipped'
-        t.status = t.expired ? 'timeout' : t.status
+    return (
+      <TouchableOpacity onPress={()=>{
+          t.start(t.sn)
+        }}>
+        <View key={'rn-test-' + t.desc} style={{
+          borderBottomWidth : 1.5,
+          borderColor : '#DDD',
+        }}>
+          <View key={t.desc} style={{
+            alignItems : 'center',
+            flexDirection : 'row'
+          }}>
+            <Text style={[styles.badge, {flex : 1, borderWidth : 0, textAlign : 'left'}]}>{t.desc}</Text>
+            <Text style={[styles.badge, this.getBadge(t.status)]}>{t.status}</Text>
+          </View>
+          <View key={t.desc + '-result'} style={{backgroundColor : '#F4F4F4'}}>
+            {t.expand ? t.result : (t.status === 'pass' ? null : t.result)}
+          </View>
+        </View>
+      </TouchableOpacity>)
+  }
+
+  updateDataSource() {
+    this.tests = {
+      common : []
+    }
+    this.testGroups = ['common']
+    RNTEST.TestContext.getTests().forEach((t) => {
+      if(t.group) {
+        if(!this.tests[t.group]) {
+          this.testGroups.push(t.group)
+          this.tests[t.group] = []
+        }
+        this.tests[t.group].push(t)
       }
       else
-        t.status = 'waiting'
+        this.tests.common.push(t)
+    })
 
-      return (<View key={'rn-test-' + t.desc} style={{
-        borderBottomWidth : 1.5,
-        borderColor : '#DDD',
-      }}>
-        <View key={t.desc} style={{
-          alignItems : 'center',
-          flexDirection : 'row'
-        }}>
-          <Text style={[styles.badge, {flex : 1, borderWidth : 0, textAlign : 'left'}]}>{t.desc}</Text>
-          <Text style={[styles.badge, this.getBadge(t.status)]}>{t.status}</Text>
-        </View>
-        <View key={t.desc + '-result'} style={{backgroundColor : '#F4F4F4'}}>
-          {t.result}
-        </View>
-      </View>)
+    let listDataSource = new ListView.DataSource({
+      rowHasChanged : (r1, r2) => r1 !== r2,
+      sectionHeaderHasChanged: (s1, s2) => s1 !== s2
     })
+    this.ds = listDataSource.cloneWithRowsAndSections(this.tests, this.testGroups)
   }
 
   getBadge(status: 'waiting' | 'running' | 'pass' | 'fail' | 'timeout') {
@@ -74,7 +129,6 @@ export default class Reporter extends Component {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    marginTop : 40,
   },
   badge : {
     margin : 16,
@@ -87,6 +141,10 @@ const styles = StyleSheet.create({
     borderColor : '#AAAAAA',
     color : '#AAAAAA'
   },
+  sectionHeader : {
+    padding : 16,
+    backgroundColor : '#F4F4F4',
+  },
   waiting: {
     borderColor : '#AAAAAA',
     color : '#AAAAAA'

test/react-native-testkit/index.js

@@ -4,13 +4,14 @@ import Reporter from './components/reporter'
 import Assert from './components/assert'
 import Info from './components/info'
 
-const { describe, run, prop } = TestContext
+const { describe, run, prop, config } = TestContext
 
 export default {
   TestContext,
   Reporter,
   Info,
   Assert,
+  config,
   Comparer,
   describe,
   run,

test/react-native-testkit/lib/comparer.js

@@ -5,6 +5,13 @@ export default {
   typeof : (a, b) => typeof a === b,
   IsNull : (a, b) => a === null,
   exists : (a, b) => a,
+  equalToArray : (a, b) => {
+    if(!Array.isArray(a) && Array.isArray(b))
+      return false
+    return (a.length == b.length) && a.every(function(element, index) {
+      return element === b[index];
+    });
+  },
   hasValue : (a, b) => (a !== void 0) && (Array.isArray(a) ? a.length !==0 : true),
   isArray : (a, b) => Array.isArray(a),
   hasProperties : (a, b) => {

test/react-native-testkit/lib/test-context.js

@@ -11,6 +11,10 @@ export default class TestContext {
     timeout = val
   }
 
+  static config(config) {
+    return TestContext.describe.bind(config)
+  }
+
   /**
    * Calling this method will push a test case into task queue.
    * @param  {String}   desc Description of test case.
@@ -19,17 +23,31 @@ export default class TestContext {
    * @return {void}
    */
   static describe (desc:string, fn:Promise<any>) {
+    let { group, timeout, expand, run } = this || {}
 
-    tests.push({
+    let ctx = {
+      group : group || 'common',
       status : 'waiting',
+      run : run === false ? false : true,
       result : null,
       asserts : [],
-      timeout : 3000,
+      timeout : timeout || 3000,
       expired : false,
       running : false,
       executed : false,
-      desc, fn,
-    })
+      expand : expand || false,
+      desc,
+      fn,
+      sn : tests.length,
+      start : (i) => {
+        TestContext.startTest.bind(
+          tests[i],
+          TestContext.update.bind(TestContext, i),
+          TestContext.updateInternal.bind(TestContext, i)
+        )()
+      }
+    }
+    tests.push(ctx)
 
   }
 
@@ -52,55 +70,63 @@ export default class TestContext {
     let promise = Promise.resolve()
     // run test case sequently
     for(let i in tests) {
-      promise = promise.then(function(update, updateInternal, data) {
-        return new Promise((resolve, reject) => {
-
-          let expired = false
-          updateInternal({
-            running : true,
-          })
-
-          // set timeout timer
-          let tm = setTimeout(() => {
-            updateInternal({
-              expired : true,
-              executed : true,
-              running : false
-            })
-            resolve('ETIMEOUT')
-          }, this.timeout)
-
-          // run test body
-          new Promise((done) => {
-            this.fn.bind(this)(update, done)
-          })
-          .then((...res) => {
-            if(!expired) {
-              clearTimeout(tm)
-              updateInternal({
-                executed : true,
-                running : false
-              })
-              resolve(...res)
-            }
-          }).catch((err) => {
-            updateInternal({
-              executed : true,
-              running : false
-            })
-          })
-
-        })
+      if(tests[i].run === false) {
+        tests[i].status = 'skipped'
+        tests[i].executed = true
+        promise = Promise.resolve()
+        continue
       }
-      .bind(
-        tests[i],
-        TestContext.update.bind(TestContext, i),
-        TestContext.updateInternal.bind(TestContext, i)
+      promise = promise.then(
+        TestContext.startTest.bind(
+          tests[i],
+          TestContext.update.bind(TestContext, i),
+          TestContext.updateInternal.bind(TestContext, i)
       ))
     }
     return promise
   }
 
+  static startTest(update, updateInternal, data) {
+    return new Promise((resolve, reject) => {
+
+      let expired = false
+      updateInternal({
+        running : true,
+      })
+
+      // set timeout timer
+      let tm = setTimeout(() => {
+        updateInternal({
+          expired : true,
+          executed : true,
+          running : false
+        })
+        resolve('ETIMEOUT')
+      }, this.timeout)
+
+      // run test body
+      new Promise((done) => {
+        this.fn.bind(this)(update, done)
+      })
+      .then((...res) => {
+        if(!expired) {
+          clearTimeout(tm)
+          updateInternal({
+            executed : true,
+            running : false
+          })
+          resolve(...res)
+        }
+      }).catch((err) => {
+        updateInternal({
+          executed : true,
+          running : false
+        })
+      })
+
+    })
+  }
+
   /**
    * Update test task result of given index.
    * @param  {number} i       Index of test case to be updated.

test/test-0.1.x-0.4.x.js

@@ -10,7 +10,12 @@ import {
   Dimensions,
   Image,
 } from 'react-native';
-const { Assert, Comparer, Info, describe, prop } = RNTest
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : '0.1.x - 0.4.x',
+  expand : false,
+  run : false
+})
 
 let { TEST_SERVER_URL, FILENAME, DROPBOX_TOKEN, styles, image } = prop()
 

test/test-0.5.x.js

@@ -12,7 +12,11 @@ import {
   Image,
 } from 'react-native';
 
-const { Assert, Comparer, Info, describe, prop } = RNTest
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : '0.5.x',
+  expand : false,
+})
 const { TEST_SERVER_URL, FILENAME, DROPBOX_TOKEN, styles } = prop()
 
 let prefix = ((Platform.OS === 'android') ? 'file://' : '')
@@ -60,7 +64,7 @@ describe('Download file to storage with custom file extension', (report, done) =
 
 describe('Read cached file via file stream', (report, done) => {
   let data = 'data:image/png;base64, '
-  let stream = RNFetchBlob.openReadStream(tmpFilePath, 'base64')
+  let stream = RNFetchBlob.readStream(tmpFilePath, 'base64')
   stream.onData((chunk) => {
     data += chunk
   })
@@ -81,7 +85,7 @@ describe('Read cached file via file stream', (report, done) => {
 })
 
 describe('File stream reader error should be able to handled', (report, done) => {
-  let stream = RNFetchBlob.openReadStream('^_^ not exists', 'base64')
+  let stream = RNFetchBlob.readStream('^_^ not exists', 'base64')
   stream.onError((err) => {
     report(<Info key="error message">
       <Text>
@@ -94,11 +98,13 @@ describe('File stream reader error should be able to handled', (report, done) =>
 })
 
 let localFile = null
+let sysDirs = null
 
 describe('Upload from file storage', (report, done) => {
   let filename = ''
   let filepath = ''
   RNFetchBlob.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 })
@@ -148,5 +154,98 @@ describe('Upload multipart data with file from storage', (report, done) => {
       </Info>)
       done()
     })
+})
+
+describe('Session create mechanism test', (report, done) => {
+  let sessionName = 'foo-' + Date.now()
+  testSessionName = sessionName
+  let p1 = RNFetchBlob.config({
+      session : sessionName,
+      fileCache : true
+    })
+    .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+  let p2 = RNFetchBlob.config({
+      fileCache : true
+    })
+    .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+  let p3 = RNFetchBlob.config({
+      path : sysDirs.DocumentDir + '/session-test.png'
+    })
+    .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+
+  let promises = [p1, p2, p3]
+  Promise.all(promises).then((resp) => {
+    let session = RNFetchBlob.session(sessionName).add(resp[1].path())
+    resp[2].session(sessionName)
+    let actual = session.list()
+    let expect = resp.map((p) => {
+      return p.path()
+    })
+    report(
+      <Assert key="check if session state correct"
+        expect={expect}
+        comparer={Comparer.equalToArray}
+        actual={actual} />)
+    done()
+  })
+
+})
+
+describe('Session API CRUD test', (report, done) => {
+
+  let sessionName = 'test-session-' + Date.now()
+  let baseDir = sysDirs.DocumentDir + '/' + sessionName
+  RNFetchBlob.mkdir(sysDirs.DocumentDir + '/' + sessionName).then(() => {
+    let promises = [0,1,2,3,4,5,6,7,8,9].map((p) => {
+      return RNFetchBlob.config({
+          session : sessionName,
+          path : baseDir + '/testfile' + p
+        })
+        .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+    })
+    return Promise.all(promises)
+  })
+  .then((resps) => {
+    let s = RNFetchBlob.session(sessionName)
+    report(
+      <Assert
+        key="list() length validation"
+        expect={10}
+        actual={s.list().length}/>)
+    let modified = [
+      s.list()[2],
+      s.list()[3],
+      s.list()[4],
+      s.list()[5],
+      s.list()[6],
+      s.list()[7],
+      s.list()[8],
+      s.list()[9],
+    ]
+    let expect = [s.list()[0], s.list()[1]]
+    s.remove(s.list()[0])
+    s.remove(s.list()[0])
+    report(
+      <Assert
+        key="remove() should work correctly"
+        expect={modified}
+        comparer={Comparer.equalToArray}
+        actual={s.list()}/>)
+
+    s.dispose().then(() => {
+      RNFetchBlob.ls(baseDir).then((lsRes) => {
+        report(
+          <Assert
+            key="dispose() should work correctly"
+            expect={expect}
+            comparer={Comparer.equalToArray}
+            actual={lsRes.map((p) => {
+              return baseDir + '/' + p
+            })}/>)
+      })
+      done()
+    })
+
+  })
 
 })

test/test-init.js

@@ -18,7 +18,7 @@ const { Assert, Comparer, Info, describe, prop } = RNTest
 // test environment variables
 
 prop('FILENAME', `${Platform.OS}-0.5.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://192.168.17.193:8123')
+prop('TEST_SERVER_URL', 'http://192.168.0.14:8123')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
@@ -51,5 +51,5 @@ describe('GET image from server', (report, done) => {
     })
 })
 
-// require('./test-0.1.x-0.4.x')
+require('./test-0.1.x-0.4.x')
 require('./test-0.5.x')