Merge "-Added instructions to README.md on how to run unit tests. -Modified DexMakerTest.getDataDirectory() and FibonacciMaker.getDataDirectory() to use code that does not rely on Android framework jars being in the class path. This makes unit testing much simpler."

2 files changed, 10 insertions, 10 deletions

diff --git a/src/test/java/com/google/dexmaker/DexMakerTest.java b/src/test/java/com/google/dexmaker/DexMakerTest.java
index e7b6304..2b7a27b 100644
--- a/src/test/java/com/google/dexmaker/DexMakerTest.java
+++ b/src/test/java/com/google/dexmaker/DexMakerTest.java
@@ -2006,11 +2006,11 @@ public final class DexMakerTest extends TestCase {
         throw new IllegalStateException("no call() method");
     }
 
-    public static File getDataDirectory() throws Exception {
-        Class<?> environmentClass = Class.forName("android.os.Environment");
-        Method method = environmentClass.getMethod("getDataDirectory");
-        Object dataDirectory = method.invoke(null);
-        return (File) dataDirectory;
+    public static File getDataDirectory() {
+        String envVariable = "ANDROID_DATA";
+        String defaultLoc = "/data";
+        String path = System.getenv(envVariable);
+        return path == null ? new File(defaultLoc) : new File(path);
     }
 
     private Class<?> generateAndLoad() throws Exception {
diff --git a/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java b/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
index e5ecf8c..ced3d53 100644
--- a/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
+++ b/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
@@ -69,10 +69,10 @@ public final class FibonacciMaker {
         System.out.println(fibMethod.invoke(null, 8));
     }
 
-    public static File getDataDirectory() throws Exception {
-        Class<?> environmentClass = Class.forName("android.os.Environment");
-        Method method = environmentClass.getMethod("getDataDirectory");
-        Object dataDirectory = method.invoke(null);
-        return (File) dataDirectory;
+    public static File getDataDirectory() {
+        String envVariable = "ANDROID_DATA";
+        String defaultLoc = "/data";
+        String path = System.getenv(envVariable);
+        return path == null ? new File(defaultLoc) : new File(path);
     }
 }