From 6219322a1e9af79e461e9752ed1867a619ccdbe8 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 1 Jun 2016 12:04:54 -0700 Subject: [PATCH] Fix the order of test case name and test name In the unit tests, the test case name and test name are logged, but currently the test case and name are reversed. This CL orders them correctly, so instead of, e.g. CheckHDCPCapability.OEMCryptoClientTest, we get OEMCryptoClientTest.CheckHDCPCapability as intended. Merge of go/wvgerrit/18045 from widevine repo Change-Id: I20bb2d47de0c84b3a1f00bb46af5ed0a45d7fc56 --- libwvdrmengine/cdm/test/test_base.h | 4 ++-- libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/cdm/test/test_base.h b/libwvdrmengine/cdm/test/test_base.h index 7fc5218c..e9f254d8 100644 --- a/libwvdrmengine/cdm/test/test_base.h +++ b/libwvdrmengine/cdm/test/test_base.h @@ -12,8 +12,8 @@ class WvCdmTestBase : public ::testing::Test { virtual void SetUp() { const ::testing::TestInfo* const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); - LOGD("Running test %s.%s", test_info->name(), - test_info->test_case_name()); + LOGD("Running test %s.%s", test_info->test_case_name(), + test_info->name()); } }; } // namespace wvcdm diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index be6a7c4f..fb1c03db 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -1289,7 +1289,7 @@ class OEMCryptoClientTest : public ::testing::Test { wvcdm::g_cutoff = wvcdm::LOG_INFO; const ::testing::TestInfo* const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); - LOGD("Running test %s.%s", test_info->name(), test_info->test_case_name()); + LOGD("Running test %s.%s", test_info->test_case_name(), test_info->name()); } virtual void TearDown() {