@@ -77,94 +77,130 @@ export const testNavigationSessionInitialization = async (
7777 setDetoxStep ( 1 ) ;
7878} ;
7979
80- const expectFalseMessage = ( expectation : string ) => {
81- return `Expected ${ expectation } to be false but it was true` ;
82- } ;
83-
8480export const testMapInitialization = async ( testTools : TestTools ) => {
85- const {
86- mapViewController,
87- passTest,
88- failTest,
89- expectFalseError,
90- expectTrueError,
91- } = testTools ;
81+ const { mapViewController, passTest, failTest, expectFalseError } = testTools ;
9282 if ( ! mapViewController ) {
9383 return failTest ( 'mapViewController was expected to exist' ) ;
9484 }
95- if ( Platform . OS === 'ios' ) {
96- if ( ( await mapViewController . getUiSettings ( ) ) . isCompassEnabled ) {
85+ mapViewController . setCompassEnabled ( false ) ;
86+ mapViewController . setRotateGesturesEnabled ( false ) ;
87+ mapViewController . setScrollGesturesEnabled ( false ) ;
88+ mapViewController . setScrollGesturesEnabledDuringRotateOrZoom ( false ) ;
89+ mapViewController . setTiltGesturesEnabled ( false ) ;
90+ mapViewController . setZoomGesturesEnabled ( false ) ;
91+
92+ if ( Platform . OS === 'android' ) {
93+ mapViewController . setZoomControlsEnabled ( false ) ;
94+ mapViewController . setMapToolbarEnabled ( false ) ;
95+ }
96+ // Timeout here is used to avoid issues on Android.
97+ await delay ( 3000 ) ;
98+
99+ if ( ( await mapViewController . getUiSettings ( ) ) . isCompassEnabled ) {
100+ return expectFalseError (
101+ 'mapViewController.getUiSettings()).isCompassEnabled'
102+ ) ;
103+ }
104+ if ( ( await mapViewController . getUiSettings ( ) ) . isRotateGesturesEnabled ) {
105+ return expectFalseError (
106+ 'mapViewController.getUiSettings()).isRotateGesturesEnabled'
107+ ) ;
108+ }
109+ if ( ( await mapViewController . getUiSettings ( ) ) . isScrollGesturesEnabled ) {
110+ return expectFalseError (
111+ 'mapViewController.getUiSettings()).isScrollGesturesEnabled'
112+ ) ;
113+ }
114+ if (
115+ ( await mapViewController . getUiSettings ( ) )
116+ . isScrollGesturesEnabledDuringRotateOrZoom
117+ ) {
118+ return expectFalseError (
119+ 'mapViewController.getUiSettings()).isScrollGesturesEnabledDuringRotateOrZoom'
120+ ) ;
121+ }
122+ if ( ( await mapViewController . getUiSettings ( ) ) . isTiltGesturesEnabled ) {
123+ return expectFalseError (
124+ 'mapViewController.getUiSettings()).isTiltGesturesEnabled'
125+ ) ;
126+ }
127+ if ( ( await mapViewController . getUiSettings ( ) ) . isZoomGesturesEnabled ) {
128+ return expectFalseError (
129+ 'mapViewController.getUiSettings()).isZoomGesturesEnabled'
130+ ) ;
131+ }
132+
133+ if ( Platform . OS === 'android' ) {
134+ if ( ( await mapViewController . getUiSettings ( ) ) . isZoomControlsEnabled ) {
97135 return expectFalseError (
98- 'mapViewController.getUiSettings()).isCompassEnabled'
99- ) ;
100- }
101- } else {
102- if ( ! ( await mapViewController . getUiSettings ( ) ) . isCompassEnabled ) {
103- return expectTrueError (
104- 'mapViewController.getUiSettings()).isCompassEnabled'
136+ 'mapViewController.getUiSettings()).isZoomControlsEnabled'
105137 ) ;
106138 }
107- }
108- if ( Platform . OS === 'ios' ) {
109139 if ( ( await mapViewController . getUiSettings ( ) ) . isMapToolbarEnabled ) {
110140 return expectFalseError (
111141 'mapViewController.getUiSettings()).isMapToolbarEnabled'
112142 ) ;
113143 }
114- } else {
115- if ( ! ( await mapViewController . getUiSettings ( ) ) . isMapToolbarEnabled ) {
116- return expectTrueError (
117- 'mapViewController.getUiSettings()).isMapToolbarEnabled'
118- ) ;
119- }
120144 }
121- if ( ! ( await mapViewController . getUiSettings ( ) ) . isIndoorLevelPickerEnabled ) {
122- return failTest (
123- expectFalseMessage (
124- 'mapViewController.getUiSettings()).isIndoorLevelPickerEnabled'
125- )
145+
146+ mapViewController . setCompassEnabled ( true ) ;
147+ mapViewController . setRotateGesturesEnabled ( true ) ;
148+ mapViewController . setScrollGesturesEnabled ( true ) ;
149+ mapViewController . setScrollGesturesEnabledDuringRotateOrZoom ( true ) ;
150+ mapViewController . setTiltGesturesEnabled ( true ) ;
151+ mapViewController . setZoomGesturesEnabled ( true ) ;
152+
153+ if ( Platform . OS === 'android' ) {
154+ mapViewController . setZoomControlsEnabled ( true ) ;
155+ mapViewController . setMapToolbarEnabled ( true ) ;
156+ }
157+ // Timeout here is used to avoid issues on Android.
158+ await delay ( 3000 ) ;
159+
160+ if ( ! ( await mapViewController . getUiSettings ( ) ) . isCompassEnabled ) {
161+ return expectFalseError (
162+ '!mapViewController.getUiSettings()).isCompassEnabled'
126163 ) ;
127164 }
128165 if ( ! ( await mapViewController . getUiSettings ( ) ) . isRotateGesturesEnabled ) {
129166 return expectFalseError (
130- 'mapViewController.getUiSettings()).isRotateGesturesEnabled'
167+ '! mapViewController.getUiSettings()).isRotateGesturesEnabled'
131168 ) ;
132169 }
133170 if ( ! ( await mapViewController . getUiSettings ( ) ) . isScrollGesturesEnabled ) {
134171 return expectFalseError (
135- 'mapViewController.getUiSettings()).isScrollGesturesEnabled'
172+ '! mapViewController.getUiSettings()).isScrollGesturesEnabled'
136173 ) ;
137174 }
138175 if (
139176 ! ( await mapViewController . getUiSettings ( ) )
140177 . isScrollGesturesEnabledDuringRotateOrZoom
141178 ) {
142179 return expectFalseError (
143- 'mapViewController.getUiSettings()).isScrollGesturesEnabledDuringRotateOrZoom'
180+ '! mapViewController.getUiSettings()).isScrollGesturesEnabledDuringRotateOrZoom'
144181 ) ;
145182 }
146183 if ( ! ( await mapViewController . getUiSettings ( ) ) . isTiltGesturesEnabled ) {
147184 return expectFalseError (
148- 'mapViewController.getUiSettings()).isTiltGesturesEnabled'
149- ) ;
150- }
151- if ( ( await mapViewController . getUiSettings ( ) ) . isZoomControlsEnabled ) {
152- return expectFalseError (
153- 'mapViewController.getUiSettings()).isZoomControlsEnabled'
185+ '!mapViewController.getUiSettings()).isTiltGesturesEnabled'
154186 ) ;
155187 }
156188 if ( ! ( await mapViewController . getUiSettings ( ) ) . isZoomGesturesEnabled ) {
157189 return expectFalseError (
158- 'mapViewController.getUiSettings()).isZoomGesturesEnabled'
190+ '! mapViewController.getUiSettings()).isZoomGesturesEnabled'
159191 ) ;
160192 }
161- if ( Platform . OS === 'ios' ) {
162- if ( ! ( await mapViewController . isMyLocationEnabled ( ) ) ) {
163- return expectFalseError ( 'await mapViewController.isMyLocationEnabled()' ) ;
193+
194+ if ( Platform . OS === 'android' ) {
195+ if ( ! ( await mapViewController . getUiSettings ( ) ) . isZoomControlsEnabled ) {
196+ return expectFalseError (
197+ '!mapViewController.getUiSettings()).isZoomControlsEnabled'
198+ ) ;
164199 }
165- } else {
166- if ( await mapViewController . isMyLocationEnabled ( ) ) {
167- return expectTrueError ( 'await mapViewController.isMyLocationEnabled()' ) ;
200+ if ( ! ( await mapViewController . getUiSettings ( ) ) . isMapToolbarEnabled ) {
201+ return expectFalseError (
202+ '!mapViewController.getUiSettings()).isMapToolbarEnabled'
203+ ) ;
168204 }
169205 }
170206
@@ -431,6 +467,7 @@ export const testMoveCamera = async (testTools: TestTools) => {
431467 } ,
432468 } ) ;
433469
470+ // Timeout here is used to avoid issues on Android.
434471 await delay ( 3000 ) ;
435472 const hongKongPosition = await mapViewController . getCameraPosition ( ) ;
436473
@@ -451,6 +488,7 @@ export const testMoveCamera = async (testTools: TestTools) => {
451488 } ,
452489 } ) ;
453490
491+ // Timeout here is used to avoid issues on Android.
454492 await delay ( 3000 ) ;
455493 const tokyoPosition = await mapViewController . getCameraPosition ( ) ;
456494
@@ -483,6 +521,7 @@ export const testTiltZoomBearingCamera = async (testTools: TestTools) => {
483521 zoom : 6 ,
484522 } ) ;
485523
524+ // Timeout here is used to avoid issues on Android.
486525 await delay ( 3000 ) ;
487526 const hongKongPosition = await mapViewController . getCameraPosition ( ) ;
488527
0 commit comments