diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-09 00:03:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-09 00:03:52 +0000 |
commit | be51d516f665267a1bc1fd9fc6661e964e8b1a03 (patch) | |
tree | 10cb2a2397a6d0af98a52c799054e9ab06f1b044 | |
parent | aa8ca9a004c9d5dc71546ca99d6286380d144578 (diff) | |
parent | 49410e98e35ebcdd89c4718ed12f868efefe0d4a (diff) | |
download | libtextclassifier-android-vts-12.1_r7.tar.gz |
Snap for 7894766 from 49410e98e35ebcdd89c4718ed12f868efefe0d4a to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-release
Change-Id: I315e9067a696f200fb3f0eb165145f304fbd8d8c
2 files changed, 40 insertions, 34 deletions
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java b/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java index 21d6943..8072d72 100644 --- a/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java +++ b/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java @@ -18,12 +18,11 @@ package com.android.textclassifier.common; import static com.google.common.truth.Truth.assertThat; -import android.provider.DeviceConfig; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; +import com.android.textclassifier.testing.TestingDeviceConfig; import com.google.common.collect.ImmutableMap; -import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; import org.junit.After; @@ -157,26 +156,11 @@ public class TextClassifierSettingsTest { private static void assertSettings( Map<String, String> keyValueMap, Consumer<TextClassifierSettings> settingsConsumer) { - HashMap<String, String> keyOriginalValueMap = new HashMap<>(); + TestingDeviceConfig deviceConfig = new TestingDeviceConfig(); + TextClassifierSettings settings = new TextClassifierSettings(deviceConfig); for (String key : keyValueMap.keySet()) { - keyOriginalValueMap.put( - key, DeviceConfig.getProperty(DeviceConfig.NAMESPACE_TEXTCLASSIFIER, key)); + deviceConfig.setConfig(key, keyValueMap.get(key)); } - TextClassifierSettings settings = new TextClassifierSettings(); - try { - for (String key : keyValueMap.keySet()) { - setDeviceConfig(key, keyValueMap.get(key)); - } - settingsConsumer.accept(settings); - } finally { - for (String key : keyValueMap.keySet()) { - setDeviceConfig(key, keyOriginalValueMap.get(key)); - } - } - } - - private static void setDeviceConfig(String key, String value) { - DeviceConfig.setProperty( - DeviceConfig.NAMESPACE_TEXTCLASSIFIER, key, value, /* makeDefault */ false); + settingsConsumer.accept(settings); } } diff --git a/java/tests/instrumentation/src/com/android/textclassifier/testing/TestingDeviceConfig.java b/java/tests/instrumentation/src/com/android/textclassifier/testing/TestingDeviceConfig.java index 670e3d0..bdc422e 100644 --- a/java/tests/instrumentation/src/com/android/textclassifier/testing/TestingDeviceConfig.java +++ b/java/tests/instrumentation/src/com/android/textclassifier/testing/TestingDeviceConfig.java @@ -25,42 +25,64 @@ import javax.annotation.Nullable; /** A fake DeviceConfig implementation for testing purpose. */ public final class TestingDeviceConfig implements TextClassifierSettings.IDeviceConfig { - private final HashMap<String, String> strConfigs; - private final HashMap<String, Boolean> boolConfigs; + private final HashMap<String, String> configs; public TestingDeviceConfig() { - this.strConfigs = new HashMap<>(); - this.boolConfigs = new HashMap<>(); + this.configs = new HashMap<>(); } public void setConfig(String key, String value) { - strConfigs.put(key, value); + configs.put(key, value); } public void setConfig(String key, boolean value) { - boolConfigs.put(key, value); + configs.put(key, Boolean.toString(value)); + } + + public void setConfig(String key, int value) { + configs.put(key, Integer.toString(value)); + } + + public void setConfig(String key, float value) { + configs.put(key, Float.toString(value)); + } + + public void setConfig(String key, long value) { + configs.put(key, Long.toString(value)); } @Override public Properties getProperties(@NonNull String namespace, @NonNull String... names) { Properties.Builder builder = new Properties.Builder(namespace); - for (String key : strConfigs.keySet()) { - builder.setString(key, strConfigs.get(key)); - } - for (String key : boolConfigs.keySet()) { - builder.setBoolean(key, boolConfigs.get(key)); + for (String key : configs.keySet()) { + builder.setString(key, configs.get(key)); } return builder.build(); } @Override public boolean getBoolean(@NonNull String namespace, @NonNull String name, boolean defaultValue) { - return boolConfigs.containsKey(name) ? boolConfigs.get(name) : defaultValue; + return configs.containsKey(name) ? Boolean.parseBoolean(configs.get(name)) : defaultValue; } @Override public String getString( @NonNull String namespace, @NonNull String name, @Nullable String defaultValue) { - return strConfigs.containsKey(name) ? strConfigs.get(name) : defaultValue; + return configs.containsKey(name) ? configs.get(name) : defaultValue; + } + + @Override + public int getInt(@NonNull String namespace, @NonNull String name, int defaultValue) { + return configs.containsKey(name) ? Integer.parseInt(configs.get(name)) : defaultValue; + } + + @Override + public float getFloat(@NonNull String namespace, @NonNull String name, float defaultValue) { + return configs.containsKey(name) ? Float.parseFloat(configs.get(name)) : defaultValue; + } + + @Override + public long getLong(@NonNull String namespace, @NonNull String name, long defaultValue) { + return configs.containsKey(name) ? Long.parseLong(configs.get(name)) : defaultValue; } } |