Merge "Search in Settings for Japanese"
This commit is contained in:
committed by
Android (Google) Code Review
commit
85fb6726e9
@@ -94,4 +94,4 @@ public class DatabaseIndexingUtilsTest {
|
||||
ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(map, key);
|
||||
assertThat(payload).isInstanceOf(ResultPayload.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -17,15 +17,17 @@
|
||||
|
||||
package com.android.settings.search.indexing;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Intent;
|
||||
import android.content.Context;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.search.InlineSwitchPayload;
|
||||
import com.android.settings.search.ResultPayload;
|
||||
import com.android.settings.search.ResultPayloadUtils;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -33,8 +35,6 @@ import org.junit.runner.RunWith;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class IndexDataTest {
|
||||
@@ -141,6 +141,14 @@ public class IndexDataTest {
|
||||
assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNormalizeJapaneseString() {
|
||||
final String japaneseString = "\u3042\u3077\u308a";
|
||||
final String normalizedJapaneseString = "\u30a2\u30d5\u309a\u30ea";
|
||||
|
||||
String result = IndexData.normalizeJapaneseString(japaneseString);
|
||||
assertThat(result).isEqualTo(normalizedJapaneseString);
|
||||
}
|
||||
|
||||
private IndexData generateRow() {
|
||||
return mBuilder.build(mContext);
|
||||
|
Reference in New Issue
Block a user