From da9dc0ccaa700b746706f85b89fe5f1cd12f7011 Mon Sep 17 00:00:00 2001
From: Aina Niemetz <aina.niemetz@gmail.com>
Date: Fri, 26 Feb 2021 18:54:23 -0800
Subject: [PATCH] google test: util: Migrate check_white. (#6017)

---
 test/unit/util/CMakeLists.txt                 |  2 +-
 .../util/{check_white.h => check_white.cpp}   | 67 ++++++++++---------
 2 files changed, 35 insertions(+), 34 deletions(-)
 rename test/unit/util/{check_white.h => check_white.cpp} (51%)

diff --git a/test/unit/util/CMakeLists.txt b/test/unit/util/CMakeLists.txt
index 710cbf28c..11469be75 100644
--- a/test/unit/util/CMakeLists.txt
+++ b/test/unit/util/CMakeLists.txt
@@ -17,7 +17,7 @@ cvc4_add_unit_test_black(binary_heap_black util)
 cvc4_add_cxx_unit_test_black(bitvector_black util)
 cvc4_add_cxx_unit_test_black(boolean_simplification_black util)
 cvc4_add_unit_test_black(cardinality_black util)
-cvc4_add_cxx_unit_test_white(check_white util)
+cvc4_add_unit_test_white(check_white util)
 cvc4_add_cxx_unit_test_black(configuration_black util)
 cvc4_add_cxx_unit_test_black(datatype_black util)
 cvc4_add_cxx_unit_test_black(exception_black util)
diff --git a/test/unit/util/check_white.h b/test/unit/util/check_white.cpp
similarity index 51%
rename from test/unit/util/check_white.h
rename to test/unit/util/check_white.cpp
index 802ff5118..766890bf0 100644
--- a/test/unit/util/check_white.h
+++ b/test/unit/util/check_white.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
-/*! \file check_white.h
+/*! \file check_white.cpp
  ** \verbatim
  ** Top contributors (to current version):
- **   Tim King, Mathias Preiner
+ **   Aina Niemetz, Tim King, Mathias Preiner
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2020 by the authors listed in the file AUTHORS
  ** in the top-level source directory and their institutional affiliations.
@@ -14,52 +14,53 @@
  ** White box testing of check utilities.
  **/
 
-#include <cxxtest/TestSuite.h>
-
 #include <cstring>
 #include <string>
 
 #include "base/check.h"
-#include "test_utils.h"
-
-using namespace std;
-using namespace CVC4;
+#include "test.h"
 
-namespace {
+namespace CVC4 {
+namespace test {
 
-class CheckWhite : public CxxTest::TestSuite
+class TestUtilWhiteCheck : public TestInternal
 {
- public:
-  const int kOne = 1;
+ protected:
+  static constexpr uint32_t K_ONE = 1;
 
   // This test just checks that this statement compiles.
-  std::string TerminalCvc4Fatal() const
+  std::string terminalCvc4Fatal() const
   {
     CVC4_FATAL() << "This is a test that confirms that CVC4_FATAL can be a "
                     "terminal statement in a function that has a non-void "
                     "return type.";
   }
+};
 
-  void testCheck() { AlwaysAssert(kOne >= 0) << kOne << " must be positive"; }
-  void testDCheck()
-  {
-    Assert(kOne == 1) << "always passes";
-#ifndef CVC4_ASSERTIONS
-    Assert(false) << "Will not be compiled in when CVC4_ASSERTIONS off.";
-#endif /* CVC4_ASSERTIONS */
-  }
+TEST_F(TestUtilWhiteCheck, check)
+{
+  AlwaysAssert(K_ONE >= 0) << K_ONE << " must be positive";
+}
 
-  void testPointerTypeCanBeTheCondition()
-  {
-    const int* one_pointer = &kOne;
-    AlwaysAssert(one_pointer);
-  }
+TEST_F(TestUtilWhiteCheck, dcheck)
+{
+  Assert(K_ONE == 1) << "always passes";
+#ifndef CVC4_ASSERTIONS
+  Assert(false) << "Will not be compiled in when CVC4_ASSERTIONS off.";
+#endif
+}
 
-  void testExpectAbort()
-  {
-    TS_UTILS_EXPECT_ABORT(AlwaysAssert(false));
-    TS_UTILS_EXPECT_ABORT(Assert(false));
-  }
-};
+TEST_F(TestUtilWhiteCheck, pointer_type_can_be_condition)
+{
+  const uint32_t* one_pointer = &K_ONE;
+  Assert(one_pointer);
+  AlwaysAssert(one_pointer);
+}
 
-}  // namespace
+TEST_F(TestUtilWhiteCheck, expect_abort)
+{
+  ASSERT_DEATH(Assert(false), "false");
+  ASSERT_DEATH(AlwaysAssert(false), "false");
+}
+}  // namespace test
+}  // namespace CVC4
-- 
2.30.2