SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated espresso and test support library (#533)

This commit is contained in:
Martijn Brekhof 2018-04-18 09:58:26 +02:00 committed by Synced Synapse
parent bff69e1714
commit 1d6f9c225e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@ -129,11 +129,10 @@ dependencies {
compile 'at.blogc:expandabletextview:1.0.3'
compile 'com.sothree.slidinguppanel:library:3.3.1'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test:runner:1.0.1'
androidTestCompile 'com.android.support.test:rules:1.0.1'
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestCompile "com.android.support:support-v13:${supportLibVersion}"
instrumentationTestCompile 'junit:junit:4.12'

6
app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java
View File

@ -19,7 +19,7 @@ package org.xbmc.kore.tests.ui;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.IdlingRegistry;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.support.v7.app.AppCompatActivity;
@ -125,7 +125,7 @@ abstract public class AbstractTestClass<T extends AppCompatActivity> {
configureHostInfo(hostInfo);
loaderIdlingResource = new LoaderIdlingResource(activityTestRule.getActivity().getSupportLoaderManager());
Espresso.registerIdlingResources(loaderIdlingResource);
IdlingRegistry.getInstance().register(loaderIdlingResource);
Utils.disableAnimations(context);
@ -142,7 +142,7 @@ abstract public class AbstractTestClass<T extends AppCompatActivity> {
@After
public void tearDown() throws Exception {
if ( loaderIdlingResource != null )
Espresso.unregisterIdlingResources(loaderIdlingResource);
IdlingRegistry.getInstance().unregister(loaderIdlingResource);
applicationHandler.reset();
playerHandler.reset();