Make sure IE and Engine are actually being closed by custom action

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
 //-------------------------------------------------------
 
-const wchar_t * multiple_module_names[] = { L"kernel32.dll", L"non-matching-name" } ;
-const wchar_t * non_existent_module_names[] = { L"non-matching-name" } ;
-
 const wchar_t exact_exe_name[] = L"installer-ca-tests.exe" ;
 const std::wstring exact_exe_string( exact_exe_name ) ;
 const wstring_ci exact_exe_string_ci( exact_exe_name ) ;
 
 const wchar_t mixedcase_exe_name[] = L"Installer-CA-Tests.exe" ;
 const wstring_ci mixedcase_exe_string_ci( mixedcase_exe_name ) ;
 
 const wchar_t unknown_name[] = L"non-matching-name" ;
 const wchar_t * multiple_exe_names[] = { mixedcase_exe_name, unknown_name } ;
 
@@ skipping 14 matching lines @@
  */
 struct our_process_by_name_CI
   : std::unary_function< PROCESSENTRY32W, bool >
 {
   bool operator()( const PROCESSENTRY32W & process ) 
   {
     return wstring_ci( process.szExeFile ) == mixedcase_exe_string_ci ;
   } ;
 } ;
 
-
-struct our_process_by_name_subclassed
-  : public process_by_any_exe_not_immersive
-{
-  our_process_by_name_subclassed()
-    : process_by_any_exe_not_immersive( file_name_set( multiple_exe_names ))
-  {}
-} ;
-
-
 //-------------------------------------------------------
 //-------------------------------------------------------
 /**
  * Filter by process name. Comparison is case-insensitive.
  */
 class process_by_any_file_name_CI
   : public std::unary_function< PROCESSENTRY32W, bool >
 {
   const file_name_set & names ;
 public:
@@ skipping 34 matching lines @@
   return p ;
 }
 
 PROCESSENTRY32 process_empty = process_with_name( L"" ) ;
 PROCESSENTRY32 process_exact = process_with_name( exact_exe_name ) ;
 PROCESSENTRY32 process_mixedcase = process_with_name( mixedcase_exe_name ) ;
 PROCESSENTRY32 process_explorer = process_with_name( L"explorer.exe" ) ;
 PROCESSENTRY32 process_absent = process_with_name( L"no_such_name" ) ;
 
 file_name_set multiple_name_set( multiple_exe_names ) ;
-file_name_set multiple_name_set_modules( multiple_module_names ) ;
-file_name_set non_existent_name_set_modules( non_existent_module_names ) ;
 process_by_any_file_name_CI find_in_set( multiple_name_set ) ;
+process_by_any_exe_not_immersive find_in_set_not_immersive( multiple_name_set ) ;
+
 
 TEST( file_name_set, validate_setup )
 {
   ASSERT_EQ( 2u, multiple_name_set.size() ) ;
   ASSERT_TRUE( multiple_name_set.find( exact_exe_string_ci ) != multiple_name_set.end() ) ;
   ASSERT_TRUE( multiple_name_set.find( mixedcase_exe_string_ci ) != multiple_name_set.end() ) ;
   ASSERT_TRUE( multiple_name_set.find( L"" ) == multiple_name_set.end() ) ;
   ASSERT_TRUE( multiple_name_set.find( L"not-in-list" ) == multiple_name_set.end() ) ;
 }
 
@@ skipping 161 matching lines @@
   ASSERT_GE( s.size(), 1u );
 }
 
 TEST( pid_set, find_our_process_in_set )
 {
   std::set< DWORD > s ;
   initialize_process_set( s, find_in_set, copy_PID() ) ;
   size_t size( s.size() ) ;
   EXPECT_EQ( size, 1u );
   ASSERT_GE( size, 1u );
+}
+
+TEST( pid_set, find_our_process_in_set_not_immersive )
+{
+  std::set< DWORD > s ;
+  initialize_process_set( s, find_in_set_not_immersive, copy_PID() ) ;
+  size_t size( s.size() ) ;
+  EXPECT_EQ( size, 1u );
+  ASSERT_GE( size, 1u );
 }