From 0beb1cc55deff20061e5bccbb6a6f2561be79250 Mon Sep 17 00:00:00 2001 From: nd-02110114 Date: Mon, 5 Nov 2018 00:32:02 -0800 Subject: [PATCH] remove var in ReactAndroid/src/androidTest (#22136) Summary: I removed var in ReactAndroid/src/androidTest. - [x] npm run prettier - [x] npm run flow-check-ios - [x] npm run flow-check-android [GENERAL] [ReactAndroid/src/androidTest] - remove var Pull Request resolved: https://github.com/facebook/react-native/pull/22136 Differential Revision: D12921227 Pulled By: TheSavior fbshipit-source-id: 45c03a52a5eafa25965aa785da094421c3df3999 --- .../androidTest/js/ProgressBarTestModule.js | 12 ++--- .../androidTest/js/ScrollViewTestModule.js | 12 ++--- .../src/androidTest/js/ShareTestModule.js | 12 ++--- .../js/SubviewsClippingTestModule.js | 54 +++++++++---------- .../js/SwipeRefreshLayoutTestModule.js | 24 ++++----- ReactAndroid/src/androidTest/js/TestBundle.js | 4 +- .../src/androidTest/js/TestIdTestModule.js | 22 ++++---- .../src/androidTest/js/TestJSLocaleModule.js | 6 +-- .../js/TestJavaToJSArgumentsModule.js | 22 ++++---- .../js/TestJavaToJSReturnValuesModule.js | 2 +- 10 files changed, 85 insertions(+), 85 deletions(-) diff --git a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js index f2b8ed0e9c..3f4fb138c2 100644 --- a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js +++ b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js @@ -9,12 +9,12 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var React = require('React'); -var ProgressBar = require('ProgressBarAndroid'); -var View = require('View'); +const BatchedBridge = require('BatchedBridge'); +const React = require('React'); +const ProgressBar = require('ProgressBarAndroid'); +const View = require('View'); -var renderApplication = require('renderApplication'); +const renderApplication = require('renderApplication'); class ProgressBarSampleApp extends React.Component { state = {}; @@ -37,7 +37,7 @@ class ProgressBarSampleApp extends React.Component { } } -var ProgressBarTestModule = { +const ProgressBarTestModule = { renderProgressBarApplication: function(rootTag) { renderApplication(ProgressBarSampleApp, {}, rootTag); }, diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js index ac88ac4cd7..1fa8147626 100644 --- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js +++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js @@ -47,8 +47,8 @@ class Item extends React.Component { } const getInitialState = function() { - var data = []; - for (var i = 0; i < NUM_ITEMS; i++) { + const data = []; + for (let i = 0; i < NUM_ITEMS; i++) { data[i] = {text: 'Item ' + i + '!'}; } return { @@ -101,7 +101,7 @@ class ScrollViewTestApp extends React.Component { render() { scrollViewApp = this; - var children = this.state.data.map((item, index) => ( + const children = this.state.data.map((item, index) => ( { render() { scrollViewApp = this; - var children = this.state.data.map((item, index) => ( + const children = this.state.data.map((item, index) => ( { } } -var styles = StyleSheet.create({ +const styles = StyleSheet.create({ item_container: { padding: 30, backgroundColor: '#ffffff', @@ -162,7 +162,7 @@ var styles = StyleSheet.create({ }, }); -var ScrollViewTestModule = { +const ScrollViewTestModule = { ScrollViewTestApp: ScrollViewTestApp, HorizontalScrollViewTestApp: HorizontalScrollViewTestApp, scrollTo(destX: number, destY: number) { diff --git a/ReactAndroid/src/androidTest/js/ShareTestModule.js b/ReactAndroid/src/androidTest/js/ShareTestModule.js index 058dbda3fb..4ceadf4c10 100644 --- a/ReactAndroid/src/androidTest/js/ShareTestModule.js +++ b/ReactAndroid/src/androidTest/js/ShareTestModule.js @@ -9,11 +9,11 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var React = require('React'); -var RecordingModule = require('NativeModules').ShareRecordingModule; -var Share = require('Share'); -var View = require('View'); +const BatchedBridge = require('BatchedBridge'); +const React = require('React'); +const RecordingModule = require('NativeModules').ShareRecordingModule; +const Share = require('Share'); +const View = require('View'); class ShareTestApp extends React.Component { render() { @@ -21,7 +21,7 @@ class ShareTestApp extends React.Component { } } -var ShareTestModule = { +const ShareTestModule = { ShareTestApp: ShareTestApp, showShareDialog: function(content, options) { Share.share(content, options).then( diff --git a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js index 30c996f7c8..2a1f56d380 100644 --- a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js +++ b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js @@ -9,19 +9,19 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var React = require('React'); -var ScrollView = require('ScrollView'); -var StyleSheet = require('StyleSheet'); -var View = require('View'); +const BatchedBridge = require('BatchedBridge'); +const React = require('React'); +const ScrollView = require('ScrollView'); +const StyleSheet = require('StyleSheet'); +const View = require('View'); -var requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('requireNativeComponent'); -var ClippableView = requireNativeComponent('ClippableView'); +const ClippableView = requireNativeComponent('ClippableView'); class ClippingSample1 extends React.Component { render() { - var styles = sample1Styles; + const styles = sample1Styles; return ( ); } - for (var i = 4; i < 6; i++) { - var viewID = 'C' + (i - 4); + for (let i = 4; i < 6; i++) { + const viewID = 'C' + (i - 4); children[i] = ( {component}; } } -var SubviewsClippingTestModule = { +const SubviewsClippingTestModule = { App: SubviewsClippingTestApp, renderClippingSample1: function() { appInstance.setComponent(); diff --git a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js index 3ab42ddcbf..f8d5128114 100644 --- a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js +++ b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js @@ -9,15 +9,15 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var React = require('React'); -var RecordingModule = require('NativeModules') +const BatchedBridge = require('BatchedBridge'); +const React = require('React'); +const RecordingModule = require('NativeModules') .SwipeRefreshLayoutRecordingModule; -var ScrollView = require('ScrollView'); -var RefreshControl = require('RefreshControl'); -var Text = require('Text'); -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -var View = require('View'); +const ScrollView = require('ScrollView'); +const RefreshControl = require('RefreshControl'); +const Text = require('Text'); +const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); +const View = require('View'); class Row extends React.Component { state = { @@ -39,7 +39,7 @@ class Row extends React.Component { }; } -var app = null; +let app = null; class SwipeRefreshLayoutTestApp extends React.Component { state = { @@ -51,8 +51,8 @@ class SwipeRefreshLayoutTestApp extends React.Component { } render() { - var rows = []; - for (var i = 0; i < this.state.rows; i++) { + const rows = []; + for (let i = 0; i < this.state.rows; i++) { rows.push(); } return ( @@ -71,7 +71,7 @@ class SwipeRefreshLayoutTestApp extends React.Component { } } -var SwipeRefreshLayoutTestModule = { +const SwipeRefreshLayoutTestModule = { SwipeRefreshLayoutTestApp, setRows: function(rows) { if (app != null) { diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js index 7da52c6d01..906a360133 100644 --- a/ReactAndroid/src/androidTest/js/TestBundle.js +++ b/ReactAndroid/src/androidTest/js/TestBundle.js @@ -32,9 +32,9 @@ require('TextInputTestModule'); require('TimePickerDialogTestModule'); // Define catalyst test apps used in integration tests -var AppRegistry = require('AppRegistry'); +const AppRegistry = require('AppRegistry'); -var apps = [ +const apps = [ { appKey: 'CatalystRootViewTestApp', component: () => diff --git a/ReactAndroid/src/androidTest/js/TestIdTestModule.js b/ReactAndroid/src/androidTest/js/TestIdTestModule.js index 48befe169f..1d493d81cc 100644 --- a/ReactAndroid/src/androidTest/js/TestIdTestModule.js +++ b/ReactAndroid/src/androidTest/js/TestIdTestModule.js @@ -9,16 +9,16 @@ 'use strict'; -var Image = require('Image'); -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var TextInput = require('TextInput'); -var TouchableBounce = require('TouchableBounce'); -var TouchableHighlight = require('TouchableHighlight'); -var TouchableOpacity = require('TouchableOpacity'); -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -var View = require('View'); +const Image = require('Image'); +const React = require('React'); +const StyleSheet = require('StyleSheet'); +const Text = require('Text'); +const TextInput = require('TextInput'); +const TouchableBounce = require('TouchableBounce'); +const TouchableHighlight = require('TouchableHighlight'); +const TouchableOpacity = require('TouchableOpacity'); +const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); +const View = require('View'); /** * All the views implemented on Android, each with the testID property set. @@ -72,7 +72,7 @@ class TestIdTestApp extends React.Component { } } -var styles = StyleSheet.create({ +const styles = StyleSheet.create({ base: { width: 150, height: 50, diff --git a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js index f84ea1735c..9b57149bbc 100644 --- a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js +++ b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js @@ -9,10 +9,10 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var Recording = require('NativeModules').Recording; +const BatchedBridge = require('BatchedBridge'); +const Recording = require('NativeModules').Recording; -var TestJSLocaleModule = { +const TestJSLocaleModule = { toUpper: function(s) { Recording.record(s.toUpperCase()); }, diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js index 7cbf76b1b1..347258ff33 100644 --- a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js +++ b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js @@ -9,14 +9,14 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var {assertEquals, assertTrue} = require('Asserts'); +const BatchedBridge = require('BatchedBridge'); +const {assertEquals, assertTrue} = require('Asserts'); function strictStringCompare(a, b) { if (typeof a !== 'string' || typeof b !== 'string' || a.length !== b.length) { return false; } - for (var i = 0; i < a.length; i++) { + for (let i = 0; i < a.length; i++) { if (a.charCodeAt(i) !== b.charCodeAt(i)) { return false; } @@ -28,7 +28,7 @@ function assertStrictStringEquals(a, b) { assertTrue(strictStringCompare(a, b), 'Expected: ' + a + ', received: ' + b); } -var TestJavaToJSArgumentsModule = { +const TestJavaToJSArgumentsModule = { receiveBasicTypes: function(str, dbl, bool, null_arg) { assertEquals('foo', str); assertEquals(3.14, dbl); @@ -45,15 +45,15 @@ var TestJavaToJSArgumentsModule = { receiveNestedArray: function(arr) { assertEquals(2, arr.length); assertEquals('level1', arr[0]); - var arr2 = arr[1]; + const arr2 = arr[1]; assertEquals('level2', arr2[0]); - var arr3 = arr2[1]; + const arr3 = arr2[1]; assertEquals('level3', arr3[0]); }, receiveArrayWithMaps: function(arr) { assertEquals(2, arr.length); - var m1 = arr[0]; - var m2 = arr[1]; + const m1 = arr[0]; + const m2 = arr[1]; assertEquals('m1v1', m1.m1k1); assertEquals('m1v2', m1.m1k2); assertEquals('m2v1', m2.m2k1); @@ -65,12 +65,12 @@ var TestJavaToJSArgumentsModule = { assertEquals(null, map.nullKey); }, receiveNestedMap: function(map) { - var nestedMap = map.nestedMap; + const nestedMap = map.nestedMap; assertEquals('foxes', nestedMap.animals); }, receiveMapWithArrays: function(map) { - var a1 = map.array1; - var a2 = map.array2; + const a1 = map.array1; + const a2 = map.array2; assertEquals(3, a1.length); assertEquals(2, a2.length); assertEquals(3, a1[0]); diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js index 248edf8574..528861a720 100644 --- a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js +++ b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js @@ -14,7 +14,7 @@ const BatchedBridge = require('BatchedBridge'); const {assertEquals, assertTrue} = require('Asserts'); const {TestModule} = require('NativeModules'); -var TestJavaToJSReturnValuesModule = { +const TestJavaToJSReturnValuesModule = { callMethod: function(methodName, expectedType, expectedJSON) { const result = TestModule[methodName](); assertEquals(expectedType, typeof result);