From a484c0381611ed08874d6fa4b2c3d1d1368d51fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 19 Apr 2016 21:36:37 +0100
Subject: [PATCH] PMD: Re-enable on test files

This used to be the case, which is why only minimal changes were
required to bring it back. This also makes it take the same files that
checkstyle does, which is more consistent.
---
 app/build.gradle                                             | 2 +-
 .../java/android/test/ProviderTestCase2MockContext.java      | 5 +++++
 .../androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java  | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b680dcd98..e4c4fe60f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -218,7 +218,7 @@ task pmd(type: Pmd, dependsOn: assembleDebug) {
         'java-migrating',
         //'java-unnecessary', // too nitpicky with parenthesis
     ]
-    source 'src/main/java'
+    source 'src/main/java', 'src/test/java', 'src/androidTest/java'
     include '**/*.java'
 }
 
diff --git a/app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java b/app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java
index 03ca4a982..659fba2f3 100644
--- a/app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java
+++ b/app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java
@@ -27,6 +27,9 @@ import android.os.Build;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockContext;
 
+import org.junit.After;
+import org.junit.Before;
+
 import java.io.File;
 
 /**
@@ -132,6 +135,7 @@ public abstract class ProviderTestCase2MockContext<T extends ContentProvider> ex
      * @throws Exception
      */
     @Override
+    @Before
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -165,6 +169,7 @@ public abstract class ProviderTestCase2MockContext<T extends ContentProvider> ex
      * {@link android.content.ContentProvider} represented by mProvider.
      */
     @Override
+    @After
     protected void tearDown() throws Exception {
         shutdownProvider();
         super.tearDown();
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java
index 0d1468511..c706265e9 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(AndroidJUnit4.class)
 public class RepoUpdaterTest {
-    private static final String TAG = "RepoUpdaterTest";
 
     private Context context;
     private RepoUpdater repoUpdater;