From 7c28090a619988a96892ec53a6dc344a29d040af Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Wed, 25 Mar 2015 18:23:31 -0700
Subject: [PATCH] Annotate logcat with current running test

It's hard to correlate test failures with the tests that
were running when looking in the logcat.  This change adds
the current test name in the log for each test to make it
more clear.

Merge of go/wvgerrit/#/c/13847/ from the widevine cdm repo

b/19822500

Change-Id: Idd37a22f7063d9d686d3ead567954b86fb0fa70f
---
 .../cdm/test/cdm_extended_duration_test.cpp   |  3 ++-
 .../cdm/test/request_license_test.cpp         |  3 ++-
 libwvdrmengine/cdm/test/test_base.h           | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 libwvdrmengine/cdm/test/test_base.h

diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
index 8956131b..39f1d13f 100644
--- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
+++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
@@ -17,6 +17,7 @@
 #include "OEMCryptoCENC.h"
 #include "properties.h"
 #include "string_conversions.h"
+#include "test_base.h"
 #include "url_request.h"
 #include "wv_cdm_constants.h"
 #include "wv_cdm_event_listener.h"
@@ -247,7 +248,7 @@ class TestWvCdmEventListener : public WvCdmEventListener {
   CdmEventType event_type_;
 };
 
-class WvCdmExtendedDurationTest : public testing::Test {
+class WvCdmExtendedDurationTest : public WvCdmTestBase {
  public:
   WvCdmExtendedDurationTest() {}
   ~WvCdmExtendedDurationTest() {}
diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp
index d7fa3e48..4d1cc3c6 100644
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -15,6 +15,7 @@
 #include "OEMCryptoCENC.h"
 #include "properties.h"
 #include "string_conversions.h"
+#include "test_base.h"
 #include "test_printers.h"
 #include "url_request.h"
 #include "wv_cdm_constants.h"
@@ -451,7 +452,7 @@ class TestWvCdmEventListener : public WvCdmEventListener {
   CdmEventType event_type_;
 };
 
-class WvCdmRequestLicenseTest : public testing::Test {
+class WvCdmRequestLicenseTest : public WvCdmTestBase {
  public:
   WvCdmRequestLicenseTest() {}
   ~WvCdmRequestLicenseTest() {}
diff --git a/libwvdrmengine/cdm/test/test_base.h b/libwvdrmengine/cdm/test/test_base.h
new file mode 100644
index 00000000..7fc5218c
--- /dev/null
+++ b/libwvdrmengine/cdm/test/test_base.h
@@ -0,0 +1,19 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+
+#include <gtest/gtest.h>
+
+namespace wvcdm {
+class WvCdmTestBase : public ::testing::Test {
+ public:
+  WvCdmTestBase() {}
+  virtual ~WvCdmTestBase() {}
+
+ protected:
+  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());
+  }
+};
+}  // namespace wvcdm