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

Commit 9301bbf0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix a broken test by mocking PackageManager"

parents ce9a776f fbe85249

core/java/android/view/accessibility/TEST_MAPPING

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }

core/java/android/view/textclassifier/TEST_MAPPING

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }

core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java

+6 −3
Original line number Diff line number Diff line
@@ -529,8 +529,10 @@ public class TextClassifierTest { 
    }



    @Test

    public void testSuggetsConversationActions_deduplicate() {

        if (isTextClassifierDisabled()) return;

    public void testSuggestConversationActions_deduplicate() {

        Context context = new FakeContextBuilder()

                .setIntentComponent(Intent.ACTION_SENDTO, FakeContextBuilder.DEFAULT_COMPONENT)

                .build();

        ConversationActions.Message message =

                new ConversationActions.Message.Builder(

                        ConversationActions.Message.PERSON_USER_OTHERS)
@@ -541,7 +543,8 @@ public class TextClassifierTest { 
                        .setMaxSuggestions(3)

                        .build();



        ConversationActions conversationActions = mClassifier.suggestConversationActions(request);

        TextClassifier classifier = new TextClassifierImpl(context, TC_CONSTANTS);

        ConversationActions conversationActions = classifier.suggestConversationActions(request);



        Truth.assertThat(conversationActions.getConversationActions()).isEmpty();

    }

services/accessibility/TEST_MAPPING

+0 −6
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    },
@@ -66,9 +63,6 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }