commit e55d151580166f2e568177d81444c92fa1366912
author U. Artie Eoff <ullysses.a.eoff@intel.com> Fri Jan 19 12:42:33 2018 -0800
committer Xiang, Haihao <haihao.xiang@intel.com> Mon Jan 29 13:35:50 2018 +0800
tree d557f842ca405610f2988993919af2efe1ba32f9
parent 92b640059ead62d15d8f5ae0f05010ded0e6ec20

test/fixture: remove legacy profile/entrypoint methods

No more tests are using the legacy profile/entrypoint
methods.  So remove them.

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 0ba567e..00702c5 100644
--- a/test/test_va_api_fixture.cpp
+++ b/test/test_va_api_fixture.cpp
@@ -40,9 +40,6 @@
     , m_restoreDriverName(getenv("LIBVA_DRIVER_NAME"))
     , m_drmHandle(-1)
     , drmDevicePaths({ "/dev/dri/renderD128", "/dev/dri/card0" })
-    , m_maxEntrypoints(0)
-    , m_maxProfiles(0)
-    , m_numProfiles(0)
     , m_configID(VA_INVALID_ID)
     , m_contextID(VA_INVALID_ID)
     , m_bufferID(VA_INVALID_ID)
@@ -102,75 +99,6 @@
     return vaDisplay;
 }
 
-void VAAPIFixture::doGetMaxProfiles()
-{
-    m_maxProfiles = vaMaxNumProfiles(m_vaDisplay);
-    EXPECT_TRUE(m_maxProfiles > 0) << m_maxProfiles
-                                   << " profiles are reported, check setup";
-}
-
-void VAAPIFixture::doGetMaxEntrypoints()
-{
-    m_maxEntrypoints = vaMaxNumEntrypoints(m_vaDisplay);
-    EXPECT_TRUE(m_maxEntrypoints > 0)
-        << m_maxEntrypoints << " entrypoints are reported, check setup";
-}
-
-void VAAPIFixture::doGetMaxValues()
-{
-    doGetMaxProfiles();
-    doGetMaxEntrypoints();
-}
-
-void VAAPIFixture::doQueryConfigProfiles()
-{
-    m_profileList.resize(m_maxProfiles);
-
-    ASSERT_STATUS(
-        vaQueryConfigProfiles(m_vaDisplay, &m_profileList[0], &m_numProfiles));
-
-    // at least one profile should be supported for tests to be executed
-    ASSERT_TRUE(m_numProfiles > 0);
-
-    m_profileList.resize(m_numProfiles);
-}
-
-const Profiles& VAAPIFixture::getSupportedProfileList() const
-{
-    return m_profileList;
-}
-
-const Entrypoints& VAAPIFixture::getSupportedEntrypointList() const
-{
-    return m_entrypointList;
-}
-
-bool VAAPIFixture::doFindProfileInList(const VAProfile& profile) const
-{
-    return std::find(m_profileList.begin(), m_profileList.end(), profile)
-           != m_profileList.end();
-}
-
-void VAAPIFixture::doQueryConfigEntrypoints(const VAProfile& profile)
-{
-    int numEntrypoints = 0;
-
-    m_entrypointList.resize(m_maxEntrypoints);
-    ASSERT_STATUS(vaQueryConfigEntrypoints(
-        m_vaDisplay, profile, &m_entrypointList[0], &numEntrypoints));
-
-    EXPECT_TRUE(numEntrypoints > 0);
-
-    m_entrypointList.resize(numEntrypoints);
-}
-
-bool VAAPIFixture::doFindEntrypointInList(const VAEntrypoint& entrypoint) const
-{
-    return std::find(m_entrypointList.begin(), m_entrypointList.end(),
-                     entrypoint)
-           != m_entrypointList.end();
-}
-
 void VAAPIFixture::queryConfigProfiles(Profiles& profiles) const
 {
     const int maxProfiles = vaMaxNumProfiles(m_vaDisplay);

test/test_va_api_fixture.h

diff --git a/test/test_va_api_fixture.h b/test/test_va_api_fixture.h
index 891c0d5..c88df16 100644
--- a/test/test_va_api_fixture.h
+++ b/test/test_va_api_fixture.h
@@ -43,16 +43,6 @@
     VADisplay doInitialize();
     void doTerminate();
 
-    void doGetMaxProfiles();
-    void doGetMaxEntrypoints();
-    void doGetMaxValues();
-    void doQueryConfigProfiles();
-    const Profiles& getSupportedProfileList() const;
-    bool doFindProfileInList(const VAProfile&) const;
-    void doQueryConfigEntrypoints(const VAProfile&);
-    const Entrypoints& getSupportedEntrypointList() const;
-    bool doFindEntrypointInList(const VAEntrypoint&) const;
-
     void doCreateContext(const Resolution&,
         const VAStatus& expectation = VA_STATUS_SUCCESS);
     void doDestroyContext(const VAStatus& expectation = VA_STATUS_SUCCESS);
@@ -111,16 +101,9 @@
     int m_drmHandle;
     const std::string drmDevicePaths[2];
 
-    int m_maxEntrypoints;
-    int m_maxProfiles;
-    int m_numProfiles;
-
     VAConfigID m_configID;
     VAContextID m_contextID;
     VABufferID m_bufferID;
-
-    Profiles m_profileList;
-    Entrypoints m_entrypointList;
 };
 
 } // namespace VAAPI