From: Aina Niemetz <aina.niemetz@gmail.com>
Date: Wed, 17 Mar 2021 08:40:21 +0000 (-0700)
Subject: Rename fixtures in test/unit/base to conform to naming scheme. (#6157)
X-Git-Tag: cvc5-1.0.0~2065
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3cd566ac1d3a43426429f21a86cb8a58ab2e0761;p=cvc5.git

Rename fixtures in test/unit/base to conform to naming scheme. (#6157)

Naming scheme is `Test<directory><Black|White><name>`.
---

diff --git a/test/unit/base/map_util_black.cpp b/test/unit/base/map_util_black.cpp
index 7de77c1ef..13e842653 100644
--- a/test/unit/base/map_util_black.cpp
+++ b/test/unit/base/map_util_black.cpp
@@ -35,7 +35,7 @@ using context::Context;
 
 namespace test {
 
-class TestMapBlack : public TestInternal
+class TestBaseBlackMap : public TestInternal
 {
  protected:
   /** Returns a map containing {"key"->"value", "other"->"entry"}. */
@@ -60,7 +60,7 @@ class TestMapBlack : public TestInternal
   }
 };
 
-TEST_F(TestMapBlack, map)
+TEST_F(TestBaseBlackMap, map)
 {
   std::map<std::string, std::string> map = default_map();
   ASSERT_TRUE(CVC4::ContainsKey(map, "key"));
@@ -75,7 +75,7 @@ TEST_F(TestMapBlack, map)
   ASSERT_EQ(FindOrDie(map, "other"), "new value");
 }
 
-TEST_F(TestMapBlack, constant_map)
+TEST_F(TestBaseBlackMap, constant_map)
 {
   const std::map<std::string, std::string> map = default_map();
   ASSERT_TRUE(CVC4::ContainsKey(map, "key"));
@@ -90,7 +90,7 @@ TEST_F(TestMapBlack, constant_map)
   ASSERT_DEATH(FindOrDie(map, "asdf"), "The map does not contain the key.");
 }
 
-TEST_F(TestMapBlack, unordered_map)
+TEST_F(TestBaseBlackMap, unordered_map)
 {
   std::unordered_map<std::string, std::string> map(default_map().begin(),
                                                    default_map().end());
@@ -106,7 +106,7 @@ TEST_F(TestMapBlack, unordered_map)
   ASSERT_EQ(FindOrDie(map, "other"), "new value");
 }
 
-TEST_F(TestMapBlack, const_unordered_map)
+TEST_F(TestBaseBlackMap, const_unordered_map)
 {
   const std::unordered_map<std::string, std::string> map(default_map().begin(),
                                                          default_map().end());
@@ -122,7 +122,7 @@ TEST_F(TestMapBlack, const_unordered_map)
   ASSERT_DEATH(FindOrDie(map, "asdf"), "The map does not contain the key.");
 }
 
-TEST_F(TestMapBlack, set)
+TEST_F(TestBaseBlackMap, set)
 {
   std::set<std::string> set{"entry", "other"};
   ASSERT_TRUE(CVC4::ContainsKey(set, "entry"));
@@ -133,7 +133,7 @@ TEST_F(TestMapBlack, set)
   ASSERT_FALSE(CVC4::ContainsKey(const_set, "non member"));
 }
 
-TEST_F(TestMapBlack, unordered_set)
+TEST_F(TestBaseBlackMap, unordered_set)
 {
   std::unordered_set<std::string> set{"entry", "other"};
   ASSERT_TRUE(CVC4::ContainsKey(set, "entry"));
@@ -144,7 +144,7 @@ TEST_F(TestMapBlack, unordered_set)
   ASSERT_FALSE(CVC4::ContainsKey(const_set, "non member"));
 }
 
-TEST_F(TestMapBlack, CDHashMap)
+TEST_F(TestBaseBlackMap, CDHashMap)
 {
   Context context;
   CDHashMap<std::string, std::string> map(&context);
@@ -161,7 +161,7 @@ TEST_F(TestMapBlack, CDHashMap)
   ASSERT_EQ(FindOrDie(map, "other"), "entry");
 }
 
-TEST_F(TestMapBlack, const_CDHashMap)
+TEST_F(TestBaseBlackMap, const_CDHashMap)
 {
   Context context;
   CDHashMap<std::string, std::string> store(&context);
@@ -179,7 +179,7 @@ TEST_F(TestMapBlack, const_CDHashMap)
   ASSERT_EQ(FindOrDie(map, "other"), "entry");
 }
 
-TEST_F(TestMapBlack, CDInsertHashMap)
+TEST_F(TestBaseBlackMap, CDInsertHashMap)
 {
   Context context;
   CDInsertHashMap<std::string, std::string> map(&context);
@@ -196,7 +196,7 @@ TEST_F(TestMapBlack, CDInsertHashMap)
   ASSERT_EQ(FindOrDie(map, "other"), "entry");
 }
 
-TEST_F(TestMapBlack, const_CDInsertHashMap)
+TEST_F(TestBaseBlackMap, const_CDInsertHashMap)
 {
   Context context;
   CDInsertHashMap<std::string, std::string> store(&context);