Combine snapshot classes into a template class

installer/src/installer-lib/test/process_test.cpp

 #include <gtest/gtest.h>
 #include "../process.h"
 #include <functional>
 
 // Turn off warnings for string copies
 #pragma warning( disable : 4996 )
 
 //-------------------------------------------------------
 // Comparison objects
 //-------------------------------------------------------
@@ skipping 166 matching lines @@
 
 //-------------------------------------------------------
 // Single-snapshot version of initializers
 //-------------------------------------------------------
 /**
  * Single-snapshot version of initialize_process_list, for testing.
  */
 template< class T, class Admittance, class Extractor >
 void initialize_process_list( std::vector< T > & v, Admittance admit = Admittance(), Extractor extract = Extractor() )
 {
-  initialize_process_list( v, Snapshot(), admit, extract ) ;
+  initialize_process_list( v, Process_Snapshot(), admit, extract ) ;
 }
 
 /**
  * Single-snapshot version of initialize_process_set, for testing.
  */
 template< class T, class Admittance, class Extractor >
 void initialize_process_set( std::set< T > & s, Admittance admit = Admittance(), Extractor extract = Extractor() )
 {
-  initialize_process_set( s, Snapshot(), admit, extract ) ;
+  initialize_process_set( s, Process_Snapshot(), admit, extract ) ;
 }
 
 //-------------------------------------------------------
 // TESTS with snapshots
 //-------------------------------------------------------
 /**
  * Construction test ensures that we don't throw and that at least one process shows up.
  */
 TEST( Process_List_Test, construct_vector )
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, every_process(), copy_all() ) ;
   ASSERT_GE( v.size(), 1u );
 }
 
 /**
  * The only process we are really guaranteed to have is this test process itself.
  */
 TEST( Process_List_Test, find_our_process )
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, our_process_by_name(), copy_all() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( 1u, size );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( 1u, size );
 }
 
 /**
  * The only process we are really guaranteed to have is this test process itself.
  * This test uses same one used in Process_Closer
  */
 TEST( Process_List_Test, find_our_process_CI_generic )
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, process_by_name_CI( mixedcase_exe_name ), copy_all() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( 1u, size );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( 1u, size );
 }
 
 /**
  * The only process we are really guaranteed to have is this test process itself.
  * This test uses the generic filter function.
  */
 TEST( Process_List_Test, find_our_process_CI_as_used )
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, process_by_any_file_name_CI( file_name_set( multiple_exe_names ) ), copy_all() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( 1u, size );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( 1u, size );
 }
 
 /**
  * Locate the PID of our process.
  */
 TEST( Process_List_Test, find_our_PID )
 {
   std::vector< DWORD > v ;
   initialize_process_list( v, our_process_by_name(), copy_PID() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( size, 1u );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( size, 1u );
 }
 
 /**
  * Locate the PID of our process using the
  */
 TEST( Process_List_Test, find_our_process_in_set )
 {
   std::vector< DWORD > v ;
   initialize_process_list( v, find_in_set, copy_PID() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( size, 1u );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( size, 1u );
 }
 
 //-------------------------------------------------------
 // TESTS for process ID sets
 //-------------------------------------------------------
 /*
  * Can't use copy_all without a definition for "less< PROCESSENTRY32W >".
  * Thus all tests only use copy_PID
@@ skipping 27 matching lines @@
   ASSERT_GE( size, 1u );
 }
 TEST( pid_set, find_our_process_in_set_w_non_existant )
 {
   std::set< DWORD > s ;
   initialize_process_set( s, find_in_set_w_non_existent, copy_PID() ) ;
   size_t size( s.size() ) ;
   EXPECT_EQ( size, 0u );
   ASSERT_GE( size, 0u );
 }