Replace CppUnit with GoogleTest in AX tests

openvdb_ax/openvdb_ax/compiler/Logger.h

@@ -16,6 +16,8 @@
 
 #include <openvdb/version.h>
 
+#include <gtest/gtest.h> // FRIEND_TEST, see TestLogger.cc
+
 #include <functional>
 #include <string>
 #include <unordered_map>
@@ -197,7 +199,9 @@ class OPENVDB_AX_API Logger
 
 private:
 
-    friend class ::TestLogger;
+    FRIEND_TEST(TestLogger, testParseSetsTree);
+    FRIEND_TEST(TestLogger, testAddError);
+    FRIEND_TEST(TestLogger, testAddWarning);
 
     OutputFunction mErrorOutput;
     OutputFunction mWarningOutput;

openvdb_ax/openvdb_ax/compiler/PointExecutable.h

@@ -20,6 +20,8 @@
 #include <openvdb/version.h>
 #include <openvdb/points/PointDataGrid.h>
 
+#include <gtest/gtest.h> // FRIEND_TEST, see TestPointExecutable.cc
+
 #include <unordered_map>
 
 class TestPointExecutable;
@@ -167,7 +169,9 @@ class OPENVDB_AX_API PointExecutable
 
 private:
     friend class Compiler;
-    friend class ::TestPointExecutable;
+
+    FRIEND_TEST(TestPointExecutable, testConstructionDestruction);
+    FRIEND_TEST(TestPointExecutable, testAttributeCodecs);
 
     /// @brief  Private method used in the unit tests
     bool usesAcceleratedKernel(const points::PointDataTree& tree) const;

openvdb_ax/openvdb_ax/compiler/VolumeExecutable.h

@@ -19,6 +19,8 @@
 #include <openvdb/version.h>
 #include <openvdb/Grid.h>
 
+#include <gtest/gtest.h> // FRIEND_TEST, see TestVolumeExecutable.cc
+
 #include <unordered_map>
 
 class TestVolumeExecutable;
@@ -293,7 +295,8 @@ class OPENVDB_AX_API VolumeExecutable
 
 private:
     friend class Compiler;
-    friend class ::TestVolumeExecutable;
+
+    FRIEND_TEST(TestVolumeExecutable, testConstructionDestruction);
 
     /// @brief Constructor, expected to be invoked by the compiler. Should not
     ///   be invoked directly.

openvdb_ax/openvdb_ax/test/CMakeLists.txt

@@ -49,8 +49,17 @@ elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
   list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS TBB::tbbmalloc)
 endif()
 
