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/IndexedPointsTest.cpp

diff --git a/src/tests/end2end_tests/IndexedPointsTest.cpp b/src/tests/end2end_tests/IndexedPointsTest.cpp
index 026db32..d8add01 100644
--- a/src/tests/end2end_tests/IndexedPointsTest.cpp
+++ b/src/tests/end2end_tests/IndexedPointsTest.cpp
@@ -1,11 +1,20 @@
+//
+// 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"
+
 #include <array>
 
-template <typename T, typename IndexType, GLenum IndexTypeName>
+using namespace angle;
+
+template <typename IndexType, GLenum IndexTypeName>
 class IndexedPointsTest : public ANGLETest
 {
-protected:
-    IndexedPointsTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+  protected:
+    IndexedPointsTest()
     {
         setWindowWidth(128);
         setWindowHeight(128);
@@ -123,53 +132,53 @@
     static const GLuint mPointCount = 4;
 };
 
-typedef IndexedPointsTest<ES2_D3D11, GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte;
+typedef IndexedPointsTest<GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte;
 
-TEST_F(IndexedPointsTestUByte, UnsignedByteOffset0)
+TEST_P(IndexedPointsTestUByte, UnsignedByteOffset0)
 {
     runTest(0);
 }
 
-TEST_F(IndexedPointsTestUByte, UnsignedByteOffset1)
+TEST_P(IndexedPointsTestUByte, UnsignedByteOffset1)
 {
     runTest(1);
 }
 
-TEST_F(IndexedPointsTestUByte, UnsignedByteOffset2)
+TEST_P(IndexedPointsTestUByte, UnsignedByteOffset2)
 {
     runTest(2);
 }
 
-TEST_F(IndexedPointsTestUByte, UnsignedByteOffset3)
+TEST_P(IndexedPointsTestUByte, UnsignedByteOffset3)
 {
     runTest(3);
 }
 
-typedef IndexedPointsTest<ES2_D3D11, GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort;
+typedef IndexedPointsTest<GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort;
 
-TEST_F(IndexedPointsTestUShort, UnsignedShortOffset0)
+TEST_P(IndexedPointsTestUShort, UnsignedShortOffset0)
 {
     runTest(0);
 }
 
-TEST_F(IndexedPointsTestUShort, UnsignedShortOffset1)
+TEST_P(IndexedPointsTestUShort, UnsignedShortOffset1)
 {
     runTest(1);
 }
 
-TEST_F(IndexedPointsTestUShort, UnsignedShortOffset2)
+TEST_P(IndexedPointsTestUShort, UnsignedShortOffset2)
 {
     runTest(2);
 }
 
-TEST_F(IndexedPointsTestUShort, UnsignedShortOffset3)
+TEST_P(IndexedPointsTestUShort, UnsignedShortOffset3)
 {
     runTest(3);
 }
 
-typedef IndexedPointsTest<ES2_D3D11, GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt;
+typedef IndexedPointsTest<GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt;
 
-TEST_F(IndexedPointsTestUInt, UnsignedIntOffset0)
+TEST_P(IndexedPointsTestUInt, UnsignedIntOffset0)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
     {
@@ -179,7 +188,7 @@
     runTest(0);
 }
 
-TEST_F(IndexedPointsTestUInt, UnsignedIntOffset1)
+TEST_P(IndexedPointsTestUInt, UnsignedIntOffset1)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
     {
@@ -189,7 +198,7 @@
     runTest(1);
 }
 
-TEST_F(IndexedPointsTestUInt, UnsignedIntOffset2)
+TEST_P(IndexedPointsTestUInt, UnsignedIntOffset2)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
     {
@@ -199,7 +208,7 @@
     runTest(2);
 }
 
-TEST_F(IndexedPointsTestUInt, UnsignedIntOffset3)
+TEST_P(IndexedPointsTestUInt, UnsignedIntOffset3)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
     {
@@ -208,3 +217,7 @@
 
     runTest(3);
 }
+
+ANGLE_INSTANTIATE_TEST(IndexedPointsTestUByte, ES2_D3D11());
+ANGLE_INSTANTIATE_TEST(IndexedPointsTestUShort, ES2_D3D11());
+ANGLE_INSTANTIATE_TEST(IndexedPointsTestUInt, ES2_D3D11());