Skip to content

Commit c5eb882

Browse files
author
Josh Deffibaugh
committed
Another attempt to fix espresso on Travis
1 parent a4a4bec commit c5eb882

File tree

4 files changed

+23
-36
lines changed

4 files changed

+23
-36
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,4 @@ task testAllModules << {
8383

8484
testAllModules.dependsOn(':android-sdk:connectedAndroidTest', ':android-sdk:test',
8585
':event-handler:connectedAndroidTest', ':event-handler:test',
86-
':user-experiment-record:connectedAndroidTest', ':shared:connectedAndroidTest',
87-
':test-app:connectedAndroidTest')
86+
':user-experiment-record:connectedAndroidTest', ':shared:connectedAndroidTest')

test-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
targetSdkVersion target_sdk_version
1010
versionCode 1
1111
versionName "1.0"
12-
testInstrumentationRunner "com.optimizely.ab.android.test_app.TestRunner"
12+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
}
1414
testOptions {
1515
unitTests.returnDefaultValues = true

test-app/src/androidTest/java/com/optimizely/ab/android/test_app/MainActivityEspressoTest.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.support.test.rule.ActivityTestRule;
2626
import android.support.test.runner.AndroidJUnit4;
2727
import android.util.Pair;
28+
import android.view.WindowManager;
2829

2930
import com.optimizely.ab.android.event_handler.EventIntentService;
3031
import com.optimizely.ab.android.sdk.DataFileService;
@@ -122,7 +123,26 @@ protected void after() {
122123
CountingIdlingResourceManager.clearEvents();
123124
}
124125
})
125-
.around(activityTestRule);
126+
.around(activityTestRule)
127+
.around(new ExternalResource() {
128+
@Override
129+
protected void before() throws Throwable {
130+
super.before();
131+
Runnable wakeUpDevice = new Runnable() {
132+
public void run() {
133+
activityTestRule.getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON |
134+
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
135+
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
136+
}
137+
};
138+
activityTestRule.getActivity().runOnUiThread(wakeUpDevice);
139+
}
140+
141+
@Override
142+
protected void after() {
143+
super.after();
144+
}
145+
});
126146

127147
@Test
128148
public void experimentActivationForWhitelistUser() throws InterruptedException {

test-app/src/androidTest/java/com/optimizely/ab/android/test_app/TestRunner.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)