Revert "Remove UBoot related Microdroid tests"
This reverts commit ec521a41dfc3c4dbb5a54f383b07dc5c27f14d4d.
Test: N/A
Bug: 249462836
Change-Id: I74d793582051a16d81753354d93cf0e314581a8c
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 4b40293..c2060cb 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -451,6 +451,36 @@
"9.17/C-1-1",
"9.17/C-2-7"
})
+ public void bootFailsWhenUBootAvbDataIsCompromised()
+ throws VirtualMachineException, InterruptedException, IOException {
+ if (mProtectedVm) {
+ assertThatBootFailsAfterCompromisingPartition(U_BOOT_AVB_PARTITION_UUID);
+ } else {
+ // non-protected VM shouldn't have u-boot avb data
+ assertThatPartitionIsMissing(U_BOOT_AVB_PARTITION_UUID);
+ }
+ }
+
+ @Test
+ @CddTest(requirements = {
+ "9.17/C-1-1",
+ "9.17/C-2-7"
+ })
+ public void bootFailsWhenUBootEnvDataIsCompromised()
+ throws VirtualMachineException, InterruptedException, IOException {
+ if (mProtectedVm) {
+ assertThatBootFailsAfterCompromisingPartition(U_BOOT_ENV_PARTITION_UUID);
+ } else {
+ // non-protected VM shouldn't have u-boot env data
+ assertThatPartitionIsMissing(U_BOOT_ENV_PARTITION_UUID);
+ }
+ }
+
+ @Test
+ @CddTest(requirements = {
+ "9.17/C-1-1",
+ "9.17/C-2-7"
+ })
public void bootFailsWhenPvmFwDataIsCompromised()
throws VirtualMachineException, InterruptedException, IOException {
if (mProtectedVm) {