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

Commit 5fbd170a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DocsUI M3: Update tests to use the new test rule" into main

parents a1f63535 97952b0b

tests/functional/com/android/documentsui/TrampolineActivityTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ import android.content.Intent 
import android.content.Intent.ACTION_GET_CONTENT

import android.os.Build.VERSION_CODES

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SdkSuppress

import androidx.test.filters.SmallTest
@@ -203,7 +201,7 @@ class TrampolineActivityTest() { 
    @RequiresFlagsEnabled(FLAG_REDIRECT_GET_CONTENT_RO)

    class RedirectTest {

        @get:Rule

        val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()

        val checkFlags = CheckAndForceMaterial3Flag()



        @Before

        fun setUp() {

tests/functional/com/android/documentsui/services/CopyJobTest.java

+3 −3
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ import static org.junit.Assert.assertFalse; 


import android.net.Uri;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.DocumentsContract.Document;



import androidx.test.filters.MediumTest;



import com.android.documentsui.rules.CheckAndForceMaterial3Flag;



import org.junit.Rule;

import org.junit.Test;
@@ -40,7 +40,7 @@ import org.junit.Test; 
public class CopyJobTest extends AbstractCopyJobTest<CopyJob> {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    public CopyJobTest() {

        super(OPERATION_COPY);

tests/functional/com/android/documentsui/services/DeleteJobTest.java

+3 −3
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ import static org.junit.Assert.assertFalse; 


import android.net.Uri;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.DocumentsContract;



import androidx.test.filters.MediumTest;



import com.android.documentsui.rules.CheckAndForceMaterial3Flag;



import org.junit.Rule;

import org.junit.Test;
@@ -42,7 +42,7 @@ import java.util.List; 
public class DeleteJobTest extends AbstractJobTest<DeleteJob> {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    @Test

    public void testDeleteFiles() throws Exception {

tests/functional/com/android/documentsui/services/MoveJobTest.java

+3 −3
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ import static com.google.common.collect.Lists.newArrayList; 


import android.net.Uri;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.DocumentsContract.Document;



import androidx.test.filters.MediumTest;



import com.android.documentsui.rules.CheckAndForceMaterial3Flag;



import org.junit.Rule;

import org.junit.Test;
@@ -37,7 +37,7 @@ import org.junit.Test; 
public class MoveJobTest extends AbstractCopyJobTest<MoveJob> {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    public MoveJobTest() {

        super(OPERATION_MOVE);