Loading media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java +0 −3 Original line number Diff line number Diff line Loading @@ -27,12 +27,9 @@ import android.provider.MediaStore.Video; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; import dalvik.annotation.TestTargetClass; import org.easymock.EasyMock; import org.easymock.IArgumentMatcher; @TestTargetClass(MediaInserter.class) public class MediaInserterTest extends InstrumentationTestCase { private MediaInserter mMediaInserter; Loading test-runner/src/android/test/InstrumentationCoreTestRunner.java +0 −21 Original line number Diff line number Diff line Loading @@ -21,12 +21,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import com.android.internal.util.Predicate; import com.android.internal.util.Predicates; import dalvik.annotation.BrokenTest; import dalvik.annotation.SideEffect; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; Loading Loading @@ -192,19 +186,4 @@ public class InstrumentationCoreTestRunner extends InstrumentationTestRunner { return runner; } @Override List<Predicate<TestMethod>> getBuilderRequirements() { List<Predicate<TestMethod>> builderRequirements = super.getBuilderRequirements(); Predicate<TestMethod> brokenTestPredicate = Predicates.not(new HasAnnotation(BrokenTest.class)); builderRequirements.add(brokenTestPredicate); if (!singleTest) { Predicate<TestMethod> sideEffectPredicate = Predicates.not(new HasAnnotation(SideEffect.class)); builderRequirements.add(sideEffectPredicate); } return builderRequirements; } } Loading
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java +0 −3 Original line number Diff line number Diff line Loading @@ -27,12 +27,9 @@ import android.provider.MediaStore.Video; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; import dalvik.annotation.TestTargetClass; import org.easymock.EasyMock; import org.easymock.IArgumentMatcher; @TestTargetClass(MediaInserter.class) public class MediaInserterTest extends InstrumentationTestCase { private MediaInserter mMediaInserter; Loading
test-runner/src/android/test/InstrumentationCoreTestRunner.java +0 −21 Original line number Diff line number Diff line Loading @@ -21,12 +21,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import com.android.internal.util.Predicate; import com.android.internal.util.Predicates; import dalvik.annotation.BrokenTest; import dalvik.annotation.SideEffect; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; Loading Loading @@ -192,19 +186,4 @@ public class InstrumentationCoreTestRunner extends InstrumentationTestRunner { return runner; } @Override List<Predicate<TestMethod>> getBuilderRequirements() { List<Predicate<TestMethod>> builderRequirements = super.getBuilderRequirements(); Predicate<TestMethod> brokenTestPredicate = Predicates.not(new HasAnnotation(BrokenTest.class)); builderRequirements.add(brokenTestPredicate); if (!singleTest) { Predicate<TestMethod> sideEffectPredicate = Predicates.not(new HasAnnotation(SideEffect.class)); builderRequirements.add(sideEffectPredicate); } return builderRequirements; } }