commit 48ce4db4db720e59d8094b3180968725a1203b12
author Jaewan Kim <jaewan@google.com> Tue Mar 28 01:01:34 2023 +0000
committer Jaewan Kim <jaewan@google.com> Mon Apr 03 01:01:18 2023 +0000
tree 8bc75789c44566978107b23b77373997a4ac85f0
parent 0b4a26223b5d3bcc1b8318f724a714f8d03326fd

Remove duplicated device capability checks

Change-Id: I199d6aeb0477dce15f9d006e421a97e5a8054452
Test: Treehugger

tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java

diff --git a/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java b/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java
index 22131f1..f3e30a9 100644
--- a/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java
@@ -97,6 +97,9 @@
     @Before
     public void setUp() throws Exception {
         mAndroidDevice = (TestDevice) Objects.requireNonNull(getDevice());
+
+        // Check device capabilities
+        assumeDeviceIsCapable(mAndroidDevice);
         assumeTrue(
                 "Skip if protected VMs are not supported",
                 mAndroidDevice.supportsMicrodroid(/* protectedVm= */ true));
@@ -111,12 +114,6 @@
         mBccFileOnHost =
                 getTestInformation().getDependencyFile(BCC_FILE_NAME, /* targetFirst= */ false);
 
-        // Check device capability
-        assumeDeviceIsCapable(mAndroidDevice);
-        assumeTrue(
-                "Protected VMs are not supported",
-                mAndroidDevice.supportsMicrodroid(/*protectedVm=*/ true));
-
         // Prepare for loading pvmfw.bin
         // File will be setup in individual test,
         // and then pushed to device in launchProtectedVmAndWaitForBootCompleted.