Remove all of the ext stuff

Author: aslakhellesoy

android/src/cucumber/api/android/CucumberInstrumentation.java

@@ -12,17 +12,18 @@
 import cucumber.runtime.RuntimeOptions;
 import cucumber.runtime.android.AndroidFormatter;
 import cucumber.runtime.android.AndroidObjectFactory;
-import cucumber.runtime.android.AndroidReflections;
 import cucumber.runtime.android.AndroidResourceLoader;
+import cucumber.runtime.android.DexReflections;
 import cucumber.runtime.io.Reflections;
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.java.JavaBackend;
 import cucumber.runtime.model.*;
-import ext.android.test.ClassPathPackageInfoSource;
+import dalvik.system.DexFile;
 import gherkin.formatter.Formatter;
 import gherkin.formatter.Reporter;
 import gherkin.formatter.model.*;
 
+import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -53,7 +54,7 @@ public class CucumberInstrumentation extends Instrumentation {
     public void onCreate(Bundle arguments) {
         super.onCreate(arguments);
 
-        if(arguments == null) {
+        if (arguments == null) {
             throw new CucumberException("No arguments");
         }
         Log.d(TAG, "************** KEYS **************");
@@ -73,16 +74,14 @@ class => cucumber.android.test.CucumberActivitySteps
         */
 
 
-
         // Maven: [log, coverage, coverageFile, debug]
         // IDEA:  [log, coverage, coverageFile, debug]
 
         Context context = getContext();
         classLoader = context.getClassLoader();
 
         String apkPath = context.getPackageCodePath();
-        ClassPathPackageInfoSource.setApkPaths(new String[]{apkPath});
-        ClassPathPackageInfoSource source = new ClassPathPackageInfoSource();
+        Reflections reflections = new DexReflections(newDexFile(apkPath));
 
         // For glue and features either use the provided arguments or try to find a RunWithCucumber annotated class.
         // If nothing works, default values will be used instead.
@@ -112,8 +111,7 @@ class => cucumber.android.test.CucumberActivitySteps
                 Log.w(TAG, e.toString());
             }
         } else {
-//            throw new CucumberException("bad args");
-            for (Class<?> clazz : source.getPackageInfo(context.getPackageName()).getTopLevelClassesRecursive()) {
+            for (Class<?> clazz : reflections.getDescendants(Object.class, context.getPackageName())) {
                 if (readRunWithCucumberAnnotation(clazz)) break;
             }
         }
@@ -127,15 +125,21 @@ class => cucumber.android.test.CucumberActivitySteps
 
         resourceLoader = new AndroidResourceLoader(context);
 
-        Reflections androidReflections = new AndroidReflections(source);
-
         List<Backend> backends = new ArrayList<Backend>();
-        backends.add(new JavaBackend(new AndroidObjectFactory(this), androidReflections));
+        backends.add(new JavaBackend(new AndroidObjectFactory(this), reflections));
         runtime = new Runtime(resourceLoader, classLoader, backends, runtimeOptions);
 
         start();
     }
 
+    private DexFile newDexFile(String apkPath) {
+        try {
+            return new DexFile(apkPath);
+        } catch (IOException e) {
+            throw new CucumberException("Failed to open " + apkPath);
+        }
+    }
+
     /**
      * @return true if the class is RunWithCucumber annotated, false otherwise
      */

android/src/cucumber/runtime/android/AndroidReflections.java

@@ -10,6 +10,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Loads non-class resources such as .feature files.
+ */
 public class AndroidResourceLoader implements ResourceLoader {
     private Context context;
 
@@ -25,20 +28,20 @@ public Iterable<Resource> resources(String path, String suffix) {
             addResourceRecursive(resources, assetManager, path, suffix);
             return resources;
         } catch (IOException e) {
-            throw new CucumberException("Error loading resources.", e);
+            throw new CucumberException("Error loading resources from " + path + " with suffix " + suffix, e);
         }
     }
 
-    private void addResourceRecursive(List<Resource> res, AssetManager am, String path, String suffix) throws IOException {
+    private void addResourceRecursive(List<Resource> resources, AssetManager assetManager, String path, String suffix) throws IOException {
         if (path.endsWith(suffix)) {
-            res.add(new AndroidResource(context, path));
+            resources.add(new AndroidResource(context, path));
         } else {
-            for (String name : am.list(path)) {
+            for (String name : assetManager.list(path)) {
                 if (name.endsWith(suffix)) {
                     Resource as = new AndroidResource(context, String.format("%s/%s", path, name));
-                    res.add(as);
+                    resources.add(as);
                 } else {
-                    addResourceRecursive(res, am, String.format("%s/%s", path, name), suffix);
+                    addResourceRecursive(resources, assetManager, String.format("%s/%s", path, name), suffix);
                 }
             }
         }

android/src/cucumber/runtime/android/AndroidResourceLoader.java

@@ -0,0 +1,74 @@
+package cucumber.runtime.android;
+
+import cucumber.runtime.CucumberException;
+import cucumber.runtime.io.Reflections;
+import dalvik.system.DexFile;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.List;
+
+public class DexReflections implements Reflections {
+    private static final ClassLoader CLASS_LOADER = DexReflections.class.getClassLoader();
+    private final DexFile dexFile;
+
+    public DexReflections(DexFile dexFile) {
+        this.dexFile = dexFile;
+    }
+
+    @Override
+    public Collection<Class<? extends Annotation>> getAnnotations(String packageName) {
+        return getDescendants(Annotation.class, packageName);
+    }
+
+    @Override
+    public <T> Collection<Class<? extends T>> getDescendants(Class<T> parentType, String packageName) {
+        List<Class<? extends T>> result = new ArrayList<Class<? extends T>>();
+
+        Enumeration<String> entries = dexFile.entries();
+        while (entries.hasMoreElements()) {
+            String className = entries.nextElement();
+            if (isInPackage(className, packageName) && !isGenerated(className)) {
+                Class<? extends T> clazz = loadClass(className);
+                if (clazz != null && !parentType.equals(clazz) && parentType.isAssignableFrom(clazz)) {
+                    result.add(clazz.asSubclass(parentType));
+                }
+            }
+        }
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> Class<? extends T> loadClass(String className) {
+        try {
+            return (Class<? extends T>) Class.forName(className, false, CLASS_LOADER);
+        } catch (ClassNotFoundException e) {
+            throw new CucumberException(e);
+        }
+    }
+
+    private boolean isInPackage(String className, String packageName) {
+        int lastDotIndex = className.lastIndexOf(".");
+        String classPackage = lastDotIndex == -1 ? "" : className.substring(0, lastDotIndex);
+        return classPackage.startsWith(packageName);
+    }
+
+    private boolean isGenerated(String className) {
+        int lastDotIndex = className.lastIndexOf(".");
+        String shortName = lastDotIndex == -1 ? className : className.substring(lastDotIndex + 1);
+        return shortName.equals("Manifest") || shortName.equals("R") || shortName.startsWith("R$");
+    }
+
+
+    @Override
+    public <T> T instantiateExactlyOneSubclass(Class<T> parentType, String packageName, Class[] constructorParams, Object[] constructorArgs) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> Collection<? extends T> instantiateSubclasses(Class<T> parentType, String packageName, Class[] constructorParams, Object[] constructorArgs) {
+        throw new UnsupportedOperationException();
+    }
+}