google test: Merge Node(Manager) fixtures. (#5998)

diff --git a/test/unit/expr/node_algorithm_black.cpp b/test/unit/expr/node_algorithm_black.cpp
index 95018d9f164ef96a0e5da93ef0f5438a625966f2..66bad7ee86350bbd1284d34d4bf228b79b1d035f 100644 (file)
--- a/test/unit/expr/node_algorithm_black.cpp
+++ b/test/unit/expr/node_algorithm_black.cpp
@@ -32,7 +32,7 @@ using namespace kind;
 
 namespace test {
 
-class TestNodeBlackNodeAlgorithm : public TestNodeBlack
+class TestNodeBlackNodeAlgorithm : public TestNode
 {
 };
 

diff --git a/test/unit/expr/node_black.cpp b/test/unit/expr/node_black.cpp
index 33576b2cce030e71f0880d0f0bc9ef0ab4678f63..ddbdcde6b9674412657a4e1a525386aea8cc18bb 100644 (file)
--- a/test/unit/expr/node_black.cpp
+++ b/test/unit/expr/node_black.cpp
@@ -52,12 +52,12 @@ std::vector<Node> makeNSkolemNodes(NodeManager* nodeManager,
 }
 }  // namespace
 
-class TestNodeBlackNode : public TestNodeBlack
+class TestNodeBlackNode : public TestNode
 {
  protected:
   void SetUp() override
   {
-    TestNodeBlack::SetUp();
+    TestNode::SetUp();
     // setup an SMT engine so that options are in scope
     Options opts;
     char* argv[2];

diff --git a/test/unit/expr/node_builder_black.cpp b/test/unit/expr/node_builder_black.cpp
index 20f907e18a8b592689f56fe365a6a5d34d748186..b5e028d41aa0d75f74a063e19b03941ba0e40623 100644 (file)
--- a/test/unit/expr/node_builder_black.cpp
+++ b/test/unit/expr/node_builder_black.cpp
@@ -36,7 +36,7 @@ using namespace kind;
 
 namespace test {
 
-class TestNodeBlackNodeBuilder : public TestNodeBlack
+class TestNodeBlackNodeBuilder : public TestNode
 {
  protected:
   template <unsigned N>

diff --git a/test/unit/expr/node_manager_black.cpp b/test/unit/expr/node_manager_black.cpp
index 09463a28ecc5565913487b406d4acd1caa8e7fbc..4b72f04187dfa909bb40a42e05a61ecad8a89026 100644 (file)
--- a/test/unit/expr/node_manager_black.cpp
+++ b/test/unit/expr/node_manager_black.cpp
@@ -32,7 +32,7 @@ using namespace expr;
 
 namespace test {
 
-class TestNodeBlackNodeManager : public TestNodeBlack
+class TestNodeBlackNodeManager : public TestNode
 {
 };
 

diff --git a/test/unit/expr/node_manager_white.cpp b/test/unit/expr/node_manager_white.cpp
index e7c9cf69db498a5e2958f7f55d8ac28b1d3af5a8..d491d19ab5d291d80baf919ac3bf4c466e0dabb2 100644 (file)
--- a/test/unit/expr/node_manager_white.cpp
+++ b/test/unit/expr/node_manager_white.cpp
@@ -27,7 +27,7 @@ using namespace CVC4::expr;
 
 namespace test {
 
-class TestNodeWhiteNodeManager : public TestNodeWhite
+class TestNodeWhiteNodeManager : public TestNode
 {
 };
 

diff --git a/test/unit/expr/node_self_iterator_black.cpp b/test/unit/expr/node_self_iterator_black.cpp
index 20d04b52bcab5fbe9fb6ebd823d5c8ab8f84b777..a937cb312911e3bd8ff44137ecae3b0abaa14c69 100644 (file)
--- a/test/unit/expr/node_self_iterator_black.cpp
+++ b/test/unit/expr/node_self_iterator_black.cpp
@@ -26,7 +26,7 @@ using namespace expr;
 
 namespace test {
 
-class TestNodeBlackNodeSelfIterator : public TestNodeBlack
+class TestNodeBlackNodeSelfIterator : public TestNode
 {
 };
 

diff --git a/test/unit/expr/node_traversal_black.cpp b/test/unit/expr/node_traversal_black.cpp
index d2921a929fe7044ec152cb597e284dbcaf29f2ff..5e6fc4ce05d33d147e97cffa5d5705aec6bf6ef5 100644 (file)
--- a/test/unit/expr/node_traversal_black.cpp
+++ b/test/unit/expr/node_traversal_black.cpp
@@ -33,11 +33,11 @@ using namespace kind;
 
 namespace test {
 
-class TestNodeBlackNodeTraversalPostorder : public TestNodeBlack
+class TestNodeBlackNodeTraversalPostorder : public TestNode
 {
 };
 
-class TestNodeBlackNodeTraversalPreorder : public TestNodeBlack
+class TestNodeBlackNodeTraversalPreorder : public TestNode
 {
 };
 

diff --git a/test/unit/expr/node_white.cpp b/test/unit/expr/node_white.cpp
index 2581cb546ffa97aafd2d189da81159d44ce9a8f7..8259d6cc9e071f613cdc3dd88c94770cfe3df990 100644 (file)
--- a/test/unit/expr/node_white.cpp
+++ b/test/unit/expr/node_white.cpp
@@ -26,7 +26,7 @@ using namespace expr;
 
 namespace test {
 
-class TestNodeWhiteNode : public TestNodeWhite
+class TestNodeWhiteNode : public TestNode
 {
 };
 

diff --git a/test/unit/expr/type_node_white.cpp b/test/unit/expr/type_node_white.cpp
index 085b57642305e699b231e57a474ca64078fa9acf..e7a5fcc61bc39ad9a5358ce121c1f28fc65a453d 100644 (file)
--- a/test/unit/expr/type_node_white.cpp
+++ b/test/unit/expr/type_node_white.cpp
@@ -32,12 +32,12 @@ using namespace context;
 
 namespace test {
 
-class TestNodeWhiteTypeNode : public TestNodeWhite
+class TestNodeWhiteTypeNode : public TestNode
 {
  protected:
   void SetUp() override
   {
-    TestNodeWhite::SetUp();
+    TestNode::SetUp();
     d_smt.reset(new SmtEngine(d_nodeManager.get()));
   }
   std::unique_ptr<SmtEngine> d_smt;

diff --git a/test/unit/test_node.h b/test/unit/test_node.h
index 81d3e250a94f56f9ba581b1fabcabd8299be58b4..485b29cf6e05b2052dae081949b9206fa5730293 100644 (file)
--- a/test/unit/test_node.h
+++ b/test/unit/test_node.h
@@ -23,7 +23,7 @@
 namespace CVC4 {
 namespace test {
 
-class TestNodeBlack : public TestInternal
+class TestNode : public TestInternal
 {
  protected:
   void SetUp() override
@@ -44,18 +44,6 @@ class TestNodeBlack : public TestInternal
   std::unique_ptr<TypeNode> d_realTypeNode;
 };
 
-class TestNodeWhite : public TestInternal
-{
- protected:
-  void SetUp() override
-  {
-    d_nodeManager.reset(new NodeManager(nullptr));
-    d_scope.reset(new NodeManagerScope(d_nodeManager.get()));
-  }
-
-  std::unique_ptr<NodeManagerScope> d_scope;
-  std::unique_ptr<NodeManager> d_nodeManager;
-};
 }  // namespace test
 }  // namespace CVC4
 #endif