Improve EGLRecordableTest

src/tests/egl_tests/EGLRecordableTest.cpp

@@ -19,54 +19,35 @@ namespace angle
 class EGLRecordableTest : public ANGLETest
 {
   protected:
-    EGLRecordableTest() : mDisplay(0) {}
-
-    void SetUp() override
-    {
-        ANGLETest::SetUp();
-
-        EGLint dispattrs[] = {EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(), EGL_NONE};
-        mDisplay           = eglGetPlatformDisplayEXT(
-            EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<void *>(EGL_DEFAULT_DISPLAY), dispattrs);
-        ASSERT_TRUE(mDisplay != EGL_NO_DISPLAY);
-
-        ASSERT_EGL_TRUE(eglInitialize(mDisplay, nullptr, nullptr));
-    }
-
-    bool hasExtension() const
-    {
-        return ANGLETest::eglDisplayExtensionEnabled(mDisplay, "EGL_ANDROID_recordable");
-    }
-
-    void TearDown() override { eglTerminate(mDisplay); }
-
-    EGLDisplay mDisplay = EGL_NO_DISPLAY;
+    EGLRecordableTest() {}
 };
 
 // Test that the extension is always available (it is implemented in ANGLE's frontend).
 TEST_P(EGLRecordableTest, ExtensionAlwaysAvailable)
 {
-    ASSERT_TRUE(hasExtension());
+    EGLDisplay display = getEGLWindow()->getDisplay();
+    ASSERT_TRUE(ANGLETest::eglDisplayExtensionEnabled(display, "EGL_ANDROID_recordable"));
 }
 
 // Check that the default message filters and callbacks are correct
 TEST_P(EGLRecordableTest, CheckAllContexts)
 {
-    ANGLE_SKIP_TEST_IF(!hasExtension());
+    EGLDisplay display = getEGLWindow()->getDisplay();
+    ANGLE_SKIP_TEST_IF(!ANGLETest::eglDisplayExtensionEnabled(display, "EGL_ANDROID_recordable"));
 
     int nConfigs = 0;
-    ASSERT_EGL_TRUE(eglGetConfigs(mDisplay, nullptr, 0, &nConfigs));
+    ASSERT_EGL_TRUE(eglGetConfigs(display, nullptr, 0, &nConfigs));
     ASSERT_NE(nConfigs, 0);
 
     int nReturnedConfigs = 0;
     std::vector<EGLConfig> configs(nConfigs);
-    ASSERT_EGL_TRUE(eglGetConfigs(mDisplay, configs.data(), nConfigs, &nReturnedConfigs));
+    ASSERT_EGL_TRUE(eglGetConfigs(display, configs.data(), nConfigs, &nReturnedConfigs));
     ASSERT_EQ(nConfigs, nReturnedConfigs);
 
     for (EGLConfig config : configs)
     {
         EGLint isRecordable;
-        eglGetConfigAttrib(mDisplay, config, EGL_RECORDABLE_ANDROID, &isRecordable);
+        eglGetConfigAttrib(display, config, EGL_RECORDABLE_ANDROID, &isRecordable);
         ASSERT_EGL_FALSE(isRecordable);
     }
 
@@ -76,7 +57,7 @@ TEST_P(EGLRecordableTest, CheckAllContexts)
         EGL_STENCIL_SIZE, EGL_DONT_CARE,  EGL_RECORDABLE_ANDROID, EGL_FALSE,      EGL_NONE};
     EGLint configCount;
     ASSERT_EGL_TRUE(
-        eglChooseConfig(mDisplay, configAttributes, configs.data(), configs.size(), &configCount));
+        eglChooseConfig(display, configAttributes, configs.data(), configs.size(), &configCount));
     ASSERT_EGL_SUCCESS();
 }