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

Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-04 02:51:58 +00:00
committed by Android (Google) Code Review
parent 5fafafaba2 68e882ce7f
commit 2ecf42f96c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/servicestests/src/com/android/server/wm/TaskSnapshotCacheTest.java
View File

@@ -20,6 +20,7 @@ import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNull;
import android.platform.test.annotations.Presubmit;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
@@ -33,8 +34,7 @@ import org.junit.runner.RunWith;
* runtest frameworks-services -c com.android.server.wm.TaskSnapshotCacheTest
*/
@SmallTest
// TODO(b/35196891): Add back to presubmit once the bug is fixed.
//@Presubmit
@Presubmit
@RunWith(AndroidJUnit4.class)
public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase {

6
services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java
View File

@@ -68,7 +68,11 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase {
}
private void cleanDirectory() {
for (File file : new File(sFilesDir, "snapshots").listFiles()) {
final File[] files = new File(sFilesDir, "snapshots").listFiles();
if (files == null) {
return;
}
for (File file : files) {
if (!file.isDirectory()) {
file.delete();
}