From 5a8660b97eaafc4dbdcfa7347942334b583f1ae7 Mon Sep 17 00:00:00 2001 From: Yasin Kilicdere Date: Mon, 3 Jul 2023 14:49:24 +0100 Subject: [PATCH] Assert and verify setting system property in UserManagerServiceTest. Bug: 264667464 Bug: 264667776 Bug: 264666926 Test: atest FrameworksServicesTests:com.android.server.pm.UserManagerServiceTest Change-Id: Iaa90d1d6470220e915fdb2088d3865483ee243c5 --- .../src/com/android/server/pm/UserManagerServiceTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java index be918ec2637eb..d94f10dfa7eae 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java @@ -19,6 +19,7 @@ package com.android.server.pm; import static android.os.UserManager.DISALLOW_USER_SWITCH; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; import android.app.ActivityManager; import android.app.PropertyInvalidatedCache; @@ -28,6 +29,7 @@ import android.os.Bundle; import android.os.FileUtils; import android.os.Looper; import android.os.Parcelable; +import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.platform.test.annotations.Postsubmit; @@ -307,8 +309,10 @@ public class UserManagerServiceTest { private static String setSystemProperty(String name, String value) throws Exception { final String oldValue = runShellCommand("getprop " + name); - assertThat(runShellCommand("setprop " + name + " " + value)) - .isEqualTo(""); + assertWithMessage("can not set system property") + .that(runShellCommand("setprop " + name + " " + value)).isEqualTo(""); + assertWithMessage("failed to set system property") + .that(SystemProperties.get(name)).isEqualTo(value); return oldValue; }