From 785c4f4f3fd4a5447b742584c81051e6353cf1a5 Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Thu, 10 Aug 2017 11:21:19 -0700 Subject: test: add status expectation in I965TestFixture::createConfig Add VAStatus parameter to I965TestFixture::createConfig to allow users to pass in the expected status for testing. Signed-off-by: U. Artie Eoff --- test/i965_test_fixture.cpp | 15 ++++++++++----- test/i965_test_fixture.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/i965_test_fixture.cpp b/test/i965_test_fixture.cpp index 4588aa45..87a78c7c 100644 --- a/test/i965_test_fixture.cpp +++ b/test/i965_test_fixture.cpp @@ -50,7 +50,7 @@ Surfaces I965TestFixture::createSurfaces(int w, int h, int format, size_t count, *this, format, w, h, surfaces.data(), surfaces.size(), const_cast(attributes.data()), attributes.size())); - } + } } for (size_t i(0); i < count; ++i) { @@ -67,15 +67,20 @@ void I965TestFixture::destroySurfaces(Surfaces& surfaces) } VAConfigID I965TestFixture::createConfig( - VAProfile profile, VAEntrypoint entrypoint, const ConfigAttribs& attribs) + VAProfile profile, VAEntrypoint entrypoint, const ConfigAttribs& attribs, + const VAStatus expect) { VAConfigID id = VA_INVALID_ID; - EXPECT_STATUS( + EXPECT_STATUS_EQ( + expect, i965_CreateConfig( *this, profile, entrypoint, const_cast(attribs.data()), attribs.size(), &id)); - EXPECT_ID(id); - + if (expect == VA_STATUS_SUCCESS) { + EXPECT_ID(id); + } else { + EXPECT_INVALID_ID(id); + } return id; } diff --git a/test/i965_test_fixture.h b/test/i965_test_fixture.h index 02c1dbb2..1764ae4a 100644 --- a/test/i965_test_fixture.h +++ b/test/i965_test_fixture.h @@ -77,7 +77,8 @@ public: * test assertion failure. */ VAConfigID createConfig(VAProfile, VAEntrypoint, - const ConfigAttribs& = ConfigAttribs()); + const ConfigAttribs& = ConfigAttribs(), + const VAStatus = VA_STATUS_SUCCESS); /** * Convenience wrapper for i965_DestroyConfig. May generate a non-fatal -- cgit v1.2.1