Change testkit reporter

wkh237 · wkh237 · commit 1aff85267bf7 · 2016-07-09T15:34:13.000+08:00
diff --git a/test/react-native-testkit/components/reporter.js b/test/react-native-testkit/components/reporter.js
@@ -9,6 +9,7 @@ import {
   ListView,
   Image,
   TouchableOpacity,
+  Dimensions,
   RecyclerViewBackedScrollView,
 } from 'react-native';
 
@@ -20,9 +21,11 @@ export default class Reporter extends Component {
   constructor(props:any) {
     super(props)
     this.tests = {
-      summary : [{}],
       common : []
     }
+    this.state = {
+      listHeight : 0
+    }
     this.testGroups = ['summary','common']
     this.ds = null
     this.updateDataSource()
@@ -35,20 +38,49 @@ export default class Reporter extends Component {
 
   render() {
 
+    let tests = RNTEST.TestContext.getTests()
+
+    let passed = 0
+    let executed = 0
+    let count = 0
+    for(let i in tests) {
+      if(tests[i].status !== 'skipped')
+        count++
+      if(tests[i].status !== 'waiting' && tests[i].status !== 'skipped')
+        executed++
+        passed += tests[i].status === 'pass' ? 1 : 0
+    }
+    let percent = passed / count
+    let color = `rgb(${Math.floor((1-percent) *255)},${Math.floor(percent *255)}, 0)`
+
     return (
-      <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>
-          )
-        }}
-      />)
+      <View style={{flex : 1}}>
+        <View style={{margin : 20}} onLayout={(e) => {
+          this.setState({
+            headerHeight : e.nativeEvent.layout.height,
+            listHeight : Dimensions.get('window').height - e.nativeEvent.layout.height
+          })
+        }}>
+          <Text>{`${executed} tests executed`}</Text>
+          <Text>{`${passed} test cases passed`}</Text>
+          <Text>{`${count} test cases`}</Text>
+          <Text style={{color, fontSize : 120, textAlign : 'center'}} >{`${Math.floor(percent*100)}`}</Text>
+          <Text style={{color, fontSize : 30, textAlign :'right', marginTop : -54, marginRight : 40, backgroundColor : 'transparent'}} >{`%`}</Text>
+        </View>
+        <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>
+            )
+          }}
+        />
+      </View>)
   }
 
   renderTest(t, group) {
@@ -57,23 +89,6 @@ export default class Reporter extends Component {
     let foundActions = false
     let tests = RNTEST.TestContext.getTests()
 
-    if(group === 'summary')
-    {
-      let passed = 0
-      let executed = 0
-      let count = 0
-      for(let i in tests) {
-        count++
-        if(tests[i].executed)
-          passed += tests[i].status === 'pass' ? 1 : 0
-      }
-      return (<View style={{flex : 1}}>
-        <Text>{`${count} test cases`}</Text>
-        <Text>{`${executed} tests executed`}</Text>
-        <Text>{`${ParseFloat(pass/count).toFixed(2)}% tests passed`}</Text>
-      </View>)
-    }
-
     if(Array.isArray(t.result) && !t.expired) {
       t.result = t.result.map((r) => {
         if(r.type.name === 'Assert' || r.type.name === 'Info') {
@@ -94,9 +109,9 @@ export default class Reporter extends Component {
       t.status = 'waiting'
 
     return (
-      <TouchableOpacity onPress={()=>{
-          t.start(t.sn)
-        }}>
+      // <TouchableOpacity onPress={()=>{
+      //   t.start(t.sn)
+      // }}>
         <View key={'rn-test-' + t.desc} style={{
           borderBottomWidth : 1.5,
           borderColor : '#DDD',
@@ -111,8 +126,8 @@ export default class Reporter extends Component {
           <View key={t.desc + '-result'} style={{backgroundColor : '#F4F4F4'}}>
             {t.expand ? t.result : (t.status === 'pass' ? null : t.result)}
           </View>
-        </View>
-      </TouchableOpacity>)
+        </View>)
+        {/*</TouchableOpacity>)*/}
   }
 
   updateDataSource() {
diff --git a/test/react-native-testkit/lib/test-context.js b/test/react-native-testkit/lib/test-context.js
@@ -42,7 +42,7 @@ export default class TestContext {
       run : run === false ? false : true,
       result : null,
       asserts : [],
-      timeout : timeout || 3000,
+      timeout : timeout || 15000,
       expired : false,
       running : false,
       executed : false,
@@ -153,6 +153,7 @@ export default class TestContext {
         for(let j in result) {
           if(result[j].uid === data[i].props.uid)
           result[j] = data[i]
+          result.splice(j,1)
           break
         }
       }
diff --git a/test/test-0.5.1.js b/test/test-0.5.1.js
@@ -119,6 +119,7 @@ describe('Upload from file storage', (report, done) => {
 })
 
 describe('Upload multipart data with file from storage', (report, done) => {
+  try{
     let filename = 'test-from-storage-img-'+Date.now()+'.png'
     RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
         'Content-Type' : 'multipart/form-data',
@@ -144,6 +145,9 @@ describe('Upload multipart data with file from storage', (report, done) => {
       </Info>)
       done()
     })
+  } catch(err) {
+    console.log(err)
+  }
 })
 
 describe('Upload and download at the same time', (report, done) => {
@@ -179,30 +183,51 @@ describe('Upload and download at the same time', (report, done) => {
         done()
       })
     })
-
 })
 
 RNTest.config({
   group : '0.5.1',
   run : true,
   expand : false,
-  timeout : 30000,
+  timeout : 600000,
 })('Upload and download large file', (report, done) => {
   let filename = '22mb-dummy-' + Date.now()
+  let begin = -1
+  let begin2 = -1
   RNFetchBlob.config({
     fileCache : true
   })
   .fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`)
+  // .progress((now, total) => {
+  //   if(begin === -1)
+  //     begin = Date.now()
+  //   report(<Info uid="200" key="progress">
+  //     <Text>
+  //       {`download ${now} / ${total} bytes (${Math.floor(now / (Date.now() - begin))} kb/s)`}
+  //     </Text>
+  //   </Info>)
+  // })
   .then((res) => {
     return RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
       Authorization : `Bearer ${DROPBOX_TOKEN}`,
       'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+filename+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
       'Content-Type' : 'application/octet-stream',
     }, RNFetchBlob.wrap(res.path()))
+    // .progress((now, total) => {
+    //   if(begin2 === -1)
+    //     begin2 = Date.now()
+    //   let speed = Math.floor(now / (Date.now() - begin2))
+    //   report(<Info uid="100"  key="progress">
+    //     <Text>
+    //       {`upload ${now} / ${total} bytes (${speed} kb/s)`}
+    //       {` ${Math.floor((total-now)/speed/1000)} seconds left`}
+    //     </Text>
+    //   </Info>)
+    // })
   })
   .then((res) => {
     report(<Assert
-      key="upload should success withou crashing app"
+      key="upload should success without crashing app"
       expect={filename}
       actual={res.json().name}/>)
     done()
@@ -302,5 +327,4 @@ describe('Session API CRUD test', (report, done) => {
       })
 
   })
-
 })
diff --git a/test/test-init.js b/test/test-init.js
@@ -50,7 +50,7 @@ describe('GET image from server', (report, done) => {
         done()
     })
 })
-//
+
 require('./test-0.1.x-0.4.x')
 require('./test-0.5.1')
 require('./test-0.5.2')
