commit 5e1347cedfd3e3c553459263c194d3468860c31b
author Shawn Willden <swillden@google.com> Tue Nov 26 15:05:51 2019 -0700
committer Shawn Willden <swillden@google.com> Tue Jan 21 01:12:31 2020 -0700
tree d8395126c0a771e5671d884fc3170bedf4cd5a18
parent 2adf7fb2d5e0c27962dc65f6a743dd21b84aeca0

Update Keymaster 4.0 VTS to use parameterized tests.

Bug: 139437880
Test: VtsHalKeyamsterV4_0TargetTest
Change-Id: I487000cc19fe355fdef88f1561a38b2cbfd3c3c3

keymaster/4.0/vts/functional/VerificationTokenTest.cpp

diff --git a/keymaster/4.0/vts/functional/VerificationTokenTest.cpp b/keymaster/4.0/vts/functional/VerificationTokenTest.cpp
index 693f4ae..bab1439 100644
--- a/keymaster/4.0/vts/functional/VerificationTokenTest.cpp
+++ b/keymaster/4.0/vts/functional/VerificationTokenTest.cpp
@@ -185,10 +185,7 @@
               memcmp(result1.token.mac.data(), result2.token.mac.data(), result1.token.mac.size()));
 }
 
-INSTANTIATE_TEST_SUITE_P(
-        PerInstance, VerificationTokenTest,
-        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IKeymasterDevice::descriptor)),
-        android::hardware::PrintInstanceNameToString);
+INSTANTIATE_KEYMASTER_HIDL_TEST(VerificationTokenTest);
 
 }  // namespace test
 }  // namespace V4_0