Update tests to JUnit 4.

vincentbrison · Jun 27, 2015 · 06b8084 · 06b8084
1 parent 1d67ad7
commit 06b8084
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 13 deletions.
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -12,6 +12,7 @@ android {
         targetSdkVersion 20
         versionCode 1
         versionName project.VERSION_NAME
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     packagingOptions {
@@ -28,6 +29,8 @@ dependencies {
     compile 'com.android.support:support-v4:20.0.0'
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
+
+    androidTestCompile 'com.android.support.test:runner:0.3'
 }
 
 android.libraryVariants.all { variant ->

diff --git a/...androidTest/java/com/vincentbrison/openlibraries/android/dualcache/lib/DualCacheTest.java b/...androidTest/java/com/vincentbrison/openlibraries/android/dualcache/lib/DualCacheTest.java
@@ -1,11 +1,19 @@
 package com.vincentbrison.openlibraries.android.dualcache.lib;
 
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.AndroidTestCase;
 
 import com.vincentbrison.openlibraries.android.dualcache.lib.testobjects.AbstractVehicule;
 import com.vincentbrison.openlibraries.android.dualcache.lib.testobjects.CoolBike;
 import com.vincentbrison.openlibraries.android.dualcache.lib.testobjects.CoolCar;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
 public abstract class DualCacheTest extends AndroidTestCase {
 
     protected static final int RAM_MAX_SIZE = 1000;
@@ -14,18 +22,22 @@ public abstract class DualCacheTest extends AndroidTestCase {
     protected static final int TEST_APP_VERSION = 0;
     protected DualCache<AbstractVehicule> mCache;
 
+    @Before
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
+        setContext(InstrumentationRegistry.getTargetContext());
         DualCacheContextUtils.setContext(getContext());
     }
 
+    @After
     @Override
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
         mCache.invalidate();
         super.tearDown();
     }
 
+    @Test
     public void testBasicOperations() throws Exception {
         CoolCar car = new CoolCar();
         mCache.put("key", car);
@@ -67,6 +79,7 @@ public void testBasicOperations() throws Exception {
         }
     }
 
+    @Test
     public void testBasicOperations2() throws Exception {
         CoolCar car = new CoolCar();
         mCache.put("key", car);
@@ -101,6 +114,7 @@ public void testBasicOperations2() throws Exception {
         assertNull(mCache.get("bike"));
     }
 
+    @Test
     public void testLRUPolicy() {
         mCache.invalidate();
         CoolCar carToEvict = new CoolCar();

diff --git a/...n/openlibraries/android/dualcache/lib/configurationsToTest/NoRamDiskCustomSerializer.java b/...n/openlibraries/android/dualcache/lib/configurationsToTest/NoRamDiskCustomSerializer.java
@@ -10,7 +10,7 @@
 public class NoRamDiskCustomSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .noRam()

diff --git a/.../openlibraries/android/dualcache/lib/configurationsToTest/NoRamDiskDefaultSerializer.java b/.../openlibraries/android/dualcache/lib/configurationsToTest/NoRamDiskDefaultSerializer.java
@@ -10,7 +10,7 @@
 public class NoRamDiskDefaultSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .noRam()

diff --git a/...s/android/dualcache/lib/configurationsToTest/RamCustomSerializerDiskCustomSerializer.java b/...s/android/dualcache/lib/configurationsToTest/RamCustomSerializerDiskCustomSerializer.java
@@ -10,7 +10,7 @@
 public class RamCustomSerializerDiskCustomSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useCustomSerializerInRam(RAM_MAX_SIZE, new SerializerForTesting())

diff --git a/.../android/dualcache/lib/configurationsToTest/RamCustomSerializerDiskDefaultSerializer.java b/.../android/dualcache/lib/configurationsToTest/RamCustomSerializerDiskDefaultSerializer.java
@@ -10,7 +10,7 @@
 public class RamCustomSerializerDiskDefaultSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useCustomSerializerInRam(RAM_MAX_SIZE, new SerializerForTesting())

diff --git a/...n/openlibraries/android/dualcache/lib/configurationsToTest/RamCustomSerializerNoDisk.java b/...n/openlibraries/android/dualcache/lib/configurationsToTest/RamCustomSerializerNoDisk.java
@@ -10,7 +10,7 @@
 public class RamCustomSerializerNoDisk extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useCustomSerializerInRam(RAM_MAX_SIZE, new SerializerForTesting())

diff --git a/.../android/dualcache/lib/configurationsToTest/RamDefaultSerializerDiskCustomSerializer.java b/.../android/dualcache/lib/configurationsToTest/RamDefaultSerializerDiskCustomSerializer.java
@@ -10,7 +10,7 @@
 public class RamDefaultSerializerDiskCustomSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useDefaultSerializerInRam(RAM_MAX_SIZE)

diff --git a/...android/dualcache/lib/configurationsToTest/RamDefaultSerializerDiskDefaultSerializer.java b/...android/dualcache/lib/configurationsToTest/RamDefaultSerializerDiskDefaultSerializer.java
@@ -10,7 +10,7 @@
 public class RamDefaultSerializerDiskDefaultSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useDefaultSerializerInRam(RAM_MAX_SIZE)

diff --git a/.../openlibraries/android/dualcache/lib/configurationsToTest/RamDefaultSerializerNoDisk.java b/.../openlibraries/android/dualcache/lib/configurationsToTest/RamDefaultSerializerNoDisk.java
@@ -10,7 +10,7 @@
 public class RamDefaultSerializerNoDisk extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useDefaultSerializerInRam(RAM_MAX_SIZE)

diff --git a/...ibraries/android/dualcache/lib/configurationsToTest/RamReferenceDiskCustomSerializer.java b/...ibraries/android/dualcache/lib/configurationsToTest/RamReferenceDiskCustomSerializer.java
@@ -10,7 +10,7 @@
 public class RamReferenceDiskCustomSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useReferenceInRam(RAM_MAX_SIZE, new SizeOfVehiculeForTesting())

diff --git a/...braries/android/dualcache/lib/configurationsToTest/RamReferenceDiskDefaultSerializer.java b/...braries/android/dualcache/lib/configurationsToTest/RamReferenceDiskDefaultSerializer.java
@@ -10,7 +10,7 @@
 public class RamReferenceDiskDefaultSerializer extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useReferenceInRam(RAM_MAX_SIZE, new SizeOfVehiculeForTesting())

diff --git a/...ntbrison/openlibraries/android/dualcache/lib/configurationsToTest/RamReferenceNoDisk.java b/...ntbrison/openlibraries/android/dualcache/lib/configurationsToTest/RamReferenceNoDisk.java
@@ -11,7 +11,7 @@
 public class RamReferenceNoDisk extends DualCacheTest {
 
     @Override
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         mCache = new DualCacheBuilder<AbstractVehicule>(CACHE_NAME, TEST_APP_VERSION, AbstractVehicule.class)
                 .useReferenceInRam(RAM_MAX_SIZE, new SizeOfVehiculeForTesting())