Skip to content

Commit 40a33f6

Browse files
committed
Fixing the tests run
1 parent 313e0b6 commit 40a33f6

File tree

4 files changed

+6
-36
lines changed

4 files changed

+6
-36
lines changed

app/src/test/java/org/glucosio/android/GlucosioTestRunner.java

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

app/src/test/java/org/glucosio/android/RobolectricTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
import org.junit.runner.RunWith;
1010
import org.robolectric.RuntimeEnvironment;
1111
import org.robolectric.annotation.Config;
12+
import org.robolectric.RobolectricTestRunner;
1213

1314
@Ignore
14-
@RunWith(GlucosioTestRunner.class)
15-
@Config(constants = BuildConfig.class, sdk = 21, packageName = "org.glucosio.android")
15+
@RunWith(RobolectricTestRunner.class)
16+
@Config(constants = BuildConfig.class, sdk = 21)
1617
public abstract class RobolectricTest {
1718
protected Analytics getAnalytics() {
1819
return getTestApplication().getAnalytics();

app/src/test/java/org/glucosio/android/presenter/ExternalViewPresenterTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
package org.glucosio.android.presenter;
22

33
import org.glucosio.android.BuildConfig;
4+
import org.glucosio.android.RobolectricTest;
45
import org.glucosio.android.tools.network.GlucosioExternalLinks;
56
import org.glucosio.android.tools.network.NetworkConnectivity;
67
import org.junit.Before;
78
import org.junit.Test;
89
import org.junit.runner.RunWith;
9-
import org.robolectric.RobolectricGradleTestRunner;
1010
import org.robolectric.annotation.Config;
1111

1212
import static org.mockito.Mockito.mock;
1313
import static org.mockito.Mockito.verify;
1414
import static org.mockito.Mockito.when;
1515

16-
@RunWith(RobolectricGradleTestRunner.class)
17-
@Config(constants = BuildConfig.class, sdk = 21, packageName = "org.glucosio.android")
18-
public class ExternalViewPresenterTest {
16+
public class ExternalViewPresenterTest extends RobolectricTest {
1917

2018
private ExternalViewPresenter.View view;
2119
private ExternalViewPresenter presenter;

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ allprojects {
5353
ext.junitVer = '4.12'
5454
ext.mockitoVer = '1.10.19'
5555
ext.androidAssertJVer = '1.1.1'
56-
ext.robolectricVer = '3.1'
56+
ext.robolectricVer = '3.2'
5757

5858
apply plugin: 'com.github.ben-manes.versions'
5959
}

0 commit comments

Comments
 (0)