Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87571b75 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Try Alternate Constructor for Single Method Tests 

Some tests do not have a no argument constructor. If they don't
have one, then try a constructor with a String argument. A lot
of CTS tests from open source projects have different practices
and may not have a no arg constructor.

Change-Id: I87c490c22347a2f4b03c3125308be0d2259f9208
parent 5eeee5e0

test-runner/src/android/test/AndroidTestRunner.java

+23 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import junit.framework.TestResult; 
import junit.framework.TestSuite;

import junit.runner.BaseTestRunner;



import java.lang.reflect.Constructor;

import java.lang.reflect.InvocationTargetException;

import java.util.List;
@@ -91,15 +92,35 @@ public class AndroidTestRunner extends BaseTestRunner { 


    private TestCase buildSingleTestMethod(Class testClass, String testMethodName) {

        try {

            TestCase testCase = (TestCase) testClass.newInstance();

            Constructor c = testClass.getConstructor();

            return newSingleTestMethod(testClass, testMethodName, c);

        } catch (NoSuchMethodException e) {

        }



        try {

            Constructor c = testClass.getConstructor(String.class);

            return newSingleTestMethod(testClass, testMethodName, c, testMethodName);

        } catch (NoSuchMethodException e) {

        }



        return null;

    }



    private TestCase newSingleTestMethod(Class testClass, String testMethodName,

            Constructor constructor, Object... args) {

        try {

            TestCase testCase = (TestCase) constructor.newInstance(args);

            testCase.setName(testMethodName);

            return testCase;

        } catch (IllegalAccessException e) {

            runFailed("Could not access test class. Class: " + testClass.getName());

        } catch (InstantiationException e) {

            runFailed("Could not instantiate test class. Class: " + testClass.getName());

        } catch (IllegalArgumentException e) {

            runFailed("Illegal argument passed to constructor. Class: " + testClass.getName());

        } catch (InvocationTargetException e) {

            runFailed("Constructor thew an exception. Class: " + testClass.getName());

        }



        return null;

    }