Merge pull request #5882 from hjmjohnson/convert-itkhashtabletest-to-itkhashtablegtest

ENH: Convert itkHashTableTest to itkHashTableGTest

Author: hjmjohnson

Modules/Core/Common/test/CMakeLists.txt

@@ -74,7 +74,6 @@ set(
   itkSparseFieldLayerTest.cxx
   itkDataObjectTest.cxx
   itkAtanRegularizedHeavisideStepFunctionTest1.cxx
-  itkHashTableTest.cxx
   itkHeavisideStepFunctionTest1.cxx
   itkSinRegularizedHeavisideStepFunctionTest1.cxx
   itkPixelAccessTest.cxx
@@ -772,12 +771,6 @@ itk_add_test(
     ITKCommon1TestDriver
     itkAtanRegularizedHeavisideStepFunctionTest1
 )
-itk_add_test(
-  NAME itkHashTableTest
-  COMMAND
-    ITKCommon1TestDriver
-    itkHashTableTest
-)
 itk_add_test(
   NAME itkHeavisideStepFunctionTest1
   COMMAND
@@ -1736,6 +1729,7 @@ set(
   itkBresenhamLineGTest.cxx
   itkFilterDispatchGTest.cxx
   itkThreadedIndexedContainerPartitionerGTest.cxx
+  itkHashTableGTest.cxx
 )
 creategoogletestdriver(ITKCommon "${ITKCommon-Test_LIBRARIES}" "${ITKCommonGTests}")
 # If `-static` was passed to CMAKE_EXE_LINKER_FLAGS, compilation fails. No need to

…es/Core/Common/test/itkHashTableTest.cxx …s/Core/Common/test/itkHashTableGTest.cxxModules/Core/Common/test/itkHashTableTest.cxx renamed to Modules/Core/Common/test/itkHashTableGTest.cxx Modules/Core/Common/test/itkHashTableTest.cxx renamed to Modules/Core/Common/test/itkHashTableGTest.cxx

@@ -16,6 +16,8 @@
  *
  *=========================================================================*/
 
+#include "itkGTest.h"
+
 #include <unordered_set>
 #include <unordered_map>
 #include <iostream>
@@ -51,8 +53,7 @@ println(const char * s)
   std::cout << std::endl << s << std::endl;
 }
 
-int
-itkHashTableTest(int, char *[])
+TEST(HashTable, StdHash)
 {
   println("Testing std::hash");
   constexpr std::hash<const char *> H;
@@ -64,7 +65,10 @@ itkHashTableTest(int, char *[])
   constexpr std::hash<char> H2;
   std::cout << "a -> " << H2('a') << std::endl;
   std::cout << "Z -> " << H2('Z') << std::endl;
+}
 
+TEST(HashTable, UnorderedSet)
+{
   println("Testing std::unordered_set");
   using HashSetType = std::unordered_set<const char *, std::hash<const char *>, eqstr>;
   HashSetType Set;
@@ -76,8 +80,11 @@ itkHashTableTest(int, char *[])
   Set.insert("banana");
 
   lookup(Set, "mango");
+  EXPECT_GT(Set.count("mango"), 0u);
   lookup(Set, "apple");
+  EXPECT_GT(Set.count("apple"), 0u);
   lookup(Set, "durian");
+  EXPECT_EQ(Set.count("durian"), 0u);
 
   // CppCheck gives us a warning if the return value isn't used.
   // This is to prevent the user from calling empty() when they mean clear().
@@ -89,7 +96,11 @@ itkHashTableTest(int, char *[])
   Set.insert("the horror");
   auto              hsh_it = Set.begin();
   const HashSetType SetCopy = Set;
+  IgnoreUnusedVariable(hsh_it);
+}
 
+TEST(HashTable, UnorderedMap)
+{
   println("Testing std::unordered_map");
   using HashMapType = std::unordered_map<const char *, int, std::hash<const char *>, eqstr>;
 
@@ -123,9 +134,5 @@ itkHashTableTest(int, char *[])
   months.insert(p);
   auto              map_it = months.begin();
   const HashMapType MapCopy = months;
-
-  IgnoreUnusedVariable(hsh_it);
   IgnoreUnusedVariable(map_it);
-
-  return EXIT_SUCCESS;
 }