Merge "[VTS] Add interface version check function" into udc-dev (ef992499) · Commits · e / os / android_hardware_interfaces

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+28 −6

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,12 @@ class GraphicsComposerAidlTest : public ::testing::TestWithParam<std::string> {
	[&](const Capability& activeCapability) { return activeCapability == capability; });		[&](const Capability& activeCapability) { return activeCapability == capability; });
	}		}

			int getInterfaceVersion() {
			const auto& [versionStatus, version] = mComposerClient->getInterfaceVersion();
			EXPECT_TRUE(versionStatus.isOk());
			return version;
			}

	const VtsDisplay& getPrimaryDisplay() const { return mDisplays[0]; }		const VtsDisplay& getPrimaryDisplay() const { return mDisplays[0]; }

	int64_t getPrimaryDisplayId() const { return getPrimaryDisplay().getDisplayId(); }		int64_t getPrimaryDisplayId() const { return getPrimaryDisplay().getDisplayId(); }
	@@ -874,9 +880,7 @@ TEST_P(GraphicsComposerAidlTest, GetDisplayName) {
	}		}

	TEST_P(GraphicsComposerAidlTest, GetOverlaySupport) {		TEST_P(GraphicsComposerAidlTest, GetOverlaySupport) {
	const auto& [versionStatus, version] = mComposerClient->getInterfaceVersion();		if (getInterfaceVersion() <= 1) {
	ASSERT_TRUE(versionStatus.isOk());
	if (version == 1) {
	GTEST_SUCCEED() << "Device does not support the new API for overlay support";		GTEST_SUCCEED() << "Device does not support the new API for overlay support";
	return;		return;
	}		}
	@@ -2290,6 +2294,11 @@ TEST_P(GraphicsComposerAidlCommandTest, SetIdleTimerEnabled_Timeout_2) {
	}		}

	TEST_P(GraphicsComposerAidlCommandTest, SetRefreshRateChangedCallbackDebug_Unsupported) {		TEST_P(GraphicsComposerAidlCommandTest, SetRefreshRateChangedCallbackDebug_Unsupported) {
			if (getInterfaceVersion() <= 1) {
			GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is "
			"not supported on older version of the service";
			return;
			}
	if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {		if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {
	auto status = mComposerClient->setRefreshRateChangedCallbackDebugEnabled(		auto status = mComposerClient->setRefreshRateChangedCallbackDebugEnabled(
	getPrimaryDisplayId(), /enabled/ true);		getPrimaryDisplayId(), /enabled/ true);
	@@ -2306,6 +2315,11 @@ TEST_P(GraphicsComposerAidlCommandTest, SetRefreshRateChangedCallbackDebug_Unsup
	}		}

	TEST_P(GraphicsComposerAidlCommandTest, SetRefreshRateChangedCallbackDebug_Enabled) {		TEST_P(GraphicsComposerAidlCommandTest, SetRefreshRateChangedCallbackDebug_Enabled) {
			if (getInterfaceVersion() <= 1) {
			GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is "
			"not supported on older version of the service";
			return;
			}
	if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {		if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {
	GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is not supported";		GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is not supported";
	return;		return;
	@@ -2335,6 +2349,11 @@ TEST_P(GraphicsComposerAidlCommandTest, SetRefreshRateChangedCallbackDebug_Enabl

	TEST_P(GraphicsComposerAidlCommandTest,		TEST_P(GraphicsComposerAidlCommandTest,
	SetRefreshRateChangedCallbackDebugEnabled_noCallbackWhenIdle) {		SetRefreshRateChangedCallbackDebugEnabled_noCallbackWhenIdle) {
			if (getInterfaceVersion() <= 1) {
			GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is "
			"not supported on older version of the service";
			return;
			}
	if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {		if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {
	GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is not supported";		GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is not supported";
	return;		return;
	@@ -2392,6 +2411,11 @@ TEST_P(GraphicsComposerAidlCommandTest,

	TEST_P(GraphicsComposerAidlCommandTest,		TEST_P(GraphicsComposerAidlCommandTest,
	SetRefreshRateChangedCallbackDebugEnabled_SetActiveConfigWithConstraints) {		SetRefreshRateChangedCallbackDebugEnabled_SetActiveConfigWithConstraints) {
			if (getInterfaceVersion() <= 1) {
			GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is "
			"not supported on older version of the service";
			return;
			}
	if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {		if (!hasCapability(Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG)) {
	GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is not supported";		GTEST_SUCCEED() << "Capability::REFRESH_RATE_CHANGED_CALLBACK_DEBUG is not supported";
	return;		return;
	@@ -2514,9 +2538,7 @@ TEST_P(GraphicsComposerAidlCommandTest, MultiThreadedPresent) {
	* Capability::SKIP_VALIDATE has been deprecated and should not be enabled.		* Capability::SKIP_VALIDATE has been deprecated and should not be enabled.
	*/		*/
	TEST_P(GraphicsComposerAidlCommandTest, SkipValidateDeprecatedTest) {		TEST_P(GraphicsComposerAidlCommandTest, SkipValidateDeprecatedTest) {
	const auto& [versionStatus, version] = mComposerClient->getInterfaceVersion();		if (getInterfaceVersion() <= 1) {
	ASSERT_TRUE(versionStatus.isOk());
	if (version <= 1) {
	GTEST_SUCCEED() << "HAL at version 1 or lower can contain Capability::SKIP_VALIDATE.";		GTEST_SUCCEED() << "HAL at version 1 or lower can contain Capability::SKIP_VALIDATE.";
	return;		return;
	}		}