Merge "Fix a broken test by mocking PackageManager"

am: 9301bbf008

Change-Id: Iae564004657b004c0bb98381bb005a088a5735c9
This commit is contained in:
Tony Mak
2019-11-27 12:04:12 -08:00
committed by android-build-merger
2 changed files with 6 additions and 9 deletions

View File

@@ -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();
}

View File

@@ -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"
}
]
}