From 7c28480307746b6571acae5f059589f2fcbbe605 Mon Sep 17 00:00:00 2001 From: jonawals Date: Fri, 21 May 2021 14:09:12 +0100 Subject: [PATCH] Address PR comments --- .../TestEngine/Run/TestImpactTestCoverage.cpp | 19 ++++++----------- .../TestEngine/Run/TestImpactTestCoverage.h | 1 - .../TestEngine/Run/TestImpactTestRun.cpp | 10 --------- .../Source/TestEngine/Run/TestImpactTestRun.h | 1 - .../TestEngine/TestImpactTestSuiteContainer.h | 21 ++++++------------- 5 files changed, 12 insertions(+), 40 deletions(-) diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.cpp index 6135383863..453b1fa962 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.cpp +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.cpp @@ -29,7 +29,6 @@ namespace TestImpact , m_sourcesCovered(AZStd::move(other.m_sourcesCovered)) { AZStd::swap(m_coverageLevel, other.m_coverageLevel); - other.~TestCoverage(); } TestCoverage::TestCoverage(const AZStd::vector& moduleCoverages) @@ -44,19 +43,13 @@ namespace TestImpact CalculateTestMetrics(); } - TestCoverage::~TestCoverage() - { - m_modules.clear(); - m_coverageLevel.reset(); - m_sourcesCovered.clear(); - } - TestCoverage& TestCoverage::operator=(const TestCoverage& other) { if (this != &other) { - this->~TestCoverage(); - new(this)TestCoverage(other); + m_modules = other.m_modules; + m_sourcesCovered = other.m_sourcesCovered; + m_coverageLevel = other.m_coverageLevel; } return *this; @@ -66,9 +59,9 @@ namespace TestImpact { if (this != &other) { - this->~TestCoverage(); - new(this)TestCoverage(AZStd::move(other)); - other.~TestCoverage(); + m_modules = AZStd::move(other.m_modules); + m_sourcesCovered = other.m_sourcesCovered; + m_coverageLevel = other.m_coverageLevel; } return *this; diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.h index c672814f7c..e7599fb145 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.h +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestCoverage.h @@ -33,7 +33,6 @@ namespace TestImpact TestCoverage(TestCoverage&&) noexcept; TestCoverage(AZStd::vector&& moduleCoverages) noexcept; TestCoverage(const AZStd::vector& moduleCoverages); - ~TestCoverage(); TestCoverage& operator=(const TestCoverage&); TestCoverage& operator=(TestCoverage&&) noexcept; diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.cpp index 9ee1569f0e..3796bbfe7e 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.cpp +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.cpp @@ -28,7 +28,6 @@ namespace TestImpact , m_numFailures(other.m_numFailures) , m_duration(other.m_duration) { - other.~TestRun(); } TestRun::TestRun(AZStd::vector&& testSuites, AZStd::chrono::milliseconds duration) noexcept @@ -45,15 +44,6 @@ namespace TestImpact CalculateTestMetrics(); } - TestRun::~TestRun() - { - m_numRuns = 0; - m_numNotRuns = 0; - m_numPasses = 0; - m_numFailures = 0; - m_duration = AZStd::chrono::milliseconds{ 0 }; - } - TestRun& TestRun::operator=(TestRun&& other) noexcept { if (this != &other) diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.h index a0acb37061..f3a1ba93de 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.h +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Run/TestImpactTestRun.h @@ -28,7 +28,6 @@ namespace TestImpact TestRun(TestRun&&) noexcept; TestRun(const AZStd::vector& testSuites, AZStd::chrono::milliseconds duration); TestRun(AZStd::vector&& testSuites, AZStd::chrono::milliseconds duration) noexcept; - ~TestRun(); TestRun& operator=(const TestRun&); TestRun& operator=(TestRun&&) noexcept; diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestSuiteContainer.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestSuiteContainer.h index 4f3fdebb08..5991640c46 100644 --- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestSuiteContainer.h +++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestSuiteContainer.h @@ -26,7 +26,6 @@ namespace TestImpact TestSuiteContainer(TestSuiteContainer&&) noexcept; TestSuiteContainer(const AZStd::vector& testSuites); TestSuiteContainer(AZStd::vector&& testSuites) noexcept; - virtual ~TestSuiteContainer(); TestSuiteContainer& operator=(const TestSuiteContainer&); TestSuiteContainer& operator=(TestSuiteContainer&&) noexcept; @@ -61,7 +60,6 @@ namespace TestImpact , m_numDisabledTests(other.m_numDisabledTests) , m_numEnabledTests(other.m_numEnabledTests) { - other.~TestSuiteContainer(); } template @@ -72,14 +70,6 @@ namespace TestImpact { } - template - TestSuiteContainer::~TestSuiteContainer() - { - m_testSuites.clear(); - m_numDisabledTests = 0; - m_numEnabledTests = 0; - } - template TestSuiteContainer::TestSuiteContainer(AZStd::vector&& testSuites) noexcept : m_testSuites(std::move(testSuites)) @@ -99,9 +89,9 @@ namespace TestImpact { if (this != &other) { - this->~TestSuiteContainer(); - new(this)TestSuiteContainer(AZStd::move(other)); - other.~TestSuiteContainer(); + m_testSuites = AZStd::move(other.m_testSuites); + m_numDisabledTests = other.m_numDisabledTests; + m_numEnabledTests = other.m_numEnabledTests; } return *this; @@ -112,8 +102,9 @@ namespace TestImpact { if (this != &other) { - this->~TestSuiteContainer(); - new(this)TestSuiteContainer(other); + m_testSuites = other.m_testSuites; + m_numDisabledTests = other.m_numDisabledTests; + m_numEnabledTests = other.m_numEnabledTests; } return *this;