From ce77cb81df2a0f07c93934d878ca559fd024f4e0 Mon Sep 17 00:00:00 2001
From: Rhodey Orbits <rhodey@anhonesteffort.org>
Date: Mon, 25 May 2015 14:56:15 -0700
Subject: [PATCH] move androidTest/ into new test/ directory

// FREEBIE
---
 build.gradle                                                 | 5 +----
 .../java/org/thoughtcrime/securesms/TextSecureTestCase.java  | 0
 .../securesms/database/CanonicalAddressDatabaseTest.java     | 0
 .../thoughtcrime/securesms/database/PartDatabaseTest.java    | 0
 .../org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java | 0
 .../thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java  | 0
 .../org/thoughtcrime/securesms/service/SmsListenerTest.java  | 0
 .../org/thoughtcrime/securesms/util/ListPartitionTest.java   | 0
 .../securesms/util/PhoneNumberFormatterTest.java             | 0
 .../java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java | 0
 10 files changed, 1 insertion(+), 4 deletions(-)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/TextSecureTestCase.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/service/SmsListenerTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/util/ListPartitionTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java (100%)
 rename {androidTest => test/androidTest}/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java (100%)

diff --git a/build.gradle b/build.gradle
index e228ec9cae..52dcb2d08d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -200,10 +200,7 @@ android {
             assets.srcDirs = ['assets']
         }
         androidTest {
-            java.srcDirs = ['androidTest/java']
-            resources.srcDirs = ['androidTest/java']
-            aidl.srcDirs = ['androidTest/java']
-            renderscript.srcDirs = ['androidTest/java']
+            java.srcDirs = ['test/androidTest/java']
         }
     }
 
diff --git a/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java b/test/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java
rename to test/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java b/test/androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java b/test/androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java b/test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java b/test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java b/test/androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java