Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
cd32b42e1c
@@ -25,11 +25,11 @@ import android.os.RemoteException;
|
|||||||
import android.os.ServiceManager;
|
import android.os.ServiceManager;
|
||||||
import android.os.StatFs;
|
import android.os.StatFs;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
|
import android.support.test.filters.LargeTest;
|
||||||
|
import android.support.test.filters.MediumTest;
|
||||||
|
import android.support.test.filters.SmallTest;
|
||||||
|
import android.support.test.filters.Suppress;
|
||||||
import android.test.AndroidTestCase;
|
import android.test.AndroidTestCase;
|
||||||
import android.test.suitebuilder.annotation.LargeTest;
|
|
||||||
import android.test.suitebuilder.annotation.MediumTest;
|
|
||||||
import android.test.suitebuilder.annotation.SmallTest;
|
|
||||||
import android.test.suitebuilder.annotation.Suppress;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -728,6 +728,7 @@ public class AppCacheTest extends AndroidTestCase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress
|
||||||
@LargeTest
|
@LargeTest
|
||||||
public void testClearApplicationUserDataWithTestData() throws Exception {
|
public void testClearApplicationUserDataWithTestData() throws Exception {
|
||||||
File cacheDir = mContext.getCacheDir();
|
File cacheDir = mContext.getCacheDir();
|
||||||
@@ -741,6 +742,7 @@ public class AppCacheTest extends AndroidTestCase {
|
|||||||
verifyUserDataCleared(getDataDir());
|
verifyUserDataCleared(getDataDir());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress
|
||||||
@SmallTest
|
@SmallTest
|
||||||
public void testClearApplicationUserDataWithNoTestData() throws Exception {
|
public void testClearApplicationUserDataWithNoTestData() throws Exception {
|
||||||
assertTrue(invokePMClearApplicationUserData());
|
assertTrue(invokePMClearApplicationUserData());
|
||||||
@@ -748,6 +750,7 @@ public class AppCacheTest extends AndroidTestCase {
|
|||||||
verifyUserDataCleared(getDataDir());
|
verifyUserDataCleared(getDataDir());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress
|
||||||
@LargeTest
|
@LargeTest
|
||||||
public void testClearApplicationUserDataNoObserver() throws Exception {
|
public void testClearApplicationUserDataNoObserver() throws Exception {
|
||||||
getPm().clearApplicationUserData(mContext.getPackageName(), null, UserHandle.myUserId());
|
getPm().clearApplicationUserData(mContext.getPackageName(), null, UserHandle.myUserId());
|
||||||
|
|||||||
Reference in New Issue
Block a user