summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-06-07 21:49:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-06-07 21:49:07 +0000
commit8303aca7292099cd9385694cfc4133e06ad6613f (patch)
tree1296c392f0dd7944433ba63ed01037fc3947999b
parente0c4c497b3f21098f57c082b6cbf8b4f5fd72d36 (diff)
parent147ec3007642dc2403c845022708789a7972687d (diff)
downloadplatform_hardware_interfaces-8303aca7292099cd9385694cfc4133e06ad6613f.tar.gz
platform_hardware_interfaces-8303aca7292099cd9385694cfc4133e06ad6613f.tar.bz2
platform_hardware_interfaces-8303aca7292099cd9385694cfc4133e06ad6613f.zip
Merge "secure_element: vts: Fix openBasicChannel and transmit test case" into pi-dev
-rw-r--r--secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp b/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp
index dab81e2a23..3ea3e8dcac 100644
--- a/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp
+++ b/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp
@@ -134,6 +134,7 @@ TEST_F(SecureElementHidlTest, transmit) {
EXPECT_LE((unsigned int)2, response.selectResponse.size());
EXPECT_LE(1, response.channelNumber);
std::vector<uint8_t> command = DATA_APDU;
+ command[0] |= response.channelNumber;
std::vector<uint8_t> transmitResponse;
se_->transmit(command, [&transmitResponse](std::vector<uint8_t> res) {
transmitResponse.resize(res.size());
@@ -168,7 +169,8 @@ TEST_F(SecureElementHidlTest, openBasicChannel) {
}
});
if (statusReturned == SecureElementStatus::SUCCESS) {
- EXPECT_LE((unsigned int)3, response.size());
+ EXPECT_LE((unsigned int)2, response.size());
+ se_->closeChannel(0);
return;
}
EXPECT_EQ(SecureElementStatus::UNSUPPORTED_OPERATION, statusReturned);