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

Commit 9ae46663 authored by Ben Reich's avatar Ben Reich
Browse files

Convert DirectoryMessagesUiTest to Junit 4 

This also updates the deprecated version of InstrumentationRegistry
to use the proper import.

Bug: 407646510
Test: atest com.android.documentsui.DirectoryMessagesUiTest
Flag: EXEMPT test change
Change-Id: I209c93cfef4dd2783c426ee24fbd90034a399070
parent 69c54cf6

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

+14 −9
Original line number Diff line number Diff line
@@ -20,26 +20,26 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageManager;

import android.text.TextUtils;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.uiautomator.UiObjectNotFoundException;



import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.filters.HugeLongTest;



@LargeTest

public class DirectoryMessagesUiTest extends ActivityTest<FilesActivity> {

import org.junit.Before;

import org.junit.Test;



    public DirectoryMessagesUiTest() {

        super(FilesActivity.class);

    }

@LargeTest

public class DirectoryMessagesUiTest extends ActivityTestJunit4<FilesActivity> {



    @Override

    public void setUp() throws Exception {

        super.setUp();

    @Before

    public void setUpTest() throws UiObjectNotFoundException {

        bots.roots.openRoot("Demo Root");

        bots.main.switchToListMode();

    }



    @Test

    public void testAuthenticationMessage_visible() throws Exception {

        // If feature is disabled, this test is a no-op.

        if (!features.isRemoteActionsEnabled()) {
@@ -52,6 +52,7 @@ public class DirectoryMessagesUiTest extends ActivityTest<FilesActivity> { 
    }



    @HugeLongTest

    @Test

    public void testInfoMessage_visible() throws Exception {

        bots.directory.openDocument(DemoProvider.DIR_INFO);

        bots.directory.assertHasMessage(DemoProvider.MSG_INFO);
@@ -59,6 +60,7 @@ public class DirectoryMessagesUiTest extends ActivityTest<FilesActivity> { 
    }



    @HugeLongTest

    @Test

    public void testInfoMessage_dismissable() throws Exception {

        bots.directory.openDocument(DemoProvider.DIR_INFO);

        bots.directory.assertHasMessage(true);
@@ -67,6 +69,7 @@ public class DirectoryMessagesUiTest extends ActivityTest<FilesActivity> { 
    }



    @HugeLongTest

    @Test

    public void testErrorMessage_visible() throws Exception {

        bots.directory.openDocument(DemoProvider.DIR_ERROR);

        bots.directory.assertHasMessage(DemoProvider.MSG_ERROR);
@@ -74,6 +77,7 @@ public class DirectoryMessagesUiTest extends ActivityTest<FilesActivity> { 
    }



    @HugeLongTest

    @Test

    public void testErrorMessage_dismissable() throws Exception {

        bots.directory.openDocument(DemoProvider.DIR_ERROR);

        bots.directory.assertHasMessage(true);
@@ -82,6 +86,7 @@ public class DirectoryMessagesUiTest extends ActivityTest<FilesActivity> { 
    }



    @HugeLongTest

    @Test

    public void testErrorMessage_supercedesInfoMessage() throws Exception {

        // When both error and info are returned in Directory, only show the error.

        bots.directory.openDocument(DemoProvider.DIR_ERROR_AND_INFO);