diff options
Diffstat (limited to 'test-runner/src/android/test/suitebuilder')
3 files changed, 6 insertions, 11 deletions
diff --git a/test-runner/src/android/test/suitebuilder/TestPredicates.java b/test-runner/src/android/test/suitebuilder/TestPredicates.java index d814e0b..47aca55 100644 --- a/test-runner/src/android/test/suitebuilder/TestPredicates.java +++ b/test-runner/src/android/test/suitebuilder/TestPredicates.java @@ -17,7 +17,6 @@ package android.test.suitebuilder; import android.test.InstrumentationTestCase; -import android.test.PerformanceTestBase; import android.test.suitebuilder.annotation.HasAnnotation; import android.test.suitebuilder.annotation.Suppress; import android.test.suitebuilder.annotation.LargeTest; @@ -43,7 +42,5 @@ public class TestPredicates { public static final Predicate<TestMethod> SELECT_LARGE = new HasAnnotation(LargeTest.class); public static final Predicate<TestMethod> REJECT_SUPPRESSED = Predicates.not(new HasAnnotation(Suppress.class)); - public static final Predicate<TestMethod> REJECT_PERFORMANCE = - Predicates.not(new AssignableFrom(PerformanceTestBase.class)); } diff --git a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java index 428905e..28f7216 100644 --- a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java +++ b/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java @@ -24,7 +24,6 @@ import com.android.internal.util.Predicate; import com.google.android.collect.Lists; import static android.test.suitebuilder.TestGrouping.SORT_BY_FULLY_QUALIFIED_NAME; import static android.test.suitebuilder.TestPredicates.REJECT_SUPPRESSED; -import static android.test.suitebuilder.TestPredicates.REJECT_PERFORMANCE; import junit.framework.Test; import junit.framework.TestCase; @@ -71,9 +70,9 @@ public class TestSuiteBuilder { this.testCases = Lists.newArrayList(); addRequirements(REJECT_SUPPRESSED); } - + /** @hide pending API Council approval */ - public TestSuiteBuilder addTestClassByName(String testClassName, String testMethodName, + public TestSuiteBuilder addTestClassByName(String testClassName, String testMethodName, Context context) { AndroidTestRunner atr = new AndroidTestRunner(); @@ -83,7 +82,7 @@ public class TestSuiteBuilder { this.testCases.addAll(atr.getTestCases()); return this; } - + /** @hide pending API Council approval */ public TestSuiteBuilder addTestSuite(TestSuite testSuite) { for (TestCase testCase : (List<TestCase>) TestCaseUtil.getTests(testSuite, true)) { @@ -242,7 +241,7 @@ public class TestSuiteBuilder { /** * @return the test package that represents the packages that were included for our test suite. - * + * * {@hide} Not needed for 1.0 SDK. */ protected TestGrouping getTestGrouping() { @@ -262,7 +261,7 @@ public class TestSuiteBuilder { addSuiteIfNecessary(testMethod.getEnclosingClassname()); suiteForCurrentClass.addTest(testMethod.createTest()); } - + private void addTest(Test test) { addSuiteIfNecessary(test.getClass().getName()); suiteForCurrentClass.addTest(test); diff --git a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java index 8cf4c86..a746b35 100644 --- a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java +++ b/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java @@ -18,7 +18,7 @@ package android.test.suitebuilder; /** * A suite builder that finds unit tests. - * + * * {@hide} Not needed for 1.0 SDK. */ public class UnitTestSuiteBuilder extends TestSuiteBuilder { @@ -31,6 +31,5 @@ public class UnitTestSuiteBuilder extends TestSuiteBuilder { public UnitTestSuiteBuilder(String name, ClassLoader classLoader) { super(name, classLoader); addRequirements(TestPredicates.REJECT_INSTRUMENTATION); - addRequirements(TestPredicates.REJECT_PERFORMANCE); } } |