Bug 1314870 - gtestify TestWebGLElementArrayCache.cpp. r=jgilbert.

--HG--
rename : dom/canvas/compiledtest/TestWebGLElementArrayCache.cpp => dom/canvas/gtest/TestWebGLElementArrayCache.cpp
extra : rebase_source : ae30e9bcdfe2b9cdd93ce81dcdf74e887208cffc

dom/canvas/compiledtest/moz.build

@@ -1,13 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-GeckoCppUnitTests([
-    'TestWebGLElementArrayCache',
-])
-
-LOCAL_INCLUDES += [
-    '../',
-]

dom/canvas/gtest/TestWebGLElementArrayCache.cpp

@@ -6,29 +6,13 @@
 
 #include "mozilla/Assertions.h"
 
-#include "WebGLElementArrayCache.cpp"
+#include "WebGLElementArrayCache.h"
 
 #include <cstdio>
 #include <cstdlib>
 #include "nscore.h"
 #include "nsTArray.h"
 
-int gTestsPassed = 0;
-
-void
-VerifyImplFunction(bool condition, const char* file, int line)
-{
-  if (condition) {
-    gTestsPassed++;
-  } else {
-    std::fprintf(stderr, "Test failed at %s:%d\n", file, line);
-    abort();
-  }
-}
-
-#define VERIFY(condition) \
-    VerifyImplFunction((condition), __FILE__, __LINE__)
-
 void
 MakeRandomVector(nsTArray<uint8_t>& a, size_t size)
 {
@@ -57,7 +41,7 @@ GLType()
   case 2:  return LOCAL_GL_UNSIGNED_SHORT;
   case 1:  return LOCAL_GL_UNSIGNED_BYTE;
   default:
-    VERIFY(false);
+    MOZ_RELEASE_ASSERT(false);
     return 0;
   }
 }
@@ -67,7 +51,7 @@ CheckValidate(bool expectSuccess, mozilla::WebGLElementArrayCache& c, GLenum typ
               uint32_t maxAllowed, size_t first, size_t count)
 {
   const bool success = c.Validate(type, maxAllowed, first, count);
-  VERIFY(success == expectSuccess);
+  ASSERT_TRUE(success == expectSuccess);
 }
 
 template<typename T>
@@ -110,7 +94,7 @@ CheckSanity()
                         // ensure we exercise some nontrivial tree-walking
   T data[numElems] = {1,0,3,1,2,6,5,4}; // intentionally specify only 8 elements for now
   size_t numBytes = numElems * sizeof(T);
-  MOZ_RELEASE_ASSERT(numBytes == sizeof(data), "GFX: number of bytes from size of each element * number of elements equals size of data.");
+  ASSERT_TRUE(numBytes == sizeof(data));
 
   GLenum type = GLType<T>();
 
@@ -134,7 +118,7 @@ CheckSanity()
   CheckValidate(true,  c, type, numElems,     0, numElems);
   CheckValidate(false, c, type, numElems - 1, 0, numElems);
 
-  MOZ_RELEASE_ASSERT(numElems > 10, "GFX: Less than 10 elements in array cache");
+  ASSERT_TRUE(numElems > 10);
   CheckValidate(true,  c, type, numElems - 10, 10, numElems - 10);
   CheckValidate(false, c, type, numElems - 11, 10, numElems - 10);
 }
@@ -151,7 +135,7 @@ CheckUintOverflow()
                               // ensure we exercise some nontrivial tree-walking
   T data[numElems];
   size_t numBytes = numElems * sizeof(T);
-  MOZ_RELEASE_ASSERT(numBytes == sizeof(data), "GFX: size of data doesnt equal number of bytes of each element multiplied by number of elements.");
+  ASSERT_TRUE(numBytes == sizeof(data));
 
   GLenum type = GLType<T>();
 
@@ -168,8 +152,7 @@ CheckUintOverflow()
   CheckValidate(false, c, type,                        0, 0, numElems);
 }
 
-int
-main(int argc, char* argv[])
+TEST(WebGLElementArrayCache, Test)
 {
   srand(0); // do not want a random seed here.
 
@@ -219,8 +202,5 @@ main(int argc, char* argv[])
       } // j
     } // i
   } // maxBufferSize
-
-  std::fprintf(stderr, "%s: all %d tests passed\n", argv[0], gTestsPassed);
-  return 0;
 }
 

dom/canvas/gtest/moz.build

@@ -6,6 +6,7 @@
 
 UNIFIED_SOURCES += [
     'TestImageBitmapColorUtils.cpp',
+    'TestWebGLElementArrayCache.cpp',
 ]
 
 LOCAL_INCLUDES += [

dom/canvas/moz.build

@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += [
-    'compiledtest',
     'gtest'
 ]
 

testing/cppunittest.ini

@@ -74,7 +74,6 @@ skip-if = os == 'b2g'  #Bug 919595
 [TestVector]
 [TestVolatileBuffer]
 [TestWeakPtr]
-[TestWebGLElementArrayCache]
 [TestXorShift128PlusRNG]
 [buffered_stun_socket_unittest]
 [ice_unittest]