Change test-kit structure

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

@@ -10,13 +10,10 @@ import {
 } from 'react-native';
 
 import Assert from './assert.js'
+import RNTEST from '../index.js'
 
 export default class Reporter extends Component {
 
-  props : {
-    context : TestContext
-  };
-
   render() {
     return (
       <ScrollView key="rn-test-scroller" style={styles.container}>
@@ -25,7 +22,7 @@ export default class Reporter extends Component {
   }
 
   renderTests() {
-    let tests = this.props.context.tests
+    let tests = RNTEST.TestContext.getTests()
     return tests.map((t, i) => {
 
       let pass = true
@@ -43,7 +40,7 @@ export default class Reporter extends Component {
       }
       if(tests[i].running)
         t.status = 'running'
-      else if(this.props.context.tests[i].executed) {
+      else if(tests[i].executed) {
         t.status = foundActions ? (pass ? 'pass' : 'fail') : 'skipped'
         t.status = t.expired ? 'timeout' : t.status
       }

test/react-native-testkit/index.js

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

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

@@ -1,18 +1,14 @@
 //@flow
-export default class TestContext {
 
-  test: Array<TestCase>;
-  context: ReactElement;
+let tests: Array<TestCase> = []
+let RCTContext: ReactElement = null
+let props:any = {}
+let timeout = 3000
 
-  static timeout = 3000;
+export default class TestContext {
 
   static setTimeout (val) {
-    this.timeout  = val
-  }
-
-  constructor() {
-    this.tests = []
-    this.context = null
+    timeout = val
   }
 
   /**
@@ -22,9 +18,9 @@ export default class TestContext {
    *         should return a promise.
    * @return {void}
    */
-  describe (desc:string, fn:() => Promise<any>) {
+  static describe (desc:string, fn:Promise<any>) {
 
-    this.tests.push({
+    tests.push({
       status : 'waiting',
       result : null,
       asserts : [],
@@ -37,16 +33,25 @@ export default class TestContext {
 
   }
 
+  static prop (name:string, val:any):TestContext {
+    if(name === undefined && val === undefined)
+      return props
+    if(val === undefined)
+      return props[name]
+    props[name] = val
+    return TestContext
+  }
+
   /**
    * Run test cases in sequence.
    * @param  {ReactElement} context ReactElement instance context.
    * @return {void}
    */
-  run (context:ReactElement) {
-    this.context = context
+  static run (context:ReactElement) {
+    RCTContext = context
     let promise = Promise.resolve()
     // run test case sequently
-    for(let i in this.tests) {
+    for(let i in tests) {
       promise = promise.then(function(update, updateInternal, data) {
         return new Promise((resolve, reject) => {
 
@@ -88,9 +93,9 @@ export default class TestContext {
         })
       }
       .bind(
-        this.tests[i],
-        this.update.bind(this, i),
-        this.updateInternal.bind(this, i)
+        tests[i],
+        TestContext.update.bind(TestContext, i),
+        TestContext.updateInternal.bind(TestContext, i)
       ))
     }
     return promise
@@ -102,11 +107,15 @@ export default class TestContext {
    * @param  {ReactElement<Info | Assert>} ...data Assertion or Info of test.
    * @return {void}
    */
-  update(i, ...data) {
-    let test = this.tests[i]
+  static update(i, ...data) {
+    let test = tests[i]
     let result = test.result || []
     Object.assign(test, {result : [...result, ...data]})
-    this.context.forceUpdate()
+    RCTContext.forceUpdate()
+  }
+
+  static getTests() {
+    return tests
   }
 
   /**
@@ -115,9 +124,9 @@ export default class TestContext {
    * @param  {TestCaseContext} result Test case object
    * @return {void}
    */
-  updateInternal(i, result) {
-    Object.assign(this.tests[i], result)
-    this.context.forceUpdate()
+  static updateInternal(i, result) {
+    Object.assign(tests[i], result)
+    RCTContext.forceUpdate()
   }
 
 }

test/tests.js

@@ -52,8 +52,6 @@ ctx.describe('GET image from server', (report, done) => {
 
 })
 
-// FIXME : discard these test cases in feature branch
-//
 // ctx.describe('The check if it follows 301/302 redirection', (report, done) => {
 //
 //   RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/redirect`)
@@ -109,7 +107,7 @@ ctx.describe('GET image from server', (report, done) => {
 //
 //
 // })
-
+//
 // ctx.describe('Compare uploaded multipart image', (report, done) => {
 //   let r1 = null
 //   RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/test-img.png`)
@@ -129,37 +127,37 @@ ctx.describe('GET image from server', (report, done) => {
 
 // added after 0.4.2
 
-ctx.describe('Progress report test', (report, done) => {
-  let received = 0
-  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/1mb-dummy`, {
-      Authorization : 'Bearer abde123eqweje'
-    })
-    .progress((written, total) => {
-      report(<Info key={`progress = ${written} bytes / ${total} bytes`}/>)
-      if(written === total)
-        report(<Assert key="progress goes to 100%" expect={written} actual={total}/>)
-    })
-    .then((resp) => {
-      report(<Assert key="response data should be correct event with progress listener"
-        expect={resp.text().substr(0,10)} actual={"1234567890"}/>)
-      done()
-    })
-
-})
-
-// FIXME : not yet supported
-// ctx.describe('Large file download test', (report, done) => {
+// ctx.describe('Progress report test', (report, done) => {
 //   let received = 0
-//   // RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`, {
-//   //   Authorization : 'Bearer abde123eqweje'
-//   // })
-//   // .then((resp) => {
-//     report(<Assert key="not supported" expect={true} actual={false}/>)
-//     done()
-//   // })
+//   RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/1mb-dummy`, {
+//       Authorization : 'Bearer abde123eqweje'
+//     })
+//     .progress((written, total) => {
+//       report(<Info key={`progress = ${written} bytes / ${total} bytes`}/>)
+//       if(written === total)
+//         report(<Assert key="progress goes to 100%" expect={written} actual={total}/>)
+//     })
+//     .then((resp) => {
+//       report(<Assert key="response data should be correct event with progress listener"
+//         expect={resp.text().substr(0,10)} actual={"1234567890"}/>)
+//       done()
+//     })
 //
 // })
 
+// FIXME : not yet supported
+ctx.describe('Large file download test', (report, done) => {
+  let received = 0
+  // RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`, {
+  //   Authorization : 'Bearer abde123eqweje'
+  // })
+  // .then((resp) => {
+    report(<Assert key="not supported" expect={true} actual={false}/>)
+    done()
+  // })
+
+})
+
 // added after 0.5.0
 
 ctx.describe('Get storage folders', (report, done) => {
@@ -199,7 +197,7 @@ ctx.describe('Download file to storage with custom file extension', (report, don
     })
 })
 
-ctx.describe('Read cache file with file stream', (report, done) => {
+ctx.describe('Read cached file via file stream', (report, done) => {
   let data = 'data:image/png;base64, '
   let stream = RNFetchBlob.openReadStream(tmpFilePath, 'base64')
   stream.onData((chunk) => {
@@ -219,4 +217,19 @@ ctx.describe('Read cache file with file stream', (report, done) => {
 
 })
 
+ctx.describe('File stream reader error should be able to handled', (report, done) => {
+
+  let stream = RNFetchBlob.openReadStream('^_^ not exists', 'base64')
+  stream.onError((err) => {
+    report(<Info key="error message">
+      <Text>
+        {err}
+      </Text>
+    </Info>)
+    done()
+
+  })
+
+})
+
 export default ctx