Fix bug in assumption of ApexShimValidationTest
mHostUtils.isApexUpdateSupported returns a boolean which we were
comparing with a string.
Bug: 160296318
Test: atest ApexShimValidationTest
Change-Id: I533083a962e7ef05a1657d3f45c353605544902f
Merged-In: I533083a962e7ef05a1657d3f45c353605544902f
(cherry picked from commit 89c1638abddff21d0dc3affbd19037066beaf1d8)
diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
index 36a67e1..b4043e5 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
@@ -23,7 +23,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
import android.platform.test.annotations.LargeTest;
@@ -37,7 +37,6 @@
import com.android.tradefed.util.RunUtil;
import com.android.tradefed.util.ZipUtil;
-import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -110,8 +109,7 @@
@Before
public void setUp() throws Exception {
- assumeThat("Device doesn't support updating APEX", mHostUtils.isApexUpdateSupported(),
- CoreMatchers.equalTo("true"));
+ assumeTrue("Device doesn't support updating APEX", mHostUtils.isApexUpdateSupported());
cleanUp();
mDeapexerZip = getTestInformation().getDependencyFile(DEAPEXER_ZIP_FILE_NAME, false);
mAllApexesZip = getTestInformation().getDependencyFile(STAGED_INSTALL_TEST_FILE_NAME,