commit b570a28ea4e33dec14039bb30feec78ffa408ecc
author U. Artie Eoff <ullysses.a.eoff@intel.com> Fri Jan 19 11:25:00 2018 -0800
committer Xiang, Haihao <haihao.xiang@intel.com> Mon Jan 29 13:35:50 2018 +0800
tree 023273a7189573b35599d81877d96a941c7d471d
parent 15fb08bd9394ce8a45b403873e088c6d3808c798

test/fixture: remove doGetMaxNumConfigAttribs

The result of doGetMaxNumConfigAttribs is only needed
by queryConfigAttributes.  Thus, just call
vaMaxNumConfigAttributes in queryConfigAttributes when
necessary (it should have low call overhead).  This
also removes the need to use a member state variable.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>

test/test_va_api_fixture.cpp

diff --git a/test/test_va_api_fixture.cpp b/test/test_va_api_fixture.cpp
index 56824f5..0ba567e 100644
--- a/test/test_va_api_fixture.cpp
+++ b/test/test_va_api_fixture.cpp
@@ -43,7 +43,6 @@
     , m_maxEntrypoints(0)
     , m_maxProfiles(0)
     , m_numProfiles(0)
-    , m_maxConfigAttributes(0)
     , m_configID(VA_INVALID_ID)
     , m_contextID(VA_INVALID_ID)
     , m_bufferID(VA_INVALID_ID)
@@ -117,18 +116,10 @@
         << m_maxEntrypoints << " entrypoints are reported, check setup";
 }
 
-void VAAPIFixture::doGetMaxNumConfigAttribs()
-{
-    m_maxConfigAttributes = vaMaxNumConfigAttributes(m_vaDisplay);
-
-    EXPECT_TRUE(m_maxConfigAttributes > 0);
-}
-
 void VAAPIFixture::doGetMaxValues()
 {
     doGetMaxProfiles();
     doGetMaxEntrypoints();
-    doGetMaxNumConfigAttribs();
 }
 
 void VAAPIFixture::doQueryConfigProfiles()
@@ -316,7 +307,11 @@
     ASSERT_TRUE(attributes.empty())
         << "test logic error: attributes must be empty";
 
-    attributes.resize(m_maxConfigAttributes);
+    const int maxAttributes = vaMaxNumConfigAttributes(m_vaDisplay);
+
+    ASSERT_GT(maxAttributes, 0);
+
+    attributes.resize(maxAttributes);
 
     EXPECT_STATUS_EQ(
         expectedStatus,
@@ -326,6 +321,7 @@
     if (expectedStatus == VA_STATUS_SUCCESS) {
         EXPECT_EQ(expectedProfile, actualProfile);
         EXPECT_EQ(expectedEntrypoint, actualEntrypoint);
+        ASSERT_LE(numAttributes, maxAttributes);
         ASSERT_GT(numAttributes, 0);
 
         attributes.resize(numAttributes);

test/test_va_api_fixture.h

diff --git a/test/test_va_api_fixture.h b/test/test_va_api_fixture.h
index 66baa91..891c0d5 100644
--- a/test/test_va_api_fixture.h
+++ b/test/test_va_api_fixture.h
@@ -45,7 +45,6 @@
 
     void doGetMaxProfiles();
     void doGetMaxEntrypoints();
-    void doGetMaxNumConfigAttribs();
     void doGetMaxValues();
     void doQueryConfigProfiles();
     const Profiles& getSupportedProfileList() const;
@@ -115,7 +114,6 @@
     int m_maxEntrypoints;
     int m_maxProfiles;
     int m_numProfiles;
-    int m_maxConfigAttributes;
 
     VAConfigID m_configID;
     VAContextID m_contextID;