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

Commit 8430f5d2 authored by Tony Huang's avatar Tony Huang
Browse files

Fix Ui tests failed if hide launcher icon 

When launcher icon hide, getLaunchIntentForPackage will get null.
Rewrite tests to get intent by specific class.

Fix: 143583465
Test: atest DocumentsUIGoogleTests
Change-Id: I3ea41fb65f1e81a5e023ec0c3b54136ce12a98c6
parent b96c687a

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

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.view.MotionEvent; 
import com.android.documentsui.base.Features;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.bots.Bots;

import com.android.documentsui.bots.UiBot;

import com.android.documentsui.files.FilesActivity;



import javax.annotation.Nullable;
@@ -145,8 +145,7 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen 
    }



    protected void launchActivity() {

        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(

                UiBot.targetPackageName);

        final Intent intent = new Intent(context, FilesActivity.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

        if (getInitialRoot() != null) {

            intent.setAction(Intent.ACTION_VIEW);

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

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.provider.DocumentsContract; 


import androidx.test.filters.LargeTest;



import com.android.documentsui.bots.UiBot;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.inspector.InspectorActivity;



@LargeTest
@@ -43,8 +43,7 @@ public class InspectorUiTest extends ActivityTest<InspectorActivity> { 
        if (!features.isInspectorEnabled()) {

            return;

        }

        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(

                UiBot.targetPackageName);

        final Intent intent = new Intent(context, FilesActivity.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

        Uri uri = DocumentsContract.buildDocumentUri(InspectorProvider.AUTHORITY, TEST_DOC_NAME);

        intent.setData(uri);

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

+1 −6
Original line number Diff line number Diff line
@@ -16,16 +16,12 @@ 


package com.android.documentsui;



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.content.Intent;

import android.provider.DocumentsContract;



import androidx.test.filters.LargeTest;



import com.android.documentsui.base.Shared;

import com.android.documentsui.bots.UiBot;

import com.android.documentsui.picker.PickActivity;



@LargeTest
@@ -47,8 +43,7 @@ public class PickerPreviewAllTypeUiTest extends ActivityTest<PickActivity> { 


    @Override

    protected void launchActivity() {

        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(

                UiBot.targetPackageName);

        final Intent intent = new Intent(context, PickActivity.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.setAction(Intent.ACTION_GET_CONTENT);

        if (getInitialRoot() != null) {

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

+1 −6
Original line number Diff line number Diff line
@@ -16,16 +16,12 @@ 


package com.android.documentsui;



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.content.Intent;

import android.provider.DocumentsContract;



import androidx.test.filters.LargeTest;



import com.android.documentsui.base.Shared;

import com.android.documentsui.bots.UiBot;

import com.android.documentsui.picker.PickActivity;



@LargeTest
@@ -47,8 +43,7 @@ public class PickerPreviewTextUiTest extends ActivityTest<PickActivity>{ 


    @Override

    protected void launchActivity() {

        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(

                UiBot.targetPackageName);

        final Intent intent = new Intent(context, PickActivity.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.setAction(Intent.ACTION_GET_CONTENT);

        if (getInitialRoot() != null) {