Deactivated connectedAndroidTests again, because the Android-24 emulator is still buggy and does not start correctly.

Updated libraries for UI-Tests and fixed bug in OpenGL-Viewer that it requires configuration for certain devices.
This commit is contained in:
Alexander Pacha
2016-09-19 09:16:24 +02:00
parent b3d8eb0547
commit 2cabdd0668
3 changed files with 18 additions and 8 deletions

View File

@@ -20,9 +20,10 @@ android:
before_script:
# Create and start emulator
- echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
# - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
# - emulator -avd test -no-skin -no-audio -no-window &
# - android-wait-for-emulator
# - adb shell input keyevent 82 &
script: ./gradlew assembleRelease connectedAndroidTest
script: ./gradlew assembleRelease
#connectedAndroidTest

View File

@@ -28,9 +28,17 @@ dependencies {
testCompile 'org.mockito:mockito-core:1.10.19'
androidTestCompile 'com.android.support:support-annotations:24.2.1'
androidTestCompile 'com.android.support.test:runner:0.4.1'
androidTestCompile 'com.android.support.test:rules:0.4.1'
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2') {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile ('com.android.support.test:runner:0.5') {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile ('com.android.support.test:rules:0.5') {
exclude group: 'com.android.support', module: 'support-annotations'
}
}

View File

@@ -94,6 +94,7 @@ public class OrientationVisualisationFragment extends Fragment {
mRenderer = new CubeRenderer();
mRenderer.setOrientationProvider(currentOrientationProvider);
mGLSurfaceView = new GLSurfaceView(getActivity());
mGLSurfaceView.setEGLConfigChooser(8, 8, 8, 8, 16, 0);
mGLSurfaceView.setRenderer(mRenderer);
mGLSurfaceView.setOnLongClickListener(new OnLongClickListener() {