yingtongwang/sensor-fusion-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to newest SDK and fixed UI-tests to run not only on a simulator, but also on real devices. (reverted from commit 468b322635)

Browse Source
This commit is contained in:
Alexander Pacha
2017-01-17 23:44:27 +01:00
parent dee14cf165
commit d76f879d34
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@@ -6,8 +6,8 @@ def code = formattedDate.toInteger() * 10000
def buildNumber = System.getenv("BITRISE_BUILD_NUMBER") as Integer ?: 0 def buildNumber = System.getenv("BITRISE_BUILD_NUMBER") as Integer ?: 0
android { android {
compileSdkVersion 25 compileSdkVersion 24
buildToolsVersion "25.0.0" buildToolsVersion "24.0.2"
defaultConfig { defaultConfig {
applicationId "org.hitlabnz.sensor_fusion_demo" applicationId "org.hitlabnz.sensor_fusion_demo"
@@ -31,12 +31,12 @@ android {
} }
dependencies { dependencies {
compile 'com.android.support:support-v4:25.0.0' compile 'com.android.support:support-v4:24.2.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.2.9' testCompile 'org.mockito:mockito-core:1.10.19'
androidTestCompile 'com.android.support:support-annotations:25.0.0' androidTestCompile 'com.android.support:support-annotations:24.2.1'
androidTestCompile 'org.hamcrest:hamcrest-library:1.3' androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

5
app/src/androidTest/java/org/hitlabnz/sensor_fusion_demo/androidTest/ApplicationTest.java
View File

@@ -1,7 +1,6 @@
package org.hitlabnz.sensor_fusion_demo.androidTest; package org.hitlabnz.sensor_fusion_demo.androidTest;
import android.app.Application; import android.app.Application;
import android.support.test.espresso.NoMatchingViewException;
import android.support.test.espresso.matcher.ViewMatchers; import android.support.test.espresso.matcher.ViewMatchers;
import android.support.test.rule.ActivityTestRule; import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
@@ -62,10 +61,6 @@ public class ApplicationTest {
} }
public static void DiscardGyroscopeWarning() { public static void DiscardGyroscopeWarning() {
try {
onView(withText("OK")).perform(click()); onView(withText("OK")).perform(click());
} catch (NoMatchingViewException e) {
//view not displayed logic
}
} }
} }

2
build.gradle
View File

@@ -7,7 +7,7 @@ buildscript {
maven { url 'http://repo1.maven.org/maven2' } maven { url 'http://repo1.maven.org/maven2' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.2' classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
} }
} }