From afee06ec3defab81ca8a6f1d8cf2d395bf32a132 Mon Sep 17 00:00:00 2001
From: Irina Efode <irina.efode@intel.com>
Date: Thu, 16 Jul 2020 14:20:08 +0300
Subject: [PATCH] [IE TESTS] Small refactoring of test infrastructure (#1332)

---
 .../single_layer_tests/comparison.cpp               |  4 ++--
 .../single_layer_tests/squeeze_unsqueeze.cpp        |  2 +-
 .../single_layer_tests/comparison.cpp               |  2 +-
 .../include/single_layer_tests/comparison.hpp       |  1 -
 .../single_layer_tests/squeeze_unsqueeze.hpp        |  2 --
 .../shared/src/single_layer_tests/comparison.cpp    | 11 -----------
 .../plugin/shared/src/single_layer_tests/range.cpp  |  4 ----
 .../src/single_layer_tests/squeeze_unsqueeze.cpp    | 10 ----------
 .../common_test_utils/common_utils.hpp              | 13 ++++++++++++-
 9 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp
index e13b2ce0142..cc23a910c8f 100644
--- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp
+++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp
@@ -11,7 +11,7 @@ using namespace LayerTestsDefinitions::ComparisonParams;
 
 namespace {
 
-std::map<std::vector<size_t>, std::vector<std::vector<size_t >>> inputShapes = {
+std::map<std::vector<size_t>, std::vector<std::vector<size_t>>> inputShapes = {
         {{1}, {{1}, {17}, {1, 1}, {2, 18}, {1, 1, 2}, {2, 2, 3}, {1, 1, 2, 3}}},
         {{5}, {{1}, {1, 1}, {2, 5}, {1, 1, 1}, {2, 2, 5}}},
         {{2, 200}, {{1}, {200}, {1, 200}, {2, 200}, {2, 2, 200}}},
@@ -45,7 +45,7 @@ std::vector<InferenceEngine::Precision> netPrecisions = {
 std::map<std::string, std::string> additional_config = {};
 
 const auto ComparisonTestParams = ::testing::Combine(
-        ::testing::ValuesIn(ComparisonLayerTest::combineShapes(inputShapes)),
+        ::testing::ValuesIn(CommonTestUtils::combineShapes<size_t>(inputShapes)),
         ::testing::ValuesIn(inputsPrecisions),
         ::testing::ValuesIn(comparisonOpTypes),
         ::testing::ValuesIn(secondInputTypes),
diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp
index 770f92f94ed..fae71fa4741 100644
--- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp
+++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp
@@ -31,7 +31,7 @@ const std::vector<ngraph::helpers::SqueezeOpType> opTypes = {
 
 INSTANTIATE_TEST_CASE_P(Basic, SqueezeUnsqueezeLayerTest,
                         ::testing::Combine(
-                                ::testing::ValuesIn(SqueezeUnsqueezeLayerTest::combineShapes(axesVectors)),
+                                ::testing::ValuesIn(CommonTestUtils::combineShapes<int>(axesVectors)),
                                 ::testing::ValuesIn(opTypes),
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_CPU)),
diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp
index 396a0e558e6..2dbfcb1e5ff 100644
--- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp
+++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp
@@ -45,7 +45,7 @@ std::vector<InferenceEngine::Precision> netPrecisions = {
 std::map<std::string, std::string> additional_config = {};
 
 const auto ComparisonTestParams = ::testing::Combine(
-        ::testing::ValuesIn(ComparisonLayerTest::combineShapes(inputShapes)),
+        ::testing::ValuesIn(CommonTestUtils::combineShapes<size_t>(inputShapes)),
         ::testing::ValuesIn(inputsPrecisions),
         ::testing::ValuesIn(comparisonOpTypes),
         ::testing::ValuesIn(secondInputTypes),
diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp
index 30dcc08ee81..3b4f1ba199f 100644
--- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/comparison.hpp
@@ -35,6 +35,5 @@ protected:
 
 public:
     static std::string getTestCaseName(testing::TestParamInfo<ComparisonTestParams> obj);
-    static std::vector<ComparisonParams::InputShapesTuple> combineShapes(const std::map<std::vector<size_t>, std::vector<std::vector<size_t >>>& inputShapes);
 };
 } // namespace LayerTestsDefinitions
diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp
index 4ce1f095b43..a53d4497460 100644
--- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp
@@ -26,8 +26,6 @@ class SqueezeUnsqueezeLayerTest : public testing::WithParamInterface<squeezePara
                        public LayerTestsUtils::LayerTestsCommon {
 public:
     static std::string getTestCaseName(testing::TestParamInfo<squeezeParams> obj);
-    static std::vector<ShapeAxesTuple> combineShapes(const std::map<std::vector<size_t>, std::vector<std::vector<int>>>& inputShapes);
-
 protected:
     void SetUp() override;
 };
diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp
index 6d3c70d22f6..714f4cee3fe 100644
--- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp
+++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/comparison.cpp
@@ -37,17 +37,6 @@ std::string ComparisonLayerTest::getTestCaseName(testing::TestParamInfo<Comparis
     return results.str();
 }
 
-std::vector<InputShapesTuple> ComparisonLayerTest::combineShapes(const std::map<std::vector<size_t>, std::vector<std::vector<size_t >>>& inputShapes) {
-    std::vector<InputShapesTuple> resVec;
-    for (auto& inputShape : inputShapes) {
-        for (auto& item : inputShape.second) {
-            resVec.push_back({inputShape.first, item});
-        }
-    }
-    return resVec;
-}
-
-
 void ComparisonLayerTest::SetUp() {
     InputShapesTuple inputShapes;
     InferenceEngine::Precision inputsPrecision;
diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp
index 544c96bd751..ef6dffffe77 100644
--- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp
+++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp
@@ -54,10 +54,6 @@ void RangeLayerTest::SetUp() {
     std::tie(start, stop, step, netPrecision, targetDevice) = GetParam();
     auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
 
-    auto start_constant = std::make_shared<ngraph::opset1::Constant>(ngPrc, ngraph::Shape{}, start);
-    auto stop_constant = std::make_shared<ngraph::opset1::Constant>(ngPrc, ngraph::Shape{}, stop);
-    auto step_constant = std::make_shared<ngraph::opset1::Constant>(ngPrc, ngraph::Shape{}, step);
-
     auto params = ngraph::builder::makeParams(ngPrc, {std::vector<size_t>(), std::vector<size_t>(), std::vector<size_t>()});
     params[0]->set_friendly_name("start");
     params[1]->set_friendly_name("stop");
diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp
index 8c7ab5394d2..04bdd462111 100644
--- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp
+++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp
@@ -34,16 +34,6 @@ std::string SqueezeUnsqueezeLayerTest::getTestCaseName(testing::TestParamInfo<sq
     return result.str();
 }
 
-std::vector<ShapeAxesTuple> SqueezeUnsqueezeLayerTest::combineShapes(const std::map<std::vector<size_t>, std::vector<std::vector<int>>>& inputShapes) {
-    std::vector<ShapeAxesTuple> resVec;
-    for (auto& inputShape : inputShapes) {
-        for (auto& item : inputShape.second) {
-            resVec.push_back({inputShape.first, item});
-        }
-    }
-    return resVec;
-}
-
 void SqueezeUnsqueezeLayerTest::SetUp() {
     InferenceEngine::Precision netPrecision;
     std::vector<size_t> inputShapes;
diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp
index f00f29618c1..dcdc0f54a88 100644
--- a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp
+++ b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp
@@ -13,7 +13,6 @@
 #include <details/ie_cnn_network_iterator.hpp>
 
 namespace CommonTestUtils {
-
 template<typename vecElementType>
 inline std::string vec2str(const std::vector<vecElementType> &vec) {
     if (!vec.empty()) {
@@ -58,4 +57,16 @@ inline InferenceEngine::CNNLayerPtr getLayerByName(const InferenceEngine::CNNNet
     return getLayerByName(&icnnnetwork, layerName);
 }
 
+template <typename elementTypeVector>
+std::vector<std::pair<std::vector<size_t>, std::vector<elementTypeVector>>>
+        combineShapes(const std::map<std::vector<size_t>, std::vector<std::vector<elementTypeVector>>>& inputShapes) {
+    std::vector<std::pair<std::vector<size_t>, std::vector<elementTypeVector>>> resVec;
+    for (auto& inputShape : inputShapes) {
+        for (auto& item : inputShape.second) {
+            resVec.push_back({inputShape.first, item});
+        }
+    }
+    return resVec;
+}
+
 }  // namespace CommonTestUtils