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

Commit fc5e0ba6 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am b9f170ff: am b4db7923: Merge "Delete some obsolete test code."

* commit 'b9f170ff':
  Delete some obsolete test code.
parents 82f91da7 b9f170ff
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -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;
+0 −21
Original line number Diff line number Diff line
@@ -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;
@@ -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;
    }
}