Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(887)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java

Issue 1139643006: Rename chrome/android/javatests to javatests_shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/SuggestionAnswerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationUnitTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java
deleted file mode 100644
index e5cc21796ac9848ea4975432c9d76ab6b911528d..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.omnibox;
-
-import android.os.Bundle;
-import android.speech.RecognizerIntent;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.TextUtils;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult;
-import org.chromium.chrome.shell.ChromeShellTestBase;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Test the {@link VoiceSuggestionProvider} class through simulating omnibox results and voice
- * recognition result bundles.
- */
-public class VoiceSuggestionProviderTest extends ChromeShellTestBase {
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- launchChromeShellWithBlankPage();
- assertTrue(waitForActiveShellToBeDoneLoading());
- }
-
- private static OmniboxSuggestion createDummySuggestion(String text) {
- return new OmniboxSuggestion(OmniboxSuggestion.Type.SEARCH_SUGGEST.nativeType(),
- 0,
- 1,
- text,
- null,
- null,
- null,
- "",
- "http://www.google.com",
- "google.com",
- false,
- false);
- }
-
- private static List<OmniboxSuggestion> createDummySuggestions(String... texts) {
- List<OmniboxSuggestion> suggestions = new ArrayList<OmniboxSuggestion>(texts.length);
- for (int i = 0; i < texts.length; ++i) {
- suggestions.add(createDummySuggestion(texts[i]));
- }
-
- return suggestions;
- }
-
- private static Bundle createDummyBundle(String[] texts, float[] confidences) {
- Bundle b = new Bundle();
-
- b.putStringArrayList(RecognizerIntent.EXTRA_RESULTS, new ArrayList<String>(
- Arrays.asList(texts)));
- b.putFloatArray(RecognizerIntent.EXTRA_CONFIDENCE_SCORES, confidences);
-
- return b;
- }
-
- private static void assertVoiceResultsAreEqual(List<VoiceResult> results, String[] texts,
- float[] confidences) {
- assertTrue("Invalid array sizes", results.size() == texts.length
- && texts.length == confidences.length);
-
- for (int i = 0; i < texts.length; ++i) {
- VoiceResult result = results.get(i);
- assertEquals("Match text is not equal", texts[i], result.getMatch());
- assertEquals("Confidence is not equal", confidences[i], result.getConfidence());
- }
- }
-
- private static boolean assertSuggestionMatchesVoiceResult(OmniboxSuggestion a, VoiceResult b) {
- return a.getType() == OmniboxSuggestion.Type.VOICE_SUGGEST && !a.isStarred()
- && TextUtils.equals(a.getDisplayText(), b.getMatch());
- }
-
- private void assertArrayStartsWith(List<OmniboxSuggestion> a, List<OmniboxSuggestion> b) {
- assertTrue((a != null && b != null) || (a == null && b == null));
- if (a == null || b == null) return;
-
- assertTrue(a.size() >= b.size());
- for (int i = 0; i < b.size(); ++i) {
- assertEquals("The OmniboxSuggestion entries are not the same.", a.get(i), b.get(i));
- }
- }
-
- private void assertArrayEndsWith(List<OmniboxSuggestion> a, List<VoiceResult> b,
- int expectedResultCount) {
- assertTrue((a != null && b != null) || (a == null && b == null));
- if (a == null || b == null) return;
-
- expectedResultCount = Math.min(expectedResultCount, b.size());
- assertTrue(a.size() >= expectedResultCount);
- for (int i = 0; i < expectedResultCount; ++i) {
- assertTrue("The OmniboxSuggestion entry does not match the VoiceResult",
- assertSuggestionMatchesVoiceResult(a.get(a.size() - expectedResultCount + i),
- b.get(i)));
- }
- }
-
- private boolean isVoiceResultInSuggestions(List<OmniboxSuggestion> suggestions,
- VoiceResult result) {
- for (OmniboxSuggestion suggestion : suggestions) {
- if (assertSuggestionMatchesVoiceResult(suggestion, result)) return true;
- }
-
- return false;
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testParseEmptyBundle() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- provider.setVoiceResultsFromIntentBundle(new Bundle());
-
- assertNotNull("Results is null", provider.getResults());
- assertEquals("SuggestionProvider added invalid results", 0,
- provider.getResults().size());
-
- provider.addVoiceSuggestions(null, 3);
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testParseBundle() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 0.8f, 1.0f, 1.0f };
-
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- assertVoiceResultsAreEqual(provider.getResults(), texts, confidences);
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testNoSuggestions() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
- List<OmniboxSuggestion> suggestions =
- createDummySuggestions("a", "b", "c");
- List<OmniboxSuggestion> updatedSuggestions =
- provider.addVoiceSuggestions(suggestions, 10);
-
- android.test.MoreAsserts.assertEquals(
- suggestions.toArray(), updatedSuggestions.toArray());
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testClearVoiceResults() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 0.99f, 0.98f };
-
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- assertNotNull(provider.getResults());
- assertEquals("Invalid number of results", texts.length,
- provider.getResults().size());
-
- provider.clearVoiceSearchResults();
-
- assertEquals(0, provider.getResults().size());
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testAddToEmtpyResultsCase() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 1.0f, 1.0f };
-
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
- assertVoiceResultsAreEqual(provider.getResults(), texts, confidences);
- List<OmniboxSuggestion> suggestions =
- provider.addVoiceSuggestions(null, texts.length);
- assertArrayEndsWith(suggestions, provider.getResults(), texts.length);
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testAddToEmptyOverflowCase() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 1.0f, 1.0f };
-
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
- assertVoiceResultsAreEqual(provider.getResults(), texts, confidences);
-
- List<OmniboxSuggestion> suggestions = provider.addVoiceSuggestions(null, 2);
- assertArrayEndsWith(suggestions, provider.getResults(), 2);
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testAddToResultsCase() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 1.0f, 1.0f };
-
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- List<OmniboxSuggestion> suggestions =
- createDummySuggestions("oa", "ob", "oc");
- List<OmniboxSuggestion> updatedSuggestions =
- provider.addVoiceSuggestions(suggestions, texts.length);
-
- assertArrayStartsWith(updatedSuggestions, suggestions);
- assertArrayEndsWith(updatedSuggestions, provider.getResults(), texts.length);
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testAddToResultsOverflowCase() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 1.0f, 1.0f };
-
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- List<OmniboxSuggestion> suggestions =
- createDummySuggestions("oa", "ob", "oc");
- List<OmniboxSuggestion> updatedSuggestions =
- provider.addVoiceSuggestions(suggestions, 2);
-
- assertArrayStartsWith(updatedSuggestions, suggestions);
- assertArrayEndsWith(updatedSuggestions, provider.getResults(), 2);
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testAddDuplicateToResultsCase() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.0f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 1.0f, 1.0f };
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- List<OmniboxSuggestion> suggestions =
- createDummySuggestions("oa", "b", "oc");
- List<OmniboxSuggestion> updatedSuggestions =
- provider.addVoiceSuggestions(suggestions, texts.length);
-
- assertEquals(provider.getResults().get(0).getMatch(), texts[0]);
- assertTrue("Result 'a' was not found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(0)));
- assertEquals(provider.getResults().get(1).getMatch(), texts[1]);
- assertFalse("Result 'b' was found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(1)));
- assertEquals(provider.getResults().get(2).getMatch(), texts[2]);
- assertTrue("Result 'c' was not found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(2)));
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testConfidenceThresholdHideLowConfidence() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.5f, 1.1f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 1.0f, 0.6f, 0.3f };
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- List<OmniboxSuggestion> suggestions =
- createDummySuggestions("oa", "ob", "oc");
- List<OmniboxSuggestion> updatedSuggestions =
- provider.addVoiceSuggestions(suggestions, texts.length);
-
- assertEquals(provider.getResults().get(0).getMatch(), texts[0]);
- assertTrue("Result 'a' was not found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(0)));
- assertEquals(provider.getResults().get(1).getMatch(), texts[1]);
- assertTrue("Result 'b' was not found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(1)));
- assertEquals(provider.getResults().get(2).getMatch(), texts[2]);
- assertFalse("Result 'c' was found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(2)));
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testConfidenceThresholdHideAlts() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider(0.5f, 0.5f);
-
- String[] texts = new String[] { "a", "b", "c" };
- float[] confidences = new float[] { 0.8f, 1.0f, 1.0f };
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- List<OmniboxSuggestion> suggestions =
- createDummySuggestions("oa", "ob", "oc");
- List<OmniboxSuggestion> updatedSuggestions =
- provider.addVoiceSuggestions(suggestions, texts.length);
-
- assertEquals(provider.getResults().get(0).getMatch(), texts[0]);
- assertTrue("Result 'a' was not found (First entry. Must be shown).",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(0)));
- assertEquals(provider.getResults().get(1).getMatch(), texts[1]);
- assertFalse("Result 'b' was found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(1)));
- assertEquals(provider.getResults().get(2).getMatch(), texts[2]);
- assertFalse("Result 'c' was found.",
- isVoiceResultInSuggestions(updatedSuggestions,
- provider.getResults().get(2)));
- }
- });
- }
-
- @SmallTest
- @Feature({"Omnibox"})
- public void testVoiceResponseURLConversion() {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- VoiceSuggestionProvider provider = new VoiceSuggestionProvider();
-
- String[] texts =
- new String[] { "a", "www. b .co .uk", "engadget .com", "www.google.com" };
- float[] confidences = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
- provider.setVoiceResultsFromIntentBundle(createDummyBundle(texts, confidences));
-
- assertVoiceResultsAreEqual(
- provider.getResults(),
- new String[] {"a", "www.b.co.uk", "engadget.com", "www.google.com"},
- new float[] {1.0f, 1.0f, 1.0f, 1.0f});
- }
- });
- }
-}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/SuggestionAnswerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationUnitTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698