kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pretty-print TicketAEADMethod tests.

Browse Source 
It's hard to diagnose "20".

Change-Id: I57e8d0fb6e4937ddeca45b3645463ca0dc872ea6
Reviewed-on: https://boringssl-review.googlesource.com/27487
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Steven Valdez <svaldez@google.com>
This commit is contained in:
David Benjamin 2018-04-13 16:39:12 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 6879e19362
commit c977532240
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ssl/ssl_test.cc
View File

@ -3447,9 +3447,11 @@ static void ConnectClientAndServerWithTicketMethod(
} }
} }
using TicketAEADMethodParam =
testing::tuple<uint16_t, unsigned, ssl_test_ticket_aead_failure_mode>;
class TicketAEADMethodTest class TicketAEADMethodTest
: public ::testing::TestWithParam<testing::tuple< : public ::testing::TestWithParam<TicketAEADMethodParam> {};
uint16_t, unsigned, ssl_test_ticket_aead_failure_mode>> {};
TEST_P(TicketAEADMethodTest, Resume) { TEST_P(TicketAEADMethodTest, Resume) {
bssl::UniquePtr<X509> cert = GetTestCertificate(); bssl::UniquePtr<X509> cert = GetTestCertificate();
@ -3525,15 +3527,49 @@ TEST_P(TicketAEADMethodTest, Resume) {
} }
} }
std::string TicketAEADMethodParamToString(
const testing::TestParamInfo<TicketAEADMethodParam> &params) {
std::string ret = GetVersionName(std::get<0>(params.param));
// GTest only allows alphanumeric characters and '_' in the parameter
// string. Additionally filter out the 'v' to get "TLS13" over "TLSv13".
for (auto it = ret.begin(); it != ret.end();) {
if (*it == '.' || *it == 'v') {
it = ret.erase(it);
} else {
++it;
}
}
char retry_count[256];
snprintf(retry_count, sizeof(retry_count), "%d", std::get<1>(params.param));
ret += "_";
ret += retry_count;
ret += "Retries_";
switch (std::get<2>(params.param)) {
case ssl_test_ticket_aead_ok:
ret += "OK";
break;
case ssl_test_ticket_aead_seal_fail:
ret += "SealFail";
break;
case ssl_test_ticket_aead_open_soft_fail:
ret += "OpenSoftFail";
break;
case ssl_test_ticket_aead_open_hard_fail:
ret += "OpenHardFail";
break;
}
return ret;
}
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
TicketAEADMethodTests, TicketAEADMethodTest, TicketAEADMethodTests, TicketAEADMethodTest,
testing::Combine( testing::Combine(testing::Values(TLS1_2_VERSION, TLS1_3_VERSION),
testing::Values(TLS1_2_VERSION, TLS1_3_VERSION), testing::Values(0, 1, 2),
testing::Values(0, 1, 2), testing::Values(ssl_test_ticket_aead_ok,
testing::Values(ssl_test_ticket_aead_ok, ssl_test_ticket_aead_seal_fail,
ssl_test_ticket_aead_seal_fail, ssl_test_ticket_aead_open_soft_fail,
ssl_test_ticket_aead_open_soft_fail, ssl_test_ticket_aead_open_hard_fail)),
ssl_test_ticket_aead_open_hard_fail))); TicketAEADMethodParamToString);
TEST(SSLTest, SelectNextProto) { TEST(SSLTest, SelectNextProto) {
uint8_t *result; uint8_t *result;