Moved SyncthingServiceTest back to androidTest

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
     }
@@ -23,8 +23,7 @@ dependencies {
     compile 'com.google.zxing:android-integration:3.3.0'
     compile 'com.google.code.gson:gson:2.7'
     compile 'org.mindrot:jbcrypt:0.3m'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.1.2'
+    androidTestCompile 'com.android.support.test:rules:0.5'
 }
 
 project.archivesBaseName = 'syncthing'

src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceTest.java

@@ -1,49 +1,55 @@
-package com.nutomic.syncthingandroid.syncthing;
+package com.nutomic.syncthingandroid.test.syncthing;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import com.nutomic.syncthingandroid.BuildConfig;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ServiceTestRule;
+
+import com.nutomic.syncthingandroid.syncthing.SyncthingService;
+import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;
 import com.nutomic.syncthingandroid.util.ConfigXml;
+
+import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.*;
+import java.util.concurrent.TimeoutException;
 
 /**
  * These tests assume that syncthing keys have already been generated. If not, tests may fail
  * because startup takes too long.
  */
-@RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
 public class SyncthingServiceTest {
 
+    @Rule
+    public final ServiceTestRule mServiceRule = new ServiceTestRule();
+
     private SyncthingService mService;
 
     @Before
-    public void setup() {
-        mService = Robolectric.buildService(SyncthingService.class).get();
-        mService.onCreate();
+    public void setup() throws TimeoutException {
+        Intent intent =
+                new Intent(InstrumentationRegistry.getTargetContext(), SyncthingService.class);
+        SyncthingServiceBinder binder = (SyncthingServiceBinder) mServiceRule.bindService(intent);
+        mService = binder.getService();
     }
 
     @Test
     public void testFirstStart() {
-        assertTrue(mService.isFirstStart());
+        Assert.assertTrue(mService.isFirstStart());
     }
 
     @Test
     public void testNotFirstStart() throws IOException {
         new File(mService.getFilesDir(), SyncthingService.PUBLIC_KEY_FILE).createNewFile();
-        assertFalse(mService.isFirstStart());
+        Assert.assertFalse(mService.isFirstStart());
     }
 
     @Test
@@ -57,7 +63,7 @@ public class SyncthingServiceTest {
             }
         });
         latch.await(1, TimeUnit.SECONDS);
-        assertNotNull(mService);
+        Assert.assertNotNull(mService);
     }
 
     @Test
@@ -71,7 +77,7 @@ public class SyncthingServiceTest {
             privateKey.createNewFile();
             publicKey.createNewFile();
         } catch (IOException e) {
-            fail();
+            Assert.fail();
         }
 
         mService.exportConfig();
@@ -80,10 +86,10 @@ public class SyncthingServiceTest {
         privateKey.delete();
         publicKey.delete();
 
-        assertTrue(mService.importConfig());
-        assertTrue(config.exists());
-        assertTrue(privateKey.exists());
-        assertTrue(publicKey.exists());
+        Assert.assertTrue(mService.importConfig());
+        Assert.assertTrue(config.exists());
+        Assert.assertTrue(privateKey.exists());
+        Assert.assertTrue(publicKey.exists());
     }
 
     @Test
@@ -92,8 +98,8 @@ public class SyncthingServiceTest {
             @Override
             public void run() {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mService);
-                assertNotNull(sp.getString("gui_user", null));
-                assertEquals(20, sp.getString("gui_password", null).length());
+                Assert.assertNotNull(sp.getString("gui_user", null));
+                Assert.assertEquals(20, sp.getString("gui_password", null).length());
             }
         }, 5000);
     }