Updated mock interfaces in tests (#1762)

* Updated mock interfaces in tests

* Added mock_engine dependency

diff --git a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt
index b6e44f9..3eb3ce4 100644 (file)
--- a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt
+++ b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt
@@ -21,6 +21,7 @@ addIeTarget(
         ADD_CPPLINT
         DEVELOPER_PACKAGE
         DEPENDENCIES
+            mock_engine
             HeteroPlugin
             MultiDevicePlugin
         EXPORT_DEPENDENCIES

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_network_internal.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_network_internal.hpp
index b0bb204..52acafc 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_network_internal.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_network_internal.hpp
@@ -22,7 +22,6 @@
 
 using namespace InferenceEngine;
 
-IE_SUPPRESS_DEPRECATED_START
 class MockExecutableNetworkInternal : public ExecutableNetworkInternal {
 public:
     MOCK_METHOD1(setNetworkInputs, void(InputsDataMap));
@@ -38,5 +37,3 @@ public:
         networkModel << exportString << std::endl;
     }
 };
-IE_SUPPRESS_DEPRECATED_END
-

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_async_only.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_async_only.hpp
index bffb35a..a55c6ae 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_async_only.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_async_only.hpp
@@ -14,7 +14,6 @@
 
 using namespace InferenceEngine;
 
-IE_SUPPRESS_DEPRECATED_START
 class MockExecutableNetworkThreadSafeAsyncOnly : public ExecutableNetworkThreadSafeAsyncOnly {
 public:
     MOCK_METHOD2(CreateAsyncInferRequestImpl,
@@ -22,4 +21,3 @@ public:
     MOCK_METHOD1(Export, void(const std::string &));
     void Export(std::ostream&) override {}
 };
-IE_SUPPRESS_DEPRECATED_END

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp
index 9661872..5f5597f 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp
@@ -12,7 +12,6 @@
 
 using namespace InferenceEngine;
 
-IE_SUPPRESS_DEPRECATED_START
 class MockExecutableNetworkThreadSafe : public ExecutableNetworkThreadSafeDefault {
 public:
     MOCK_METHOD2(CreateInferRequestImpl,
@@ -20,4 +19,3 @@ public:
     MOCK_METHOD1(Export, void(const std::string &));
     void Export(std::ostream &) override {}
 };
-IE_SUPPRESS_DEPRECATED_END

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp
index 5019169..7878d67 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp
@@ -21,7 +21,6 @@
 
 using namespace InferenceEngine;
 
-IE_SUPPRESS_DEPRECATED_START
 class MockIExecutableNetworkInternal : public IExecutableNetworkInternal {
 public:
     MOCK_CONST_METHOD0(GetOutputsInfo, ConstOutputsDataMap());
@@ -37,4 +36,3 @@ public:
     MOCK_CONST_METHOD3(GetMetric, void(const std::string &name, Parameter &result, ResponseDesc *resp));
     MOCK_CONST_METHOD2(GetContext, void(RemoteContext::Ptr &pContext, ResponseDesc *resp));
 };
-IE_SUPPRESS_DEPRECATED_END
\ No newline at end of file

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp
index 10ac43b..95bb60c 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp
@@ -26,20 +26,15 @@ class MockICNNNetwork : public InferenceEngine::ICNNNetwork {
  public:
     MOCK_QUALIFIED_METHOD0(getFunction, const noexcept, std::shared_ptr<const ngraph::Function> ());
     MOCK_QUALIFIED_METHOD0(getFunction, noexcept, std::shared_ptr<ngraph::Function>());
-    MOCK_QUALIFIED_METHOD0(getPrecision, const noexcept, InferenceEngine::Precision());
     MOCK_QUALIFIED_METHOD1(getOutputsInfo, const noexcept, void(InferenceEngine::OutputsDataMap& out));
     MOCK_QUALIFIED_METHOD1(getInputsInfo, const noexcept, void(InferenceEngine::InputsDataMap &inputs));
     MOCK_QUALIFIED_METHOD1(getInput, const noexcept, InferenceEngine::InputInfo::Ptr(const std::string &inputName));
-    MOCK_QUALIFIED_METHOD2(getName, const noexcept, void(char* pName, size_t len));
     MOCK_QUALIFIED_METHOD0(layerCount, const noexcept, size_t());
     MOCK_QUALIFIED_METHOD0(getName, const noexcept, const std::string&());
-    MOCK_QUALIFIED_METHOD1(getData, noexcept, InferenceEngine::DataPtr&(const char* dname));
-    MOCK_QUALIFIED_METHOD1(addLayer, noexcept, void(const InferenceEngine::CNNLayerPtr& layer));
     MOCK_QUALIFIED_METHOD3(addOutput, noexcept, InferenceEngine::StatusCode(const std::string &, size_t, InferenceEngine::ResponseDesc*));
-    MOCK_QUALIFIED_METHOD3(getLayerByName, const noexcept, InferenceEngine::StatusCode(const char* ,
+     MOCK_QUALIFIED_METHOD3(getLayerByName, const noexcept, InferenceEngine::StatusCode(const char* ,
             InferenceEngine::CNNLayerPtr&,
             InferenceEngine::ResponseDesc*));
-    MOCK_QUALIFIED_METHOD1(setBatchSize, noexcept, InferenceEngine::StatusCode(const size_t size));
     MOCK_QUALIFIED_METHOD2(setBatchSize, noexcept, InferenceEngine::StatusCode(const size_t size, InferenceEngine::ResponseDesc*));
     MOCK_QUALIFIED_METHOD0(getBatchSize, const noexcept, size_t());
     MOCK_QUALIFIED_METHOD0(Release, noexcept, void());
@@ -57,21 +52,12 @@ class MockICNNNetwork : public InferenceEngine::ICNNNetwork {
  */
 class MockCNNNetworkImpl: public InferenceEngine::details::CNNNetworkImpl {
 public:
-    MOCK_QUALIFIED_METHOD0(getPrecision, const noexcept, InferenceEngine::Precision());
     MOCK_QUALIFIED_METHOD1(getOutputsInfo, const noexcept, void(InferenceEngine::OutputsDataMap& out));
     MOCK_QUALIFIED_METHOD1(getInputsInfo, const noexcept, void(InferenceEngine::InputsDataMap &inputs));
     MOCK_QUALIFIED_METHOD1(getInput, const noexcept, InferenceEngine::InputInfo::Ptr(const std::string &inputName));
-    MOCK_QUALIFIED_METHOD2(getName, const noexcept, void(char* pName, size_t len));
     MOCK_QUALIFIED_METHOD0(getName, const noexcept, const std::string&());
     MOCK_QUALIFIED_METHOD0(layerCount, const noexcept, size_t());
-    MOCK_QUALIFIED_METHOD1(getData, noexcept, InferenceEngine::DataPtr&(const char* dname));
-    MOCK_QUALIFIED_METHOD1(addLayer, noexcept, void(const InferenceEngine::CNNLayerPtr& layer));
     MOCK_QUALIFIED_METHOD3(addOutput, noexcept, InferenceEngine::StatusCode(const std::string &, size_t , InferenceEngine::ResponseDesc*));
-    MOCK_QUALIFIED_METHOD3(getLayerByName, const noexcept, InferenceEngine::StatusCode(
-            const char*,
-            InferenceEngine::CNNLayerPtr&,
-            InferenceEngine::ResponseDesc*));
-    MOCK_QUALIFIED_METHOD1(setBatchSize, noexcept, InferenceEngine::StatusCode(const size_t size));
     MOCK_QUALIFIED_METHOD2(setBatchSize, noexcept, InferenceEngine::StatusCode(const size_t size, InferenceEngine::ResponseDesc*));
     MOCK_QUALIFIED_METHOD0(getBatchSize, const noexcept, size_t());
     MOCK_QUALIFIED_METHOD0(Release, noexcept, void());
@@ -81,5 +67,3 @@ public:
         InferenceEngine::details::CNNNetworkImpl::validate();
     }
 };
-
-IE_SUPPRESS_DEPRECATED_END

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp
index ddac5f1..2af9e83 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp
@@ -18,7 +18,6 @@
 
 using namespace InferenceEngine;
 
-IE_SUPPRESS_DEPRECATED_START
 class MockIExecutableNetwork : public IExecutableNetwork {
 public:
     MOCK_QUALIFIED_METHOD2(GetOutputsInfo, const noexcept, StatusCode(ConstOutputsDataMap  &, ResponseDesc *));
@@ -34,4 +33,3 @@ public:
     MOCK_QUALIFIED_METHOD3(QueryState, noexcept, StatusCode(IMemoryState::Ptr &, size_t, ResponseDesc *));
     MOCK_QUALIFIED_METHOD0(Release, noexcept, void());
 };
-IE_SUPPRESS_DEPRECATED_END

diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp
index 27ab4ac..971b2e7 100644 (file)
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp
@@ -15,8 +15,6 @@
 
 namespace InferenceEngine {
 
-IE_SUPPRESS_DEPRECATED_START
-
 class MockNotEmptyICNNNetwork : public ICNNNetwork {
 public:
     static constexpr const char* INPUT_BLOB_NAME = "first_input";
@@ -28,14 +26,17 @@ public:
         return name;
     }
     void getOutputsInfo(OutputsDataMap& out) const noexcept override {
+        IE_SUPPRESS_DEPRECATED_START
         auto data = std::make_shared<Data>(MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME, Precision::UNSPECIFIED);
         getInputTo(data)[""] = std::make_shared<CNNLayer>(LayerParams{
             MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME,
             "FullyConnected",
             Precision::FP32 });
         out[MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME] = data;
+        IE_SUPPRESS_DEPRECATED_END
     };
     void getInputsInfo(InputsDataMap &inputs) const noexcept override {
+        IE_SUPPRESS_DEPRECATED_START
         auto inputInfo = std::make_shared<InputInfo>();
 
         auto inData = std::make_shared<Data>(MockNotEmptyICNNNetwork::INPUT_BLOB_NAME, Precision::UNSPECIFIED);
@@ -59,6 +60,7 @@ public:
         inputLayer->outData.push_back(outData);
 
         inputs[MockNotEmptyICNNNetwork::INPUT_BLOB_NAME] = inputInfo;
+        IE_SUPPRESS_DEPRECATED_END
     };
     std::shared_ptr<ngraph::Function> getFunction() noexcept override {
         return nullptr;
@@ -67,12 +69,8 @@ public:
         return nullptr;
     }
     MOCK_QUALIFIED_METHOD1(getInput, const noexcept, InputInfo::Ptr(const std::string &inputName));
-    MOCK_QUALIFIED_METHOD2(getName, const noexcept, void(char* pName, size_t len));
     MOCK_QUALIFIED_METHOD0(layerCount, const noexcept, size_t());
-    MOCK_QUALIFIED_METHOD1(getData, noexcept, DataPtr&(const char* dname));
     MOCK_QUALIFIED_METHOD3(addOutput, noexcept, StatusCode(const std::string &, size_t , ResponseDesc*));
-    MOCK_QUALIFIED_METHOD3(getLayerByName, const noexcept, StatusCode(const char* , CNNLayerPtr& , ResponseDesc*));
-    MOCK_QUALIFIED_METHOD1(setBatchSize, noexcept, StatusCode(const size_t size));
     MOCK_QUALIFIED_METHOD2(setBatchSize, noexcept, StatusCode(const size_t size, ResponseDesc*));
     MOCK_QUALIFIED_METHOD0(getBatchSize, const noexcept, size_t());
     MOCK_QUALIFIED_METHOD0(Release, noexcept, void());
@@ -81,6 +79,4 @@ public:
     MOCK_QUALIFIED_METHOD3(serialize, const noexcept, StatusCode(const std::string &, const std::string &, InferenceEngine::ResponseDesc*));
 };
 
-IE_SUPPRESS_DEPRECATED_END
-
 }  // namespace InferenceEngine

diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp
index d3dba4a..1cf0154 100644 (file)
--- a/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp
+++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp
@@ -47,7 +47,6 @@ protected:
             prepareOutputs(maps);
         })));
 
-        EXPECT_CALL(*mockNet, getPrecision()).WillRepeatedly(Return(Precision::FP16));
         EXPECT_CALL(*mockNet, getBatchSize()).WillRepeatedly(Return(12));
         EXPECT_CALL(*mockNet, getName()).WillRepeatedly(ReturnRefOfCopy(std::string("nm")));