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

Modify DeviceConfigServiceTest to match actual DeviceConfig reset method behavior.

Browse Source 
Test: atest SettingsProviderTest
Change-Id: I2c21f118e2822e2033b8e4394109242d4b1e1203
This commit is contained in:
Stanislav Zholnin
2019-03-19 17:37:55 +00:00
parent 7ae743134f
commit 3d1da05ce1
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsProvider/test/src/com/android/providers/settings/DeviceConfigServiceTest.java
View File

@@ -147,7 +147,7 @@ public class DeviceConfigServiceTest {
// make sValue the default value
executeShellCommand(
"device_config put " + sNamespace + " " + sKey + " " + sValue + " default");
// make newValue the current value (as set by a trusted package)
// make newValue the current value (as set by a untrusted package)
executeShellCommand(
"device_config put " + sNamespace + " " + sKey + " " + newValue);
String result = getFromContentProvider(mContentResolver, sNamespace, sKey);
@@ -156,13 +156,7 @@ public class DeviceConfigServiceTest {
// reset values that were set by untrusted packages
executeShellCommand("device_config reset untrusted_defaults " + sNamespace);
result = getFromContentProvider(mContentResolver, sNamespace, sKey);
// the current value was set by a trusted package, so it's not reset
assertEquals(newValue, result);
// reset values that were set by untrusted or trusted packages
executeShellCommand("device_config reset trusted_defaults " + sNamespace);
result = getFromContentProvider(mContentResolver, sNamespace, sKey);
// the default value has been restored
// the current value was set by a untrusted package, so it's reset
assertEquals(sValue, result);
}