Merge pull request #131 from flipkart-incubator/robolectric

Robolectric Changes
flipkart-incubator · Jan 20, 2017 · 1b9852e · 1b9852e
2 parents 3630e75 + 629fcec
commit 1b9852e
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/batching-gson/build.gradle b/batching-gson/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     compile 'com.android.support:support-annotations:25.1.0'
     compile project(':batching-core')
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.1.1'
+    testCompile 'org.robolectric:robolectric:3.2.2'
 }
 
 android {

diff --git a/batching-gson/src/test/java/com/flipkart/batching/gson/GsonSerializationTest.java b/batching-gson/src/test/java/com/flipkart/batching/gson/GsonSerializationTest.java
@@ -37,7 +37,7 @@
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.io.IOException;
@@ -51,7 +51,7 @@
  * Test for {@link GsonSerializationStrategy}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class GsonSerializationTest {
 

diff --git a/...hing-gson/src/test/java/com/flipkart/batching/gson/adapters/BatchingTypeAdaptersTest.java b/...hing-gson/src/test/java/com/flipkart/batching/gson/adapters/BatchingTypeAdaptersTest.java
@@ -9,10 +9,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class BatchingTypeAdaptersTest {
 

diff --git a/batching/build.gradle b/batching/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.robolectric:robolectric:3.1.1'
+    testCompile 'org.robolectric:robolectric:3.2.2'
     testCompile project(':batching-gson')
     testCompile 'com.google.code.gson:gson:2.8.0'
 

diff --git a/batching/src/test/java/com/flipkart/batching/BatchManagerTest.java b/batching/src/test/java/com/flipkart/batching/BatchManagerTest.java
@@ -51,7 +51,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
@@ -71,7 +71,7 @@
 /**
  * Test for {@link BatchManager}
  */
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class BatchManagerTest extends BaseTestClass {
 

diff --git a/batching/src/test/java/com/flipkart/batching/listener/NetworkPersistedBatchReadyTest.java b/batching/src/test/java/com/flipkart/batching/listener/NetworkPersistedBatchReadyTest.java
@@ -49,7 +49,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
@@ -73,7 +73,7 @@
 /**
  * Test for {@link NetworkPersistedBatchReadyListener}
  */
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class NetworkPersistedBatchReadyTest extends BaseTestClass {
 

diff --git a/batching/src/test/java/com/flipkart/batching/listener/PersistedBatchReadyTest.java b/batching/src/test/java/com/flipkart/batching/listener/PersistedBatchReadyTest.java
@@ -45,7 +45,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
@@ -65,7 +65,7 @@
 /**
  * Test for {@link PersistedBatchReadyListener}
  */
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class PersistedBatchReadyTest extends BaseTestClass {
 

diff --git a/batching/src/test/java/com/flipkart/batching/listener/TagBatchReadyTest.java b/batching/src/test/java/com/flipkart/batching/listener/TagBatchReadyTest.java
@@ -38,7 +38,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.mockito.Matchers.any;
@@ -49,7 +49,7 @@
 /**
  * Test for {@link TagBatchReadyListener}
  */
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class TagBatchReadyTest {
 

diff --git a/batching/src/test/java/com/flipkart/batching/listener/TrimPersistedBatchReadyTest.java b/batching/src/test/java/com/flipkart/batching/listener/TrimPersistedBatchReadyTest.java
@@ -40,7 +40,7 @@
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
@@ -57,7 +57,7 @@
  * Test for {@link TrimPersistedBatchReadyListener}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class TrimPersistedBatchReadyTest extends BaseTestClass {
 

diff --git a/batching/src/test/java/com/flipkart/batching/persistence/DatabaseHelperTest.java b/batching/src/test/java/com/flipkart/batching/persistence/DatabaseHelperTest.java
@@ -38,7 +38,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -52,7 +52,7 @@
  * Test for {@link DatabaseHelper}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class DatabaseHelperTest {
 

diff --git a/batching/src/test/java/com/flipkart/batching/persistence/SQLPersistenceTest.java b/batching/src/test/java/com/flipkart/batching/persistence/SQLPersistenceTest.java
@@ -37,7 +37,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -47,7 +47,7 @@
 /**
  * Test for {@link SQLPersistenceStrategy}
  */
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class SQLPersistenceTest extends BaseTestClass {
 

diff --git a/batching/src/test/java/com/flipkart/batching/persistence/TagBasedPersistenceTest.java b/batching/src/test/java/com/flipkart/batching/persistence/TagBasedPersistenceTest.java
@@ -37,7 +37,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -48,7 +48,7 @@
  * Test for {@link TagBasedPersistenceStrategy}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class TagBasedPersistenceTest {
 

diff --git a/batching/src/test/java/com/flipkart/batching/persistence/TapePersistenceTest.java b/batching/src/test/java/com/flipkart/batching/persistence/TapePersistenceTest.java
@@ -36,7 +36,7 @@
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.io.File;
@@ -45,7 +45,7 @@
 /**
  * Test for {@link TapePersistenceStrategy}
  */
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class TapePersistenceTest extends BaseTestClass {
 

diff --git a/batching/src/test/java/com/flipkart/batching/strategy/BaseBatchingStrategyTest.java b/batching/src/test/java/com/flipkart/batching/strategy/BaseBatchingStrategyTest.java
@@ -40,7 +40,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -56,7 +56,7 @@
  * Test for {@link BaseBatchingStrategy}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class BaseBatchingStrategyTest {
 

diff --git a/batching/src/test/java/com/flipkart/batching/strategy/SizeTimeBatchingTest.java b/batching/src/test/java/com/flipkart/batching/strategy/SizeTimeBatchingTest.java
@@ -43,7 +43,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
@@ -61,7 +61,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class SizeTimeBatchingTest {
 

diff --git a/batching/src/test/java/com/flipkart/batching/strategy/TagBatchingTest.java b/batching/src/test/java/com/flipkart/batching/strategy/TagBatchingTest.java
@@ -47,7 +47,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
@@ -70,7 +70,7 @@
  * Test for {@link TagBatchingStrategy}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class TagBatchingTest {
 

diff --git a/batching/src/test/java/com/flipkart/batching/strategy/TimeBatchingTest.java b/batching/src/test/java/com/flipkart/batching/strategy/TimeBatchingTest.java
@@ -42,7 +42,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
@@ -64,7 +64,7 @@
  * Test for {@link TimeBatchingStrategy}
  */
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
 public class TimeBatchingTest {