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

Commit 15c8801c authored by Luciano Pacheco's avatar Luciano Pacheco
Browse files

DocsUI M3: Update all tests to use the new test rule 

Update all tests that were using DeviceFlagsValueProvider to use the new
CheckFlagM3.

This is a preparation to use the config force_material3 combined with
the flag use_material3.

Bug: 403375773
Test: atest DocumentsUIGoogleTests
Flag: com.android.documentsui.flags.use_material3
Change-Id: I4d626b012bc09ca0c5380abceda5f3d3356c43a7
parent f7275578

tests/functional/com/android/documentsui/ArchiveUiTest.java

+2 −3
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ import static com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_READ_ONLY; 


import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

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

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



import androidx.test.filters.LargeTest;



import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.rules.CheckAndForceMaterial3Flag;

import com.android.documentsui.rules.TestFilesRule;



import org.junit.Rule;
@@ -35,7 +34,7 @@ import org.junit.Test; 
public class ArchiveUiTest extends ActivityTestJunit4<FilesActivity> {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    @Rule

    public final TestFilesRule mTestFilesRule = new TestFilesRule();

tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java

+2 −3
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import static com.android.documentsui.flags.Flags.FLAG_USE_MATERIAL3; 
import android.content.pm.PackageManager;

import android.platform.test.annotations.RequiresFlagsDisabled;

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.LargeTest;
@@ -32,6 +30,7 @@ import androidx.test.filters.LargeTest; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.filters.HugeLongTest;

import com.android.documentsui.rules.CheckAndForceMaterial3Flag;

import com.android.documentsui.rules.TestFilesRule;



import org.junit.Rule;
@@ -43,7 +42,7 @@ import org.junit.runner.RunWith; 
public class FilesActivityDefaultsUiTest extends ActivityTestJunit4<FilesActivity> {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    @Rule

    public final TestFilesRule mTestFilesRule = new TestFilesRule(/* skipCreation */ true);

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

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ package com.android.documentsui 


import android.content.Intent

import android.platform.test.annotations.RequiresFlagsEnabled

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

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

import android.view.View

import android.widget.ProgressBar

import androidx.test.espresso.Espresso
@@ -38,6 +36,7 @@ import androidx.test.platform.app.InstrumentationRegistry 
import com.android.documentsui.files.FilesActivity

import com.android.documentsui.flags.Flags.FLAG_USE_MATERIAL3

import com.android.documentsui.flags.Flags.FLAG_VISUAL_SIGNALS_RO

import com.android.documentsui.rules.CheckAndForceMaterial3Flag

import com.android.documentsui.services.FileOperationService

import com.android.documentsui.services.FileOperationService.ACTION_PROGRESS

import com.android.documentsui.services.FileOperationService.EXTRA_PROGRESS
@@ -71,7 +70,7 @@ private fun insideItem(progress: MutableJobProgress) = hasSibling(withText(progr 
@RunWith(AndroidJUnit4::class)

class JobPanelUiTest : ActivityTestJunit4<FilesActivity>() {

    @get:Rule

    val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()

    val checkFlags = CheckAndForceMaterial3Flag()



    private var lastId = 0L

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

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT 
import android.content.res.Resources

import android.graphics.Rect

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 android.util.DisplayMetrics

import android.util.TypedValue
@@ -32,6 +30,7 @@ import androidx.test.core.app.ActivityScenario 
import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.documentsui.files.FilesActivity

import com.android.documentsui.flags.Flags.FLAG_USE_MATERIAL3

import com.android.documentsui.rules.CheckAndForceMaterial3Flag

import kotlin.math.roundToInt

import org.junit.Assume.assumeTrue

import org.junit.Rule
@@ -41,7 +40,8 @@ import org.junit.runner.RunWith 
@RequiresFlagsEnabled(FLAG_USE_MATERIAL3)

@RunWith(AndroidJUnit4::class)

class NavRailUiTest : ActivityTestJunit4<FilesActivity>() {

  @get:Rule val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()

  @get:Rule

  val checkFlags = CheckAndForceMaterial3Flag()



  companion object {

    private const val MEDIUM_WINDOW_WIDTH = 700

tests/functional/com/android/documentsui/SearchViewUiTest.java

+2 −3
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ import static org.junit.Assert.assertFalse; 
import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

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

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

import android.provider.Settings;



import androidx.test.filters.LargeTest;
@@ -51,6 +49,7 @@ import androidx.test.uiautomator.Until; 
import com.android.documentsui.actions.RelaxedClickAction;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.filters.HugeLongTest;

import com.android.documentsui.rules.CheckAndForceMaterial3Flag;

import com.android.documentsui.rules.TestFilesRule;



import org.junit.After;
@@ -63,7 +62,7 @@ import org.junit.Test; 
public class SearchViewUiTest extends ActivityTestJunit4<FilesActivity> {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    @Rule

    public final TestFilesRule mTestFilesRule = new TestFilesRule();