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

Commit c89cc441 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Add test size annotations to docsui tests."

parents 25bfb2b3 53c774b5

packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java

+3 −6
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.provider.DocumentsContract.Document; 
import android.test.MoreAsserts;

import android.test.ServiceTestCase;

import android.test.mock.MockContentResolver;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Log;



import com.android.documentsui.model.DocumentInfo;
@@ -52,6 +54,7 @@ import java.util.concurrent.CountDownLatch; 
import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeoutException;



@MediumTest

public class CopyTest extends ServiceTestCase<CopyService> {



    public CopyTest() {
@@ -89,9 +92,6 @@ public class CopyTest extends ServiceTestCase<CopyService> { 
        super.tearDown();

    }



    /**

     * Test copying a single file.

     */

    public void testCopyFile() throws Exception {

        String srcPath = "/test0.txt";

        Uri testFile = mStorage.createFile(SRC_ROOT, srcPath, "text/plain",
@@ -131,9 +131,6 @@ public class CopyTest extends ServiceTestCase<CopyService> { 
        MoreAsserts.assertEquals("Moved file contents differ", testContent.getBytes(), dstContent);

    }



    /**

     * Test copying multiple files.

     */

    public void testCopyMultipleFiles() throws Exception {

        String testContent[] = {

                "The five boxing wizards jump quickly",

packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java

+2 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ import android.support.test.uiautomator.Configurator; 
import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import android.util.Log;

import android.view.MotionEvent;



import com.android.documentsui.model.RootInfo;



@LargeTest

public class FilesActivityUiTest extends InstrumentationTestCase {



    private static final int TIMEOUT = 5000;

packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.provider.DocumentsContract.Document; 
import android.support.v7.widget.RecyclerView;

import android.test.AndroidTestCase;

import android.test.mock.MockContentResolver;

import android.test.suitebuilder.annotation.SmallTest;

import android.view.ViewGroup;



import com.android.documentsui.DirectoryResult;
@@ -34,6 +35,7 @@ import com.android.documentsui.model.DocumentInfo; 


import java.util.List;



@SmallTest

public class DirectoryFragmentModelTest extends AndroidTestCase {



    private static final int ITEM_COUNT = 5;

packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.documentsui.dirlist; 


import android.support.v7.widget.RecyclerView;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.SparseBooleanArray;

import android.view.View;

import android.view.ViewGroup;
@@ -32,6 +33,7 @@ import java.util.HashSet; 
import java.util.List;

import java.util.Set;



@SmallTest

public class MultiSelectManagerTest extends AndroidTestCase {



    private static final List<String> items;
@@ -163,7 +165,6 @@ public class MultiSelectManagerTest extends AndroidTestCase { 
        assertRangeSelection(14, 17);

    }





    public void testSingleTapUp_ShiftReversesSelectionDirection() {

        longPress(7);

        shiftTap(17);

packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java

+2 −0
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.support.v7.widget.RecyclerView.OnScrollListener;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.SparseBooleanArray;

import android.view.View;



import com.android.documentsui.dirlist.MultiSelectManager.GridModel;



@SmallTest

public class MultiSelectManager_GridModelTest extends AndroidTestCase {



    private static final int VIEW_PADDING_PX = 5;