-find_package(CppUnit ${MINIMUM_CPPUNIT_VERSION} REQUIRED)
-list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS CppUnit::cppunit)
+find_package(GTest ${MINIMUM_GOOGLETEST_VERSION} REQUIRED)
+
+if(TARGET GTest::gtest_main)
+  # New gtest targets as of CMake 3.20. Defined by both the Config and Module
+  # find modes
+  list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS GTest::gtest GTest::gtest_main)
+else()
+  # Older targets, only defined by the Module find_package calls
+  list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS GTest::GTest GTest::Main)
+endif()
+
 
 set(TEST_SOURCE_FILES
   ast/TestScanners.cc

openvdb_ax/openvdb_ax/test/ast/TestPrinters.cc

@@ -5,48 +5,38 @@
 #include <openvdb_ax/ast/Parse.h>
 #include <openvdb_ax/ast/PrintTree.h>
 
-#include <cppunit/extensions/HelperMacros.h>
+#include <gtest/gtest.h>
 
 #include <string>
 #include <ostream>
 
 using namespace openvdb::ax::ast;
 using namespace openvdb::ax::ast::tokens;
 
-class TestPrinters : public CppUnit::TestCase
+class TestPrinters : public ::testing::Test
 {
-public:
-
-    CPPUNIT_TEST_SUITE(TestPrinters);
-    CPPUNIT_TEST(testReprint);
-    CPPUNIT_TEST_SUITE_END();
-
-    void testReprint();
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION(TestPrinters);
-
-void TestPrinters::testReprint()
+TEST_F(TestPrinters, testReprint)
 {
     // Small function providing more verbose output on failures
     auto check = [](const std::string& in, const std::string& expected) {
         const size_t min = std::min(in.size(), expected.size());
         for (size_t i = 0; i < min; ++i) {
             if (in[i] != expected[i]) {
-                std::ostringstream msg;
-                msg << "TestReprint failed at character " << i << '.'
+                std::cout << "TestReprint failed at character " << i << '.'
                     << '[' << in[i] << "] vs [" << expected[i] << "]\n"
                     << "Got:\n" << in
                     << "Expected:\n" << expected;
-                CPPUNIT_FAIL(msg.str());
+                ADD_FAILURE();
+                return;
             }
         }
         if (in.size() != expected.size()) {
-            std::ostringstream msg;
-            msg << "TestReprint failed at end character.\n"
+            std::cout << "TestReprint failed at end character.\n"
                 << "Got:\n" << in
                 << "Expected:\n" << expected ;
-            CPPUNIT_FAIL(msg.str());
+            ADD_FAILURE();
         }
     };
 
@@ -56,7 +46,7 @@ void TestPrinters::testReprint()
     std::string in = "a + b * c / d % e << f >> g = h & i | j ^ k && l || m;";
     std::string expected = "(((a + (((b * c) / d) % e)) << f) >> g = ((((h & i) | (j ^ k)) && l) || m));\n";
     Tree::ConstPtr tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -65,7 +55,7 @@ void TestPrinters::testReprint()
     in = "(a + b) * (c / d) % e << (f) >> g = (((h & i) | j) ^ k) && l || m;";
     expected = "(((((a + b) * (c / d)) % e) << f) >> g = (((((h & i) | j) ^ k) && l) || m));\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -74,7 +64,7 @@ void TestPrinters::testReprint()
     in = "a <= b; c >= d; e == f; g != h; i < j; k > l;";
     expected = "(a <= b);\n(c >= d);\n(e == f);\n(g != h);\n(i < j);\n(k > l);\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -83,7 +73,7 @@ void TestPrinters::testReprint()
     in = "a = b; b += c; c -= d; d /= e; e *= f; f %= 1; g &= 2; h |= 3; i ^= 4; j <<= 5; k >>= 6;";
     expected = "a = b;\nb += c;\nc -= d;\nd /= e;\ne *= f;\nf %= 1;\ng &= 2;\nh |= 3;\ni ^= 4;\nj <<= 5;\nk >>= 6;\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -92,7 +82,7 @@ void TestPrinters::testReprint()
     in = "++++a; ----b; a++; b--;";
     expected = "++++a;\n----b;\na++;\nb--;\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -101,7 +91,7 @@ void TestPrinters::testReprint()
     in = "a,b,(c,d),(e,(f,(g,h,i)));";
     expected = "(a, b, (c, d), (e, (f, (g, h, i))));\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -110,7 +100,7 @@ void TestPrinters::testReprint()
     in = "a.x; b.y; c.z; d[0]; d[1,2]; e[(a.r, c.b), b.g];";
     expected = "a[0];\nb[1];\nc[2];\nd[0];\nd[1, 2];\ne[(a[0], c[2]), b[1]];\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -119,7 +109,7 @@ void TestPrinters::testReprint()
     in = "a = {0,1}; b = {2,3,4}; c = {a,(b,c), d};";
     expected = "a = {0, 1};\nb = {2, 3, 4};\nc = {a, (b, c), d};\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -128,7 +118,7 @@ void TestPrinters::testReprint()
     in = "bool a; int b,c; int32 d=0, e; int64 f; float g; double h, i=0;";
     expected = "bool a;\nint32 b, c;\nint32 d = 0, e;\nint64 f;\nfloat g;\ndouble h, i = 0;\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -137,7 +127,7 @@ void TestPrinters::testReprint()
     in = "if (a) b; else if (c) d; else e; if (a) if (b) { c,d; } else { e,f; }";
     expected = "if (a)\n{\nb;\n}\nelse\n{\nif (c)\n{\nd;\n}\nelse\n{\ne;\n}\n}\nif (a)\n{\nif (b)\n{\n(c, d);\n}\nelse\n{\n(e, f);\n}\n}\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -146,7 +136,7 @@ void TestPrinters::testReprint()
     in = "return; break; continue; true; false;";
     expected = "return;\nbreak;\ncontinue;\ntrue;\nfalse;\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -155,7 +145,7 @@ void TestPrinters::testReprint()
     in = "@a; $a; v@b; v$b; f@a; f$a; i@c; i$c; s@d; s$d;";
     expected = "float@a;\nfloat$a;\nvec3f@b;\nvec3f$b;\nfloat@a;\nfloat$a;\nint32@c;\nint32$c;\nstring@d;\nstring$d;\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -164,7 +154,7 @@ void TestPrinters::testReprint()
     in = "a ? b : c; a ? b ? c ? : d : e : f;";
     expected = "a ? b : c;\na ? b ? c ?: d : e : f;\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -173,7 +163,7 @@ void TestPrinters::testReprint()
     in = "while (a) for (int32 b, c;;) do { d; } while (e)";
     expected = "while (a)\n{\nfor (int32 b, c; true; )\n{\ndo\n{\nd;\n}\nwhile (e)\n}\n}\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "");
     check(os.str(), ("{\n" + expected + "}\n"));
 
@@ -182,7 +172,7 @@ void TestPrinters::testReprint()
     in = "while (a) for (int32 b, c;;) do { d; } while (e)";
     expected = "  while (a)\n  {\n    for (int32 b, c; true; )\n    {\n      do\n      {\n        d;\n      }\n      while (e)\n    }\n  }\n";
     tree = parse(in.c_str());
-    CPPUNIT_ASSERT(tree.get());
+    ASSERT_TRUE(tree.get());
     reprint(*tree, os, "  ");
     check(os.str(), ("{\n" + expected + "}\n"));
 }