commit b489e134ef5d3ec4ec87d4cdeeb5fdf7552ba0a5
author U. Artie Eoff <ullysses.a.eoff@intel.com> Fri Jan 19 11:49:55 2018 -0800
committer Xiang, Haihao <haihao.xiang@intel.com> Mon Jan 29 13:35:50 2018 +0800
tree 3f9d17c196ef2e77576c6019b124eb9198335a08
parent ef9b0c8ba5985f2db0a501025ca29df4ab0494ab

test/createbuffer: use new profile/entrypoint fixture methods

Use new profile/entrypoint fixture methods and refactor
to simplify logic.

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

test/test_va_api_createbuffer.cpp

diff --git a/test/test_va_api_createbuffer.cpp b/test/test_va_api_createbuffer.cpp
index 7e57c9a..cab4fa7 100644
--- a/test/test_va_api_createbuffer.cpp
+++ b/test/test_va_api_createbuffer.cpp
@@ -52,13 +52,26 @@
 {
 public:
     VAAPICreateBuffer()
+        : profile(GetParam().config.first)
+        , entrypoint(GetParam().config.second)
+        , bufferType(GetParam().bufferType)
+    { }
+
+protected:
+    const VAProfile& profile;
+    const VAEntrypoint& entrypoint;
+    const VABufferType& bufferType;
+
+    virtual void SetUp()
     {
-        m_vaDisplay = doInitialize();
+        VAAPIFixture::SetUp();
+        doInitialize();
     }
 
-    virtual ~VAAPICreateBuffer()
+    virtual void TearDown()
     {
         doTerminate();
+        VAAPIFixture::TearDown();
     }
 };
 
@@ -150,40 +163,27 @@
     // the minimum requirements.  There's no need to create surfaces or attach
     // them to a VAConfigID.
 
-    const TestInput& input = GetParam();
-    const VAProfile& profile = input.config.first;
-    const VAEntrypoint& entrypoint = input.config.second;
-    const VABufferType bufferType = input.bufferType;
+    if (not isSupported(profile, entrypoint)) {
+        doLogSkipTest(profile, entrypoint);
+        return;
+    }
+
     Resolution minRes, maxRes;
 
-    doGetMaxValues();
-    doQueryConfigProfiles();
+    // profile and entrypoint are supported
+    createConfig(profile, entrypoint);
 
-    if (doFindProfileInList(profile)) {
-        doQueryConfigEntrypoints(profile);
-        if (doFindEntrypointInList(entrypoint)) {
-            // profile and entrypoint are supported
-            createConfig(profile, entrypoint);
+    // vaCreateContext input requires resolution, since this test
+    // doesn't create surfaces, passing min resolution should provide
+    // the desired result.
+    getMinMaxSurfaceResolution(minRes,maxRes);
+    doCreateContext(minRes);
 
-            // vaCreateContext input requires resolution, since this test
-            // doesn't create surfaces, passing min resolution should provide
-            // the desired result.
-            getMinMaxSurfaceResolution(minRes,maxRes);
-            doCreateContext(minRes);
+    doCreateBuffer(bufferType);
+    doDestroyBuffer();
 
-            doCreateBuffer(bufferType);
-            doDestroyBuffer();
-
-            doDestroyContext();
-            destroyConfig();
-        } else {
-            // entrypoint not supported
-            doLogSkipTest(profile, entrypoint);
-        }
-    } else {
-        // profile not supported
-        doLogSkipTest(profile, entrypoint);
-    }
+    doDestroyContext();
+    destroyConfig();
 }
 
 std::vector<TestInput> generateInput()