From c477c699ef601e1a279ae8a8e21c50485775c83b Mon Sep 17 00:00:00 2001
From: jonawals <jonawals@amazon.com>
Date: Fri, 21 May 2021 09:11:53 +0100
Subject: [PATCH] Additional refactoring

---
 .../TestImpactClientFailureReport.h                    |  2 +-
 .../Dependency/TestImpactDynamicDependencyMap.cpp      | 10 +++-------
 .../Process/JobRunner/TestImpactProcessJobMeta.h       |  3 +--
 .../Code/Source/Target/TestImpactBuildTargetList.h     |  2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h
index d2ab863d86..02b1169e93 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h
@@ -130,7 +130,7 @@ namespace TestImpact
         private:
             AZStd::vector<ExecutionFailure> m_executionFailures;
             AZStd::vector<LauncherFailure> m_launcherFailures;
-            AZStd::vector<TargetFailure> m_unexecutedTestsTests;
+            AZStd::vector<TargetFailure> m_unexecutedTests;
         };
 
         //! Represents the report for a failed regular test sequence run without test impact analysis.
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp
index 93fb5ee366..31b3485c70 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp
@@ -138,7 +138,7 @@ namespace TestImpact
         {
             // Autogen input files are not compiled sources and thus supplying coverage data for them makes no sense
             AZ_TestImpact_Eval(
-                m_autogenInputToOutputMap.find(sourceCoverage.GetPath().c_str()) == m_autogenInputToOutputMap.end(),
+                m_autogenInputToOutputMap.find(sourceCoverage.GetPath().String()) == m_autogenInputToOutputMap.end(),
                 DependencyException, AZStd::string::format("Couldn't replace source coverage for %s, source file is an autogen input file",
                     sourceCoverage.GetPath().c_str()).c_str());
 
@@ -188,16 +188,12 @@ namespace TestImpact
                 // Clearing the coverage data of an autogen input source instead clears the coverage data of its output sources
                 for (const auto& outputSource : outputSources->second)
                 {
-                    AZStd::vector<SourceCoveringTests> coverage;
-                    coverage.emplace_back(RepoPath(outputSource));
-                    ReplaceSourceCoverage(SourceCoveringTestsList(AZStd::move(coverage)));
+                    ReplaceSourceCoverage(SourceCoveringTestsList(AZStd::vector<SourceCoveringTests>{ SourceCoveringTests(RepoPath(outputSource)) }));
                 }
             }
             else
             {
-                AZStd::vector<SourceCoveringTests> coverage;
-                coverage.emplace_back(RepoPath(path));
-                ReplaceSourceCoverage(SourceCoveringTestsList(AZStd::move(coverage)));
+                ReplaceSourceCoverage(SourceCoveringTestsList(AZStd::vector<SourceCoveringTests>{ SourceCoveringTests(RepoPath(path)) }));
             }
         }
     }
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.h
index 6e7ce97468..874934b54d 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.h
@@ -34,8 +34,7 @@ namespace TestImpact
     struct JobMeta
     {
         JobResult m_result = JobResult::NotExecuted;
-        AZStd::optional<AZStd::chrono::high_resolution_clock::time_point>
-            m_startTime; //!< The time, relative to the job runner start, that this job started.
+        AZStd::optional<AZStd::chrono::high_resolution_clock::time_point> m_startTime; //!< The time, relative to the job runner start, that this job started.
         AZStd::optional<AZStd::chrono::milliseconds> m_duration; //!< The duration that this job took to complete.
         AZStd::optional<ReturnCode> m_returnCode; //!< The return code of the underlying processes of this job.
     };
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Target/TestImpactBuildTargetList.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Target/TestImpactBuildTargetList.h
index 9731b68d61..79f93f7779 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Target/TestImpactBuildTargetList.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Target/TestImpactBuildTargetList.h
@@ -74,7 +74,7 @@ namespace TestImpact
         m_targets.reserve(descriptors.size());
         for (auto&& descriptor : descriptors)
         {
-            m_targets.emplace_back(AZStd::move(Target(AZStd::move(descriptor))));
+            m_targets.emplace_back(Target(AZStd::move(descriptor)));
         }
     }