Merge "Annotate logcat with current running test"

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() {}

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() {}

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