Fixing Readback Test failures related to auto-succeed
Prior implementation failed to clear command reader, causing test to
fail in TearDown. Transform Readback Tests failed to return if readback
was not supported, moved GTEST_SUCCEED into test body from SetUp
Bug: 111563608
Test: ./VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I4647f94efa216b219d0ef345df1ec3aa81dab4c0
diff --git a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp
index db4c914..da8858e 100644
--- a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp
+++ b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp
@@ -193,9 +193,6 @@
}
void TearDown() override {
- mWriter->validateDisplay();
- mWriter->presentDisplay();
- execute();
ASSERT_NO_FATAL_FAILURE(mComposerClient->setPowerMode(mPrimaryDisplay, PowerMode::OFF));
EXPECT_EQ(0, mReader->mErrors.size());
EXPECT_EQ(0, mReader->mCompositionChanges.size());
@@ -207,6 +204,11 @@
VtsHalHidlTargetTestBase::TearDown();
}
+ void clearCommandReaderState() {
+ mReader->mCompositionChanges.clear();
+ mReader->mErrors.clear();
+ }
+
void execute() {
ASSERT_NO_FATAL_FAILURE(mComposerClient->execute(mReader.get(), mWriter.get()));
}
@@ -489,6 +491,7 @@
// if hwc cannot handle and asks for composition change,
// just succeed the test
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -533,6 +536,7 @@
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -586,6 +590,7 @@
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -760,6 +765,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -801,6 +807,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -864,6 +871,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -912,6 +920,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -962,6 +971,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -1094,6 +1104,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -1131,6 +1142,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -1164,6 +1176,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -1181,10 +1194,6 @@
protected:
void SetUp() override {
GraphicsComposerReadbackTest::SetUp();
- if (!mHasReadbackBuffer) {
- GTEST_SUCCEED() << "Readback not supported or unsupported pixelFormat/dataspace";
- return;
- }
mWriter->selectDisplay(mPrimaryDisplay);
ASSERT_NO_FATAL_FAILURE(mComposerClient->setColorMode(mPrimaryDisplay, ColorMode::SRGB,
@@ -1222,6 +1231,10 @@
};
TEST_F(GraphicsComposerTransformReadbackTest, FLIP_H) {
+ if (!mHasReadbackBuffer) {
+ GTEST_SUCCEED() << "Readback not supported or unsupported pixelFormat/dataspace";
+ return;
+ }
ReadbackBuffer readbackBuffer(mPrimaryDisplay, mComposerClient, mGralloc, mDisplayWidth,
mDisplayHeight, mPixelFormat, mDataspace);
ASSERT_NO_FATAL_FAILURE(readbackBuffer.setReadbackBuffer());
@@ -1237,6 +1250,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -1249,6 +1263,10 @@
}
TEST_F(GraphicsComposerTransformReadbackTest, FLIP_V) {
+ if (!mHasReadbackBuffer) {
+ GTEST_SUCCEED() << "Readback not supported or unsupported pixelFormat/dataspace";
+ return;
+ }
ReadbackBuffer readbackBuffer(mPrimaryDisplay, mComposerClient, mGralloc, mDisplayWidth,
mDisplayHeight, mPixelFormat, mDataspace);
ASSERT_NO_FATAL_FAILURE(readbackBuffer.setReadbackBuffer());
@@ -1266,6 +1284,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}
@@ -1277,6 +1296,10 @@
}
TEST_F(GraphicsComposerTransformReadbackTest, ROT_180) {
+ if (!mHasReadbackBuffer) {
+ GTEST_SUCCEED() << "Readback not supported or unsupported pixelFormat/dataspace";
+ return;
+ }
ReadbackBuffer readbackBuffer(mPrimaryDisplay, mComposerClient, mGralloc, mDisplayWidth,
mDisplayHeight, mPixelFormat, mDataspace);
ASSERT_NO_FATAL_FAILURE(readbackBuffer.setReadbackBuffer());
@@ -1293,6 +1316,7 @@
mWriter->validateDisplay();
execute();
if (mReader->mCompositionChanges.size() != 0) {
+ clearCommandReaderState();
GTEST_SUCCEED();
return;
}