From ddce34bc902b8fbd5e7c64bb7d5f0cb3403b1800 Mon Sep 17 00:00:00 2001
From: Paul Hawke <paul.hawke@gmail.com>
Date: Wed, 5 Jul 2017 20:23:37 -0500
Subject: [PATCH] Shifted the ApacheHttpClientMediaWikiApiTest to run using
 Robolectric (as a unit test) rather than on-device.

---
 app/build.gradle                                     |  5 +++++
 .../mwapi/ApacheHttpClientMediaWikiApiTest.java      | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 rename app/src/{androidTest => test}/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java (97%)

diff --git a/app/build.gradle b/app/build.gradle
index a731a9e3a..fa5c549bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,11 @@ dependencies {
     compile "com.google.guava:guava:${GUAVA_VERSION}"
 
     testCompile 'junit:junit:4.12'
+    testCompile ('org.robolectric:robolectric:3.3.2') {
+        exclude module: 'guava'
+    }
+
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java b/app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
similarity index 97%
rename from app/src/androidTest/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
rename to app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
index 046962499..1e0779b17 100644
--- a/app/src/androidTest/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
+++ b/app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
@@ -1,12 +1,13 @@
 package fr.free.nrw.commons.mwapi;
 
 import android.os.Build;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -25,11 +26,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-/*
- *  XML for individual tests was captured by hand from the API sandbox -
- *  https://en.wikipedia.org/wiki/Special:ApiSandbox
- */
-@RunWith(AndroidJUnit4.class)
+@RunWith(RobolectricTestRunner.class)
+@Config(constants = BuildConfig.class)
 public class ApacheHttpClientMediaWikiApiTest {
 
     private ApacheHttpClientMediaWikiApi testObject;
@@ -226,4 +224,4 @@ public class ApacheHttpClientMediaWikiApiTest {
         }
         return result;
     }
-}
\ No newline at end of file
+}