commit fa05f6076ee3d0372f29e1a1381de035b964be4f
author Jamie Madill <jmadill@chromium.org> Thu May 07 13:47:11 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Fri May 08 19:12:52 2015 +0000
tree 00b076cdc298d8c64883bb2f3988bd091c2558ea
parent 0ca53786c6a5166acc545edadbd8597f59350c04

Use value-paramaterized tests instead of by type.

This should fix our non-standard template use, which causes compile
errors for the tests on GCC/Clang.

BUG=angleproject:997

Change-Id: Id1bb15231eda445f37e53a5b33d4684ec6618d8e
Reviewed-on: https://chromium-review.googlesource.com/269858
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/tests/end2end_tests/ClearTest.cpp

diff --git a/src/tests/end2end_tests/ClearTest.cpp b/src/tests/end2end_tests/ClearTest.cpp
index 42eb1af..6f788e1 100644
--- a/src/tests/end2end_tests/ClearTest.cpp
+++ b/src/tests/end2end_tests/ClearTest.cpp
@@ -1,14 +1,17 @@
+//
+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
 #include "ANGLETest.h"
 
-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(ClearTest, ES2_D3D9, ES2_D3D11, ES3_D3D11, ES2_OPENGL, ES3_OPENGL);
-ANGLE_TYPED_TEST_CASE(ClearTestES3, ES3_D3D11);
+using namespace angle;
 
-template<typename T>
 class ClearTestBase : public ANGLETest
 {
   protected:
-    ClearTestBase() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+    ClearTestBase()
     {
         setWindowWidth(128);
         setWindowHeight(128);
@@ -67,15 +70,10 @@
     GLuint mFBO;
 };
 
-template <typename T>
-class ClearTest : public ClearTestBase<T>
-{};
+class ClearTest : public ClearTestBase {};
+class ClearTestES3 : public ClearTestBase {};
 
-template <typename T>
-class ClearTestES3 : public ClearTestBase<T>
-{};
-
-TYPED_TEST(ClearTest, ClearIssue)
+TEST_P(ClearTest, ClearIssue)
 {
     // TODO(geofflang): Figure out why this is broken on Intel OpenGL
     if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
@@ -123,7 +121,7 @@
 // Requires ES3
 // This tests a bug where in a masked clear when calling "ClearBuffer", we would
 // mistakenly clear every channel (including the masked-out ones)
-TYPED_TEST(ClearTestES3, MaskedClearBufferBug)
+TEST_P(ClearTestES3, MaskedClearBufferBug)
 {
     unsigned char pixelData[] = { 255, 255, 255, 255 };
 
@@ -162,7 +160,7 @@
     glDeleteTextures(2, textures);
 }
 
-TYPED_TEST(ClearTestES3, BadFBOSerialBug)
+TEST_P(ClearTestES3, BadFBOSerialBug)
 {
     // First make a simple framebuffer, and clear it to green
     glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
@@ -209,3 +207,7 @@
     glDeleteTextures(2, textures);
     glDeleteFramebuffers(1, &fbo2);
 }
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(ClearTest, ES2_D3D9(), ES2_D3D11(), ES3_D3D11(), ES2_OPENGL(), ES3_OPENGL());
+ANGLE_INSTANTIATE_TEST(ClearTestES3, ES3_D3D11());