From 4cd6eeb0aaba9c3ea166a69400a1895a8aff3ead Mon Sep 17 00:00:00 2001
From: andrei-cv <andrei.gorbachev@intel.com>
Date: Tue, 10 Oct 2023 17:30:38 +0400
Subject: [PATCH] batch_norm

---
 .../single_layer_tests/adaptive_pooling.cpp   |  2 --
 .../single_layer_tests/batch_norm.cpp         | 33 ++++++++-----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/adaptive_pooling.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/adaptive_pooling.cpp
index 5e824dc7234752..e6026e85469871 100644
--- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/adaptive_pooling.cpp
+++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/adaptive_pooling.cpp
@@ -8,8 +8,6 @@
 #include "single_op_tests/adaptive_pooling.hpp"
 #include "common_test_utils/test_constants.hpp"
 
-using namespace ngraph::element;
-
 namespace {
 using ov::test::AdaPoolLayerTest;
 const std::vector<std::string> poolingModes = {"max", "avg"};
diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/batch_norm.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/batch_norm.cpp
index 0ef10601c3f1b8..da3cbe708b0628 100644
--- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/batch_norm.cpp
+++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/batch_norm.cpp
@@ -4,14 +4,13 @@
 
 #include <vector>
 
-#include "single_layer_tests/batch_norm.hpp"
-
-using namespace LayerTestsDefinitions;
+#include "single_op_tests/batch_norm.hpp"
 
 namespace {
-const std::vector<InferenceEngine::Precision> netPrecisions = {
-        InferenceEngine::Precision::FP32,
-        InferenceEngine::Precision::FP16
+using ov::test::BatchNormLayerTest;
+const std::vector<ov::element::Type> types = {
+        ov::element::f16,
+        ov::element::f32
 };
 
 const std::vector<double> epsilon = {
@@ -19,23 +18,19 @@ const std::vector<double> epsilon = {
     1e-5,
     1e-4
 };
-const std::vector<std::vector<size_t>> inputShapes = {
-        {1, 3},
-        {2, 5},
-        {1, 3, 10},
-        {1, 3, 1, 1},
-        {2, 5, 4, 4},
-};
 
+const std::vector<std::vector<ov::Shape>> inputShapes = {
+        {{1, 3}},
+        {{2, 5}},
+        {{1, 3, 10}},
+        {{1, 3, 1, 1}},
+        {{2, 5, 4, 4}},
+};
 
 const auto batchNormParams = testing::Combine(
         testing::ValuesIn(epsilon),
-        testing::ValuesIn(netPrecisions),
-        testing::Values(InferenceEngine::Precision::UNSPECIFIED),
-        testing::Values(InferenceEngine::Precision::UNSPECIFIED),
-        testing::Values(InferenceEngine::Layout::ANY),
-        testing::Values(InferenceEngine::Layout::ANY),
-        testing::ValuesIn(inputShapes),
+        testing::ValuesIn(types),
+        testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes)),
         testing::Values(ov::test::utils::DEVICE_GPU)
 );