Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b4db7923818393c5c839dba0d43bec36da98759c':
  Delete some obsolete test code.
This commit is contained in:
Narayan Kamath
2015-07-14 11:05:07 +00:00
committed by Android Git Automerger
parent ad4a285af6 b4db792381
commit b9f170ff99
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java
View File

@@ -27,12 +27,9 @@ import android.provider.MediaStore.Video;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import dalvik.annotation.TestTargetClass;
import org.easymock.EasyMock; import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher; import org.easymock.IArgumentMatcher;
@TestTargetClass(MediaInserter.class)
public class MediaInserterTest extends InstrumentationTestCase { public class MediaInserterTest extends InstrumentationTestCase {
private MediaInserter mMediaInserter; private MediaInserter mMediaInserter;

21
test-runner/src/android/test/InstrumentationCoreTestRunner.java
View File

@@ -21,12 +21,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.List; 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.AssertionFailedError;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
@@ -192,19 +186,4 @@ public class InstrumentationCoreTestRunner extends InstrumentationTestRunner {
return runner; 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;
}
} }