From d3cbf48d37f4e5fdb15e5107175f0cd568306197 Mon Sep 17 00:00:00 2001
From: Beau Collins <beaucollins@gmail.com>
Date: Thu, 10 Oct 2013 11:18:54 -0700
Subject: [PATCH 1/2] Updating tests to work with gradle

Tests are now run with `gradle connectedInstrumentTest`
---
 tests/AndroidManifest.xml                     | 21 -------------------
 tests/ant.properties                          | 18 ----------------
 .../org/wordpress/android/TestUtils.java      |  0
 .../WordPressDB_NotificationsTest.java        |  0
 .../CategoryNodeInstrumentationTest.java      |  0
 tests/readme.md                               |  2 +-
 6 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 tests/AndroidManifest.xml
 delete mode 100644 tests/ant.properties
 rename tests/{src => java}/org/wordpress/android/TestUtils.java (100%)
 rename tests/{src => java}/org/wordpress/android/WordPressDB_NotificationsTest.java (100%)
 rename tests/{src => java}/org/wordpress/android/models/CategoryNodeInstrumentationTest.java (100%)

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
deleted file mode 100644
index 949724eace5c..000000000000
--- a/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.wordpress.android.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-    <!--
-    This declares that this application uses the instrumentation test runner targeting
-    the package of org.wordpress.android.  To run the tests use the command:
-    "adb shell am instrument -w org.wordpress.android.tests/android.test.InstrumentationTestRunner"
-    -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="org.wordpress.android"
-                     android:label="Tests for org.wordpress.android"/>
-</manifest>
diff --git a/tests/ant.properties b/tests/ant.properties
deleted file mode 100644
index 836edf0478e7..000000000000
--- a/tests/ant.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-tested.project.dir=../
diff --git a/tests/src/org/wordpress/android/TestUtils.java b/tests/java/org/wordpress/android/TestUtils.java
similarity index 100%
rename from tests/src/org/wordpress/android/TestUtils.java
rename to tests/java/org/wordpress/android/TestUtils.java
diff --git a/tests/src/org/wordpress/android/WordPressDB_NotificationsTest.java b/tests/java/org/wordpress/android/WordPressDB_NotificationsTest.java
similarity index 100%
rename from tests/src/org/wordpress/android/WordPressDB_NotificationsTest.java
rename to tests/java/org/wordpress/android/WordPressDB_NotificationsTest.java
diff --git a/tests/src/org/wordpress/android/models/CategoryNodeInstrumentationTest.java b/tests/java/org/wordpress/android/models/CategoryNodeInstrumentationTest.java
similarity index 100%
rename from tests/src/org/wordpress/android/models/CategoryNodeInstrumentationTest.java
rename to tests/java/org/wordpress/android/models/CategoryNodeInstrumentationTest.java
diff --git a/tests/readme.md b/tests/readme.md
index 345333c498b6..7d72476f727a 100644
--- a/tests/readme.md
+++ b/tests/readme.md
@@ -2,7 +2,7 @@
 
 ## Run tests ##
 
-    $ ant debug && ant installd && ant test
+    $ ./gradlew cIT
 
 ## Dump a test database ##
 

From a8a0029bd6409d4a0c58b62bdc31f1aee9ef8a72 Mon Sep 17 00:00:00 2001
From: Beau Collins <beaucollins@gmail.com>
Date: Thu, 10 Oct 2013 12:41:25 -0700
Subject: [PATCH 2/2] Adding notes about using Android Studio IDE

---
 readme.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 86267aae8368..655a2b336ec9 100644
--- a/readme.md
+++ b/readme.md
@@ -17,6 +17,15 @@ WordPress Mobile Developer Handbook: <http://make.wordpress.org/mobile/handbook/
 
 ## Build Instructions ##
 
+### Android Studio ###
+
+This project now supports the Android Studio IDE. To get started import the
+project as a Gradle project.
+
+All dependencies should be installed automatically.
+
+### Eclipse ###
+
 The full build instructions (including instructions for using Eclipse) can be
 found on the [Tutorials &amp; Guides][] page of the mobile developer handbook.
 Instructions for building on the command line with ant can be found below.
@@ -49,5 +58,4 @@ Line][command-line].
 
 ## Run Unittests ##
 
-    cd tests
-    ant debug && ant installd && ant test
+    $ ./gradlew cIT