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

Merge "Update scrubClass() to match CoreTestRunner."

Browse Source
This commit is contained in:
Jeff Sharkey
2013-02-15 00:30:25 +00:00
committed by Android (Google) Code Review
parent c69bce2e41 dd86cb7caf
commit 7b3745fe9a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/test/AndroidTestCase.java
View File

@@ -20,9 +20,11 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
/** /**
* Extend this if you need to access Resources or other things that depend on Activity Context. * Extend this if you need to access Resources or other things that depend on Activity Context.
@@ -152,11 +154,11 @@ public class AndroidTestCase extends TestCase {
* @throws IllegalAccessException * @throws IllegalAccessException
*/ */
protected void scrubClass(final Class<?> testCaseClass) protected void scrubClass(final Class<?> testCaseClass)
throws IllegalAccessException { throws IllegalAccessException {
final Field[] fields = getClass().getDeclaredFields(); final Field[] fields = getClass().getDeclaredFields();
for (Field field : fields) { for (Field field : fields) {
final Class<?> fieldClass = field.getDeclaringClass(); if (!field.getType().isPrimitive() &&
if (testCaseClass.isAssignableFrom(fieldClass) && !field.getType().isPrimitive()) { !Modifier.isStatic(field.getModifiers())) {
try { try {
field.setAccessible(true); field.setAccessible(true);
field.set(this, null); field.set(this, null);
@@ -170,6 +172,4 @@ public class AndroidTestCase extends TestCase {
} }
} }
} }
} }