Use std::function for simulationInitializer

Author: tclinkenbeard-oai

flow/UnitTestRunner.cpp

@@ -37,6 +37,7 @@
 #include <exception>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #ifndef _WIN32
@@ -343,7 +344,7 @@ Future<Void> stopNetworkAfter(Future<Void> what, std::string_view traceName, int
 } // namespace
 
 UnitTestRunnerConfig::UnitTestRunnerConfig(std::string_view sourceSubDir, SimulationInitializer simulationInitializer)
-  : sourceSubDir(sourceSubDir), simulationInitializer(simulationInitializer) {}
+  : sourceSubDir(sourceSubDir), simulationInitializer(std::move(simulationInitializer)) {}
 
 std::string_view UnitTestRunnerConfig::suiteName() const {
 	return sourceSubDir;
@@ -358,7 +359,7 @@ std::string UnitTestRunnerConfig::traceName() const {
 }
 
 bool UnitTestRunnerConfig::supportsSimulation() const {
-	return simulationInitializer != nullptr;
+	return static_cast<bool>(simulationInitializer);
 }
 
 void UnitTestRunnerConfig::initializeSimulation() const {

flow/include/flow/UnitTestRunner.h

@@ -22,14 +22,15 @@
 #define FLOW_UNIT_TEST_RUNNER_H
 #pragma once
 
+#include <functional>
 #include <string>
 #include <string_view>
 
 class UnitTestRunnerConfig {
 public:
-	using SimulationInitializer = void (*)();
+	using SimulationInitializer = std::function<void()>;
 
-	explicit UnitTestRunnerConfig(std::string_view sourceSubDir, SimulationInitializer simulationInitializer = nullptr);
+	explicit UnitTestRunnerConfig(std::string_view sourceSubDir, SimulationInitializer simulationInitializer = {});
 
 	std::string_view suiteName() const;
 	std::string dataDir() const;