From 3892a36f6005086318c7df3ec83d7babb6078430 Mon Sep 17 00:00:00 2001 From: Ferran Balaguer Date: Thu, 25 Jul 2019 13:47:52 +0100 Subject: IVGCVSW-3538 Fix Android driver getCapabilities_1_2() test Signed-off-by: Ferran Balaguer Change-Id: Idca10ca2d55ae8d5ff95af8bdbbee5492d4a6af3 --- test/1.2/Capabilities.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/1.2/Capabilities.cpp b/test/1.2/Capabilities.cpp index f4142866..4424f9b0 100644 --- a/test/1.2/Capabilities.cpp +++ b/test/1.2/Capabilities.cpp @@ -19,6 +19,18 @@ using namespace std; struct CapabilitiesFixture { CapabilitiesFixture() + { + // CleanUp before the execution of each test + CleanUp(); + } + + ~CapabilitiesFixture() + { + // CleanUp after the execution of each test + CleanUp(); + } + + void CleanUp() { const char* nullStr = ""; @@ -39,8 +51,6 @@ struct CapabilitiesFixture __system_property_set("Armnn.operandTypeInt32Performance.execTime", nullStr); __system_property_set("Armnn.operandTypeInt32Performance.powerUsage", nullStr); } - - ~CapabilitiesFixture(){} }; void CheckOperandType(const V1_2::Capabilities& capabilities, OperandType type, float execTime, float powerUsage) @@ -50,7 +60,7 @@ void CheckOperandType(const V1_2::Capabilities& capabilities, OperandType type, BOOST_ASSERT(perfInfo.powerUsage == powerUsage); } -BOOST_AUTO_TEST_SUITE(CapabilitiesTests) +BOOST_FIXTURE_TEST_SUITE(CapabilitiesTests, CapabilitiesFixture) BOOST_AUTO_TEST_CASE(PerformanceCapabilitiesWithRuntime) { -- cgit v1.2.1