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

Commit b1ac3142 authored Jan 28, 2016 by Stephan Linzner

Revert "Deprecated platform Android testing APIs"

This reverts commit d46a7d0d.

Change-Id: I4e4079d17f3bcdde7dc84e440a2168bb3e6d89d3

parent d46a7d0d

core/java/android/test/AndroidTestCase.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -29,13 +29,7 @@ import java.lang.reflect.Modifier;

		/**
		* Extend this if you need to access Resources or other things that depend on Activity Context.
		*
		* @deprecated Use
		* <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
		* InstrumentationRegistry</a> instead. New tests should be written using the
		* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
		*/
		@Deprecated
		public class AndroidTestCase extends TestCase {

		protected Context mContext;

core/java/android/test/FlakyTest.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -26,13 +26,7 @@ import java.lang.annotation.ElementType;
		* test methods. When the annotation is present, the test method is re-executed if
		* the test fails. The total number of executions is specified by the tolerance and
		* defaults to 1.
		*
		* @deprecated Use
		* <a href="{@docRoot}reference/android/support/test/filters/FlakyTest.html">
		* FlakyTest</a> instead. New tests should be written using the
		* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
		*/
		@Deprecated
		@Target(ElementType.METHOD)
		@Retention(RetentionPolicy.RUNTIME)
		public @interface FlakyTest {

core/java/android/test/InstrumentationTestCase.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -32,13 +32,7 @@ import junit.framework.TestCase;

		/**
		* A test case that has access to {@link Instrumentation}.
		*
		* @deprecated Use
		* <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
		* InstrumentationRegistry</a> instead. New tests should be written using the
		* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
		*/
		@Deprecated
		public class InstrumentationTestCase extends TestCase {

		private Instrumentation mInstrumentation;

core/java/android/test/InstrumentationTestSuite.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -25,13 +25,7 @@ import junit.framework.TestResult;
		/**
		* A {@link junit.framework.TestSuite} that injects {@link android.app.Instrumentation} into
		* {@link InstrumentationTestCase} before running them.
		*
		* @deprecated Use
		* <a href="{@docRoot}reference/android/support/test/InstrumentationRegistry.html">
		* InstrumentationRegistry</a> instead. New tests should be written using the
		* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
		*/
		@Deprecated
		public class InstrumentationTestSuite extends TestSuite {

		private final Instrumentation mInstrumentation;

core/java/android/test/PerformanceTestCase.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ package android.test;
		* If you want your test to be used as a performance test, you must
		* implement this interface.
		*/
		@Deprecated
		public interface PerformanceTestCase
		{
		/**