From 9dfa18aeadfa6d0e3220a98f554dae653ee1817b Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Mon, 23 Mar 2015 23:15:27 +1100
Subject: [PATCH] Make F-Droid tests runnable from Gradle.

This also makes AndroidStudio integration work better, which makes
running and debugging tests much nicer than the CLI.

Also cleaned up imports in one test, and made the symlink tests not
fail on older devices below API 19.
---
 F-Droid/build.gradle                              | 15 ++++++++++++++-
 .../src/org/fdroid/fdroid/FileCompatTest.java     |  9 +++++++--
 .../fdroid/updater/SignedRepoUpdaterTest.java     |  6 ------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index e24437876..4ea25a9c6 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -39,6 +39,8 @@ if ( !hasProperty( 'sourceDeps' ) ) {
 
         // Upstream doesn't have a binary on mavenCentral.
         compile(name: 'zipsigner')
+
+        androidTestCompile 'commons-io:commons-io:2.2'
     }
 
 } else {
@@ -76,6 +78,8 @@ if ( !hasProperty( 'sourceDeps' ) ) {
         compile 'com.android.support:support-v4:20.0.+',
                 'com.android.support:appcompat-v7:20.0.+',
                 'com.android.support:support-annotations:20.0.+'
+
+        androidTestCompile 'commons-io:commons-io:2.2'
     }
 
 }
@@ -135,7 +139,16 @@ android {
             assets.srcDirs = ['assets']
         }
 
-        instrumentTest.setRoot('test')
+        androidTest.setRoot('test')
+        androidTest {
+            manifest.srcFile 'test/AndroidManifest.xml'
+            java.srcDirs = ['test/src']
+            resources.srcDirs = ['test/src']
+            aidl.srcDirs = ['test/src']
+            renderscript.srcDirs = ['test/src']
+            res.srcDirs = ['test/res']
+            assets.srcDirs = ['test/assets']
+        }
     }
 
     buildTypes {
diff --git a/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java b/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java
index 4f1c48110..1ab615b3c 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java
@@ -25,8 +25,13 @@ public class FileCompatTest extends InstrumentationTestCase {
     }
 
     public void tearDown() {
-        assertTrue("Can't delete " + sourceFile.getAbsolutePath() + ".", sourceFile.delete());
-        assertTrue("Can't delete " + destFile.getAbsolutePath() + ".", destFile.delete());
+        if (sourceFile.exists()) {
+            assertTrue("Can't delete " + sourceFile.getAbsolutePath() + ".", sourceFile.delete());
+        }
+
+        if (destFile.exists()) {
+            assertTrue("Can't delete " + destFile.getAbsolutePath() + ".", destFile.delete());
+        }
     }
 
     public void testSymlinkRuntime() {
diff --git a/F-Droid/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java b/F-Droid/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java
index e11f9639c..e94a3faa1 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java
@@ -3,21 +3,15 @@ package org.fdroid.fdroid.updater;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Environment;
 import android.test.InstrumentationTestCase;
-import android.util.Log;
 
 import org.apache.commons.io.FileUtils;
 import org.fdroid.fdroid.TestUtils;
-import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.updater.RepoUpdater.UpdateException;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 @TargetApi(8)
 public class SignedRepoUpdaterTest extends InstrumentationTestCase {