From dd7e4c414b0e2bddf2bc3d2cbd7bc7f0aee03ded Mon Sep 17 00:00:00 2001 From: Pawin Vongmasa Date: Wed, 21 Jun 2017 17:55:41 -0700 Subject: [PATCH] Print test information to the target device's logcat Test: make vts -j99 && \ vts-tradefed run commandAndExit vts \ --skip-all-system-status-check --primary-abi-only \ --skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO Bug: 62885431 Change-Id: I71bfa9c5ff4825259c7452ad7ac40fef87103b5f --- .../VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | 15 +++++++++++++-- .../VtsHalMediaOmxV1_0TargetAudioEncTest.cpp | 15 +++++++++++++-- .../VtsHalMediaOmxV1_0TargetComponentTest.cpp | 14 ++++++++++++-- .../master/VtsHalMediaOmxV1_0TargetMasterTest.cpp | 9 +++++++-- .../VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | 15 +++++++++++++-- .../VtsHalMediaOmxV1_0TargetVideoEncTest.cpp | 15 +++++++++++++-- 6 files changed, 71 insertions(+), 12 deletions(-) diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp index fe67cb9b2e..c8334070e2 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp @@ -129,12 +129,22 @@ static ComponentTestEnvironment* gEnv = nullptr; // audio decoder test fixture class class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { + private: + typedef ::testing::VtsHalHidlTargetTestBase Super; public: + ::std::string getTestCaseInfo() const override { + return ::std::string() + + "Component: " + gEnv->getComponent().c_str() + " | " + + "Role: " + gEnv->getRole().c_str() + " | " + + "Instance: " + gEnv->getInstance().c_str() + " | " + + "Res: " + gEnv->getRes().c_str(); + } + virtual void SetUp() override { + Super::SetUp(); disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = ::testing::VtsHalHidlTargetTestBase::getService( - gEnv->getInstance()); + omx = Super::getService(gEnv->getInstance()); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { @@ -217,6 +227,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } + Super::TearDown(); } // callback function to process messages received by onMessages() from IL diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp index 7a5dceca88..ae79e82621 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp @@ -129,12 +129,22 @@ static ComponentTestEnvironment* gEnv = nullptr; // audio encoder test fixture class class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { + private: + typedef ::testing::VtsHalHidlTargetTestBase Super; public: + ::std::string getTestCaseInfo() const override { + return ::std::string() + + "Component: " + gEnv->getComponent().c_str() + " | " + + "Role: " + gEnv->getRole().c_str() + " | " + + "Instance: " + gEnv->getInstance().c_str() + " | " + + "Res: " + gEnv->getRes().c_str(); + } + virtual void SetUp() override { + Super::SetUp(); disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = ::testing::VtsHalHidlTargetTestBase::getService( - gEnv->getInstance()); + omx = Super::getService(gEnv->getInstance()); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { @@ -204,6 +214,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } + Super::TearDown(); } // callback function to process messages received by onMessages() from IL diff --git a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp index 357c11e2b0..52c5568656 100644 --- a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp +++ b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp @@ -117,12 +117,21 @@ static ComponentTestEnvironment* gEnv = nullptr; // generic component test fixture class class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { + private: + typedef ::testing::VtsHalHidlTargetTestBase Super; public: + ::std::string getTestCaseInfo() const override { + return ::std::string() + + "Component: " + gEnv->getComponent().c_str() + " | " + + "Role: " + gEnv->getRole().c_str() + " | " + + "Instance: " + gEnv->getInstance().c_str(); + } + virtual void SetUp() override { + Super::SetUp(); disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = ::testing::VtsHalHidlTargetTestBase::getService( - gEnv->getInstance()); + omx = Super::getService(gEnv->getInstance()); ASSERT_NE(omx, nullptr); observer = new CodecObserver(nullptr); ASSERT_NE(observer, nullptr); @@ -180,6 +189,7 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } + Super::TearDown(); } enum standardCompClass { diff --git a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp index 9958869455..e8f5f77dfd 100644 --- a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp +++ b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp @@ -97,17 +97,22 @@ class ComponentTestEnvironment : public ::testing::Environment { static ComponentTestEnvironment* gEnv = nullptr; class MasterHidlTest : public ::testing::VtsHalHidlTargetTestBase { + private: + typedef ::testing::VtsHalHidlTargetTestBase Super; public: virtual void SetUp() override { + Super::SetUp(); omxStore = nullptr; - omxStore = ::testing::VtsHalHidlTargetTestBase::getService(); + omxStore = Super::getService(); ASSERT_NE(omxStore, nullptr); omx = nullptr; omx = omxStore->getOmx(gEnv->getInstance()); ASSERT_NE(omx, nullptr); } - virtual void TearDown() override {} + virtual void TearDown() override { + Super::TearDown(); + } sp omxStore; sp omx; diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp index 2ff8ed3be0..ac7f82920a 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp @@ -134,12 +134,22 @@ static ComponentTestEnvironment* gEnv = nullptr; // video decoder test fixture class class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { + private: + typedef ::testing::VtsHalHidlTargetTestBase Super; public: + ::std::string getTestCaseInfo() const override { + return ::std::string() + + "Component: " + gEnv->getComponent().c_str() + " | " + + "Role: " + gEnv->getRole().c_str() + " | " + + "Instance: " + gEnv->getInstance().c_str() + " | " + + "Res: " + gEnv->getRes().c_str(); + } + virtual void SetUp() override { + Super::SetUp(); disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = ::testing::VtsHalHidlTargetTestBase::getService( - gEnv->getInstance()); + omx = Super::getService(gEnv->getInstance()); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { @@ -223,6 +233,7 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } + Super::TearDown(); } // callback function to process messages received by onMessages() from IL diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp index cd6eaf5632..7f9486d953 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp @@ -147,12 +147,22 @@ static ComponentTestEnvironment* gEnv = nullptr; // video encoder test fixture class class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { + private: + typedef ::testing::VtsHalHidlTargetTestBase Super; public: + ::std::string getTestCaseInfo() const override { + return ::std::string() + + "Component: " + gEnv->getComponent().c_str() + " | " + + "Role: " + gEnv->getRole().c_str() + " | " + + "Instance: " + gEnv->getInstance().c_str() + " | " + + "Res: " + gEnv->getRes().c_str(); + } + virtual void SetUp() override { + Super::SetUp(); disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = ::testing::VtsHalHidlTargetTestBase::getService( - gEnv->getInstance()); + omx = Super::getService(gEnv->getInstance()); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { @@ -235,6 +245,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } + Super::TearDown(); } // callback function to process messages received by onMessages() from IL