commit 5cbaa3f8fda758de9a7b1483616f6b5b13737e80
author Jamie Madill <jmadill@chromium.org> Tue May 07 15:49:22 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Wed May 08 18:24:39 2019 +0000
tree 0b3ac685c38ba8c12b640c06ac7498ddc49c40a2
parent 8fb00484a46261393c35a16f10951a7b723ba169

Don't inherit ANGLETest SetUp and TearDown.

Instead of inheriting from testing::Test's SetUp and TearDown we add
new methods 'testSetUp' and 'testTearDown'. This helps prevent a common
error of forgetting to call the base class method.

Also add a check in the ANGLETest destructor that SetUp and TearDown
have been called.

Bug: angleproject:3393
Change-Id: Iab211305cc06ffea9ca649e864ddc9b180f2cba0
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1593960
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/tests/gl_tests/ImageTest.cpp

diff --git a/src/tests/gl_tests/ImageTest.cpp b/src/tests/gl_tests/ImageTest.cpp
index fb3cce6..ef28cc2 100644
--- a/src/tests/gl_tests/ImageTest.cpp
+++ b/src/tests/gl_tests/ImageTest.cpp
@@ -40,10 +40,8 @@
         setConfigDepthBits(24);
     }
 
-    void SetUp() override
+    void testSetUp() override
     {
-        ANGLETest::SetUp();
-
         constexpr char kVS[] =
             "precision highp float;\n"
             "attribute vec4 position;\n"
@@ -133,13 +131,11 @@
         ASSERT_GL_NO_ERROR();
     }
 
-    void TearDown() override
+    void testTearDown() override
     {
         glDeleteProgram(mTextureProgram);
         glDeleteProgram(mTextureExternalProgram);
         glDeleteProgram(mTextureExternalESSL3Program);
-
-        ANGLETest::TearDown();
     }
 
     void createEGLImage2DTextureSource(size_t width,