diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h index 4710cf2141..f1629adda4 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJob.h @@ -22,7 +22,7 @@ namespace TestImpact //! @tparam JobPayloadT The resulting output of the processed artifact produced by this job. template class Job - : public JobMetaContainer + : public JobMetaWrapper { public: using Info = JobInfoT; @@ -47,7 +47,7 @@ namespace TestImpact template Job::Job(const Info& jobInfo, JobMeta&& jobMeta, AZStd::optional&& payload) - : JobMetaContainer(AZStd::move(jobMeta)) + : JobMetaWrapper(AZStd::move(jobMeta)) , m_jobInfo(jobInfo) , m_payload(AZStd::move(payload)) { diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.cpp index ba6ad4c585..022115c042 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.cpp +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.cpp @@ -16,32 +16,32 @@ namespace TestImpact { - JobMetaContainer::JobMetaContainer(const JobMeta& jobMeta) + JobMetaWrapper::JobMetaWrapper(const JobMeta& jobMeta) : m_meta(jobMeta) { } - JobMetaContainer::JobMetaContainer(JobMeta&& jobMeta) + JobMetaWrapper::JobMetaWrapper(JobMeta&& jobMeta) : m_meta(AZStd::move(jobMeta)) { } - JobResult JobMetaContainer::GetJobResult() const + JobResult JobMetaWrapper::GetJobResult() const { return m_meta.m_result; } - AZStd::optional JobMetaContainer::GetReturnCode() const + AZStd::optional JobMetaWrapper::GetReturnCode() const { return m_meta.m_returnCode; } - AZStd::chrono::high_resolution_clock::time_point JobMetaContainer::GetStartTime() const + AZStd::chrono::high_resolution_clock::time_point JobMetaWrapper::GetStartTime() const { return m_meta.m_startTime.value_or(AZStd::chrono::high_resolution_clock::time_point()); } - AZStd::chrono::high_resolution_clock::time_point JobMetaContainer::GetEndTime() const + AZStd::chrono::high_resolution_clock::time_point JobMetaWrapper::GetEndTime() const { if (m_meta.m_startTime.has_value() && m_meta.m_duration.has_value()) { @@ -53,7 +53,7 @@ namespace TestImpact } } - AZStd::chrono::milliseconds JobMetaContainer::GetDuration() const + AZStd::chrono::milliseconds JobMetaWrapper::GetDuration() const { return m_meta.m_duration.value_or(AZStd::chrono::milliseconds{ 0 }); } 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 874934b54d..c8f459ba6f 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.h +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/JobRunner/TestImpactProcessJobMeta.h @@ -39,11 +39,12 @@ namespace TestImpact AZStd::optional m_returnCode; //!< The return code of the underlying processes of this job. }; - class JobMetaContainer + //! Wrapper for job meta structure to inheritance/aggregation without being coupled to the JobInfo or Job classes. + class JobMetaWrapper { public: - JobMetaContainer(const JobMeta& jobMeta); - JobMetaContainer(JobMeta&& jobMeta); + JobMetaWrapper(const JobMeta& jobMeta); + JobMetaWrapper(JobMeta&& jobMeta); //! Returns the result of this job. JobResult GetJobResult() const;