Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a broken test by mocking PackageManager"

Browse Source
This commit is contained in:
Treehugger Robot
2019-11-27 19:36:28 +00:00
committed by Gerrit Code Review
parent ce9a776f1d fbe852495c
commit 9301bbf008
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/accessibility/TEST_MAPPING
View File

@@ -30,9 +30,6 @@
}, },
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
} }
] ]
} }

3
core/java/android/view/textclassifier/TEST_MAPPING
View File

@@ -8,9 +8,6 @@
}, },
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
} }
] ]
} }

9
core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
View File

@@ -529,8 +529,10 @@ public class TextClassifierTest {
} }
@Test @Test
public void testSuggetsConversationActions_deduplicate() { public void testSuggestConversationActions_deduplicate() {
if (isTextClassifierDisabled()) return; Context context = new FakeContextBuilder()
.setIntentComponent(Intent.ACTION_SENDTO, FakeContextBuilder.DEFAULT_COMPONENT)
.build();
ConversationActions.Message message = ConversationActions.Message message =
new ConversationActions.Message.Builder( new ConversationActions.Message.Builder(
ConversationActions.Message.PERSON_USER_OTHERS) ConversationActions.Message.PERSON_USER_OTHERS)
@@ -541,7 +543,8 @@ public class TextClassifierTest {
.setMaxSuggestions(3) .setMaxSuggestions(3)
.build(); .build();
ConversationActions conversationActions = mClassifier.suggestConversationActions(request); TextClassifier classifier = new TextClassifierImpl(context, TC_CONSTANTS);
ConversationActions conversationActions = classifier.suggestConversationActions(request);
Truth.assertThat(conversationActions.getConversationActions()).isEmpty(); Truth.assertThat(conversationActions.getConversationActions()).isEmpty();
} }

6
services/accessibility/TEST_MAPPING
View File

@@ -52,9 +52,6 @@
}, },
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "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-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
} }
] ]
} }