From 23f41213bbe94c4135271ea39d6b2fe4c1a45efe Mon Sep 17 00:00:00 2001 From: Irina Efode Date: Thu, 28 May 2020 17:22:19 +0300 Subject: [PATCH] [IE TESTS] MOVE plugin tests (#659) --- .../unit_test_utils/CMakeLists.txt | 2 ++ .../mocks}/mock_engine/CMakeLists.txt | 0 .../mocks}/mock_engine/dllmain.cpp | 0 .../mocks}/mock_engine/mock_plugin.cpp | 0 .../mocks}/mock_engine/mock_plugin.hpp | 0 .../unit/inference_engine/CMakeLists.txt | 4 ++- .../cpp_interfaces/ie_plugin_test.cpp | 2 +- .../unit/inference_engine/ie_plugin_ptr.cpp} | 27 +++++++++++-------- .../tests_deprecated/CMakeLists.txt | 2 -- 9 files changed, 22 insertions(+), 15 deletions(-) rename inference-engine/{tests_deprecated => tests/ie_test_utils/unit_test_utils/mocks}/mock_engine/CMakeLists.txt (100%) rename inference-engine/{tests_deprecated => tests/ie_test_utils/unit_test_utils/mocks}/mock_engine/dllmain.cpp (100%) rename inference-engine/{tests_deprecated => tests/ie_test_utils/unit_test_utils/mocks}/mock_engine/mock_plugin.cpp (100%) rename inference-engine/{tests_deprecated => tests/ie_test_utils/unit_test_utils/mocks}/mock_engine/mock_plugin.hpp (100%) rename inference-engine/{tests_deprecated/unit/inference_engine_tests/inference_engine_plugin_test.cpp => tests/unit/inference_engine/ie_plugin_ptr.cpp} (78%) diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt index 91076ff09ff..df611c700cc 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt @@ -4,6 +4,8 @@ set(TARGET_NAME unitTestUtils) +add_subdirectory(mocks/mock_engine) + list(APPEND EXPORT_DEPENDENCIES commonTestUtils_s inference_engine_s diff --git a/inference-engine/tests_deprecated/mock_engine/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt similarity index 100% rename from inference-engine/tests_deprecated/mock_engine/CMakeLists.txt rename to inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt diff --git a/inference-engine/tests_deprecated/mock_engine/dllmain.cpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/dllmain.cpp similarity index 100% rename from inference-engine/tests_deprecated/mock_engine/dllmain.cpp rename to inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/dllmain.cpp diff --git a/inference-engine/tests_deprecated/mock_engine/mock_plugin.cpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.cpp similarity index 100% rename from inference-engine/tests_deprecated/mock_engine/mock_plugin.cpp rename to inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.cpp diff --git a/inference-engine/tests_deprecated/mock_engine/mock_plugin.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.hpp similarity index 100% rename from inference-engine/tests_deprecated/mock_engine/mock_plugin.hpp rename to inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.hpp diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt index 629a2cecfbb..3eb21a4349f 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt @@ -10,6 +10,8 @@ addIeTargetTest( LINK_LIBRARIES unitTestUtils ADD_CPPLINT + DEPENDENCIES + mock_engine LABELS IE -) \ No newline at end of file +) diff --git a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_plugin_test.cpp b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_plugin_test.cpp index 5e6224ac3e8..de0097b32cf 100644 --- a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_plugin_test.cpp +++ b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_plugin_test.cpp @@ -13,7 +13,6 @@ #include "unit_test_utils/mocks/cpp_interfaces/impl/mock_inference_plugin_internal.hpp" #include "unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinfer_request_internal.hpp" -#include "unit_test_utils/mocks/mock_iinfer_request.hpp" using namespace ::testing; using namespace std; @@ -163,3 +162,4 @@ TEST_F(InferenceEnginePluginInternalTest, pluginInternalEraseMagicAndNameWhenImp ASSERT_EQ(mockExeNetworkInternal->exportString, mock_plugin_impl->importedString); mock_plugin_impl->importedString = {}; } + diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/inference_engine_plugin_test.cpp b/inference-engine/tests/unit/inference_engine/ie_plugin_ptr.cpp similarity index 78% rename from inference-engine/tests_deprecated/unit/inference_engine_tests/inference_engine_plugin_test.cpp rename to inference-engine/tests/unit/inference_engine/ie_plugin_ptr.cpp index 2920d4b3f02..a885def9322 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/inference_engine_plugin_test.cpp +++ b/inference-engine/tests/unit/inference_engine/ie_plugin_ptr.cpp @@ -2,12 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "tests_common.hpp" - #include +#include #include "details/ie_so_loader.h" -#include "../tests_deprecated/mock_engine/mock_plugin.hpp" +#include "unit_test_utils/mocks/mock_engine/mock_plugin.hpp" #include "unit_test_utils/mocks/mock_error_listener.hpp" #include "unit_test_utils/mocks/mock_iinference_plugin.hpp" @@ -19,20 +18,25 @@ using namespace InferenceEngine::details; IE_SUPPRESS_DEPRECATED_START -class PluginTest: public TestsCommon { +class PluginTest: public ::testing::Test { protected: unique_ptr sharedObjectLoader; std::function createPluginEngineProxy; - InferenceEnginePluginPtr getPtr() ; - virtual void SetUp() { + InferenceEnginePluginPtr getPtr(); + std::string get_mock_engine_name() { + std::string mockEngineName("mock_engine"); + return CommonTestUtils::pre + mockEngineName + IE_BUILD_POSTFIX + CommonTestUtils::ext; + } + + virtual void SetUp() { std::string libraryName = get_mock_engine_name(); sharedObjectLoader.reset(new SharedObjectLoader(libraryName.c_str())); createPluginEngineProxy = make_std_function("CreatePluginEngineProxy"); } template std::function make_std_function(const std::string& functionName) { - std::function ptr (reinterpret_cast(sharedObjectLoader->get_symbol(functionName.c_str()))); + std::function ptr(reinterpret_cast(sharedObjectLoader->get_symbol(functionName.c_str()))); return ptr; } @@ -43,7 +47,7 @@ protected: TEST_F(PluginTest, canCreatePlugin) { auto ptr = make_std_function("CreatePluginEngineProxy"); - unique_ptr> smart_ptr(ptr(nullptr), [](IInferencePlugin *p) { + unique_ptr> smart_ptr(ptr(nullptr), [](IInferencePlugin *p) { p->Release(); }); @@ -62,8 +66,7 @@ TEST_F(PluginTest, shouldThrowExceptionIfPluginNotExist) { ACTION_TEMPLATE(CallListenerWithErrorMessage, HAS_1_TEMPLATE_PARAMS(int, k), - AND_1_VALUE_PARAMS(pointer)) -{ + AND_1_VALUE_PARAMS(pointer)) { InferenceEngine::IErrorListener & data = ::std::get(args); data.onError(pointer); } @@ -71,7 +74,7 @@ ACTION_TEMPLATE(CallListenerWithErrorMessage, InferenceEnginePluginPtr PluginTest::getPtr() { InferenceEnginePluginPtr smart_ptr(get_mock_engine_name()); return smart_ptr; -}; +} TEST_F(PluginTest, canSetConfiguration) { InferenceEnginePluginPtr ptr = getPtr(); @@ -86,3 +89,5 @@ TEST_F(PluginTest, canSetConfiguration) { ASSERT_STREQ(reinterpret_cast(*ptr)->config["key"].c_str(), "value"); } + +IE_SUPPRESS_DEPRECATED_END \ No newline at end of file diff --git a/inference-engine/tests_deprecated/CMakeLists.txt b/inference-engine/tests_deprecated/CMakeLists.txt index 5b3563e4ee0..66ad5012a31 100644 --- a/inference-engine/tests_deprecated/CMakeLists.txt +++ b/inference-engine/tests_deprecated/CMakeLists.txt @@ -8,8 +8,6 @@ enable_testing() -add_subdirectory(mock_engine) - add_subdirectory(helpers) if (ENABLE_GAPI_TESTS)