Change testkit API and function

Author: wkh237

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

@@ -25,23 +25,30 @@ export default class Reporter extends Component {
   }
 
   renderTests() {
-    return this.props.context.tests.map((t, i) => {
+    let tests = this.props.context.tests
+    return tests.map((t, i) => {
 
       let pass = true
-      let foundAssertions = false
+      let foundActions = false
 
-      if(Array.isArray(t.result)) {
+      if(Array.isArray(t.result) && !t.expired) {
         t.result = t.result.map((r) => {
-          if(r.type.name === 'Assert') {
-            foundAssertions = true
+          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})
         })
       }
-
-      t.status = foundAssertions ? (pass ? 'pass' : 'fail') : 'pass'
+      if(tests[i].running)
+        t.status = 'running'
+      else if(this.props.context.tests[i].executed) {
+        t.status = foundActions ? (pass ? 'pass' : 'fail') : 'skipped'
+        t.status = t.expired ? 'timeout' : t.status
+      }
+      else
+        t.status = 'waiting'
 
       return (<View key={'rn-test-' + t.desc} style={{
         borderBottomWidth : 1.5,
@@ -52,7 +59,7 @@ export default class Reporter extends Component {
           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 ? 'pass' : 'fail'}</Text>
+          <Text style={[styles.badge, this.getBadge(t.status)]}>{t.status}</Text>
         </View>
         <View key={t.desc + '-result'} style={{backgroundColor : '#F4F4F4'}}>
           {t.result}
@@ -61,13 +68,8 @@ export default class Reporter extends Component {
     })
   }
 
-  getBadge(status: 'running' | 'pass' | 'fail') {
-    if(status === 'running')
-      return styles.badgeWaiting
-    else if(status === 'pass')
-      return styles.badgePass
-    else
-      return styles.badgeFail
+  getBadge(status: 'waiting' | 'running' | 'pass' | 'fail' | 'timeout') {
+    return styles[status]
   }
 
 }
@@ -84,15 +86,27 @@ const styles = StyleSheet.create({
     borderWidth : 2,
     textAlign : 'center'
   },
-  badgePass: {
+  skipped: {
+    borderColor : '#AAAAAA',
+    color : '#AAAAAA'
+  },
+  waiting: {
+    borderColor : '#AAAAAA',
+    color : '#AAAAAA'
+  },
+  pass: {
     borderColor : '#00a825',
     color : '#00a825'
   },
-  badgeWaiting: {
+  running: {
     borderColor : '#e3c423',
     color : '#e3c423'
   },
-  badgeFail: {
+  fail: {
+    borderColor : '#ff0d0d',
+    color : '#ff0d0d'
+  },
+  timeout: {
     borderColor : '#ff0d0d',
     color : '#ff0d0d'
   }

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

@@ -1,37 +1,119 @@
+//@flow
 export default class TestContext {
 
+  test: Array<TestCase>;
+  context: ReactElement;
+
+  static timeout = 3000;
+
+  static setTimeout (val) {
+    this.timeout  = val
+  }
+
   constructor() {
     this.tests = []
     this.context = null
   }
 
-  describe (desc, fn) {
+  /**
+   * Calling this method will push a test case into task queue.
+   * @param  {String}   desc Description of test case.
+   * @param  {Function:Promise<any>} fn   Body of test case, this function
+   *         should return a promise.
+   * @return {void}
+   */
+  describe (desc:string, fn:() => Promise<any>) {
 
     this.tests.push({
-      status : 'running',
+      status : 'waiting',
       result : null,
       asserts : [],
+      timeout : 3000,
+      expired : false,
+      running : false,
+      executed : false,
       desc, fn,
     })
 
   }
 
-  run (context) {
+  /**
+   * Run test cases in sequence.
+   * @param  {ReactElement} context ReactElement instance context.
+   * @return {void}
+   */
+  run (context:ReactElement) {
     this.context = context
     let promise = Promise.resolve()
+    // run test case sequently
     for(let i in this.tests) {
-      promise = promise.then(function(update, data) {
-        return this.fn(update, data)
-      }.bind(
+      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
+          this.fn.bind(this)(update, data).then((...res) => {
+            if(!expired) {
+              clearTimeout(tm)
+              updateInternal({
+                executed : true,
+                running : false
+              })
+              resolve(...res)
+            }
+          }).catch((err) => {
+            updateInternal({
+              executed : true,
+              running : false
+            })
+          })
+
+        })
+      }
+      .bind(
         this.tests[i],
-        this.update.bind(this, i)
+        this.update.bind(this, i),
+        this.updateInternal.bind(this, i)
       ))
     }
     return promise
   }
 
+  /**
+   * Update test task result of given index.
+   * @param  {number} i       Index of test case to be updated.
+   * @param  {ReactElement<Info | Assert>} ...data Assertion or Info of test.
+   * @return {void}
+   */
   update(i, ...data) {
-    Object.assign(this.tests[i], {result : [...data]})
+    let test = this.tests[i]
+    let result = test.result || []
+    Object.assign(test, {result : [...result, ...data]})
+    this.context.forceUpdate()
+  }
+
+  /**
+   * Update test result for testkit internal use
+   * @param  {[type]} i      Index of test case to be updated.
+   * @param  {TestCaseContext} result Test case object
+   * @return {void}
+   */
+  updateInternal(i, result) {
+    Object.assign(this.tests[i], result)
     this.context.forceUpdate()
   }