karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Run unlockAndWakeupDevice() on Ui thread.

Browse Source
This commit is contained in:
youtaol
2012-12-26 10:18:09 +08:00
parent 2cae2557de
commit 09ff246ef7
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/BigTestUtils.java
+12 -6
View File
@@ -136,15 +136,21 @@ public class BigTestUtils {
} }
/** /**
* Unlocks the device screen. * Unlocks and wake up the device.
*/ */
public static void unlockDevice() { public static void unlockAndWakeupDevice() {
// The menu item of setting should be found if the screen is not locked. // The menu item of setting should be found if the screen is not locked.
try { try {
Window wind = EndToEndTestUtils.SOLO.getCurrentActivity().getWindow(); EndToEndTestUtils.SOLO.getCurrentActivity().runOnUiThread(new Runnable() {
wind.addFlags(LayoutParams.FLAG_DISMISS_KEYGUARD); @Override
wind.addFlags(LayoutParams.FLAG_SHOW_WHEN_LOCKED); public void run() {
wind.addFlags(LayoutParams.FLAG_TURN_SCREEN_ON); Window wind = EndToEndTestUtils.SOLO.getCurrentActivity().getWindow();
wind.addFlags(LayoutParams.FLAG_DISMISS_KEYGUARD);
wind.addFlags(LayoutParams.FLAG_SHOW_WHEN_LOCKED);
wind.addFlags(LayoutParams.FLAG_TURN_SCREEN_ON);
}
});
} catch (Exception e) { } catch (Exception e) {
Log.i(EndToEndTestUtils.LOG_TAG, Log.i(EndToEndTestUtils.LOG_TAG,
"Meet error when unlock device screen, may the device is not locked."); "Meet error when unlock device screen, may the device is not locked.");
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/ResourceUsageTest.java
+2 -2
View File
@@ -63,7 +63,7 @@ public class ResourceUsageTest extends ActivityInstrumentationTestCase2<TrackLis
context = trackListActivity.getApplicationContext(); context = trackListActivity.getApplicationContext();
instrumentation.waitForIdleSync(); instrumentation.waitForIdleSync();
EndToEndTestUtils.setupForDebug(instrumentation, trackListActivity); EndToEndTestUtils.setupForDebug(instrumentation, trackListActivity);
BigTestUtils.unlockDevice(); BigTestUtils.unlockAndWakeupDevice();
if (!isUserConfirmed) { if (!isUserConfirmed) {
confirmTest(); confirmTest();
} }
@@ -158,7 +158,7 @@ public class ResourceUsageTest extends ActivityInstrumentationTestCase2<TrackLis
EndToEndTestUtils.SOLO.clickOnText(trackListActivity.getString(tabNameId)); EndToEndTestUtils.SOLO.clickOnText(trackListActivity.getString(tabNameId));
} }
BigTestUtils.moniterTest(context, INTERVALE_TO_CHECK, TEST_DURATION_IN_MILLISECONDS); BigTestUtils.moniterTest(context, INTERVALE_TO_CHECK, TEST_DURATION_IN_MILLISECONDS);
BigTestUtils.unlockDevice(); BigTestUtils.unlockAndWakeupDevice();
EndToEndTestUtils.stopRecording(true); EndToEndTestUtils.stopRecording(true);
} }