commit 58427c44b9261035351d2eee604a299c0b46dbb4
author Shawn Willden <swillden@google.com> Wed May 20 13:00:42 2015 -0600
committer Shawn Willden <swillden@google.com> Tue May 26 10:30:32 2015 -0600
tree 6747a8fb5bd5b15bc891c3d1b36966b9135168c5
parent 7bae132f732a73dc53b5ffc5e3eed0176e93a00c

Make Keymaster1Test parameterizable.

This enabled running the same test suite across different
implementations.

Bug: 20912868
Change-Id: Iaa2c4bcb38224d090aa54184a042375eb835ad60

android_keymaster_test_utils.cpp

diff --git a/android_keymaster_test_utils.cpp b/android_keymaster_test_utils.cpp
index 591e8d7..c40c889 100644
--- a/android_keymaster_test_utils.cpp
+++ b/android_keymaster_test_utils.cpp
@@ -151,11 +151,11 @@
 
 namespace test {
 
-Keymaster1Test::Keymaster1Test()
-    : device_(NULL), op_handle_(OP_HANDLE_SENTINEL), characteristics_(NULL) {
+Keymaster1Test::Keymaster1Test() : op_handle_(OP_HANDLE_SENTINEL), characteristics_(NULL) {
     blob_.key_material = NULL;
     RAND_seed("foobar", 6);
     blob_.key_material = 0;
+    device_ = GetParam()->CreateDevice();
 }
 
 Keymaster1Test::~Keymaster1Test() {