diff options
author | Simon Wingrove <simonjw@google.com> | 2024-01-09 08:38:16 +0000 |
---|---|---|
committer | Simon Wingrove <simonjw@google.com> | 2024-01-09 10:42:11 +0000 |
commit | ae818831ea3107f792ddcf478584999db54e38c4 (patch) | |
tree | 7d87e3eca03b96322c627e80257fd4bc63b98ba3 | |
parent | ae1ddc0af93d9031aa39fe58dbbd5dfe5101c977 (diff) | |
download | Permission-ae818831ea3107f792ddcf478584999db54e38c4.tar.gz |
Fix toBooleanStrict failure in hostside test
Test: atest SafetySourceStateCollectedLoggingHostTest
RelNote: Fix LoggingHostTets on some T devices
Bug: 310107321
Change-Id: I29efbb2c9682e3a14ccafe8c7d55551a727e5a44
-rw-r--r-- | tests/hostside/safetycenter/src/android/safetycenter/hostside/rules/RequireSafetyCenterRule.kt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/hostside/safetycenter/src/android/safetycenter/hostside/rules/RequireSafetyCenterRule.kt b/tests/hostside/safetycenter/src/android/safetycenter/hostside/rules/RequireSafetyCenterRule.kt index edf76e888..fe75a05a2 100644 --- a/tests/hostside/safetycenter/src/android/safetycenter/hostside/rules/RequireSafetyCenterRule.kt +++ b/tests/hostside/safetycenter/src/android/safetycenter/hostside/rules/RequireSafetyCenterRule.kt @@ -24,14 +24,23 @@ import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement +/** toBooleanString() doesn't seem available on all Kotlin versions we need to support. */ +private fun String.toBooleanStrictInt(): Boolean = + when (this) { + "true" -> true + "false" -> false + else -> + throw IllegalArgumentException("The string doesn't represent a boolean value: $this") + } + /** JUnit rule for host side tests that requires Safety Center to be supported and enabled. */ class RequireSafetyCenterRule(private val hostTestClass: BaseHostJUnit4Test) : TestRule { private val safetyCenterSupported: Boolean by lazy { - shellCommandStdoutOrThrow("cmd safety_center supported").toBooleanStrict() + shellCommandStdoutOrThrow("cmd safety_center supported").toBooleanStrictInt() } private val safetyCenterEnabled: Boolean by lazy { - shellCommandStdoutOrThrow("cmd safety_center enabled").toBooleanStrict() + shellCommandStdoutOrThrow("cmd safety_center enabled").toBooleanStrictInt() } override fun apply(base: Statement, description: Description): Statement { |