Remove static network and static task scheduler from Stream tests. (#604)

Resolves: OLPEDGE-1424

Signed-off-by: Mykhailo Kuchma <[email protected]>

Author: mykhailo-kuchma

tests/functional/olp-cpp-sdk-dataservice-write/DataserviceWriteStreamLayerClientCacheTest.cpp

@@ -92,13 +92,6 @@ void PublishFailureAssertions(
 
 class DataserviceWriteStreamLayerClientCacheTest : public ::testing::Test {
  protected:
-  static void SetUpTestSuite() {
-    s_network = olp::client::OlpClientSettingsFactory::
-        CreateDefaultNetworkRequestHandler();
-    s_task_scheduler =
-        olp::client::OlpClientSettingsFactory::CreateDefaultTaskScheduler(1u);
-  }
-
   virtual void SetUp() override {
     ASSERT_NO_FATAL_FAILURE(client_ = CreateStreamLayerClient());
     data_ = GenerateData();
@@ -129,7 +122,8 @@ class DataserviceWriteStreamLayerClientCacheTest : public ::testing::Test {
   }
 
   virtual std::shared_ptr<StreamLayerClient> CreateStreamLayerClient() {
-    auto network = s_network;
+    auto network = olp::client::OlpClientSettingsFactory::
+        CreateDefaultNetworkRequestHandler();
 
     const auto app_id = CustomParameters::getArgument(kAppid);
     const auto secret = CustomParameters::getArgument(kSecret);
@@ -147,7 +141,8 @@ class DataserviceWriteStreamLayerClientCacheTest : public ::testing::Test {
     olp::client::OlpClientSettings settings;
     settings.authentication_settings = auth_client_settings;
     settings.network_request_handler = network;
-    settings.task_scheduler = s_task_scheduler;
+    settings.task_scheduler =
+        olp::client::OlpClientSettingsFactory::CreateDefaultTaskScheduler(1u);
 
     disk_cache_ = std::make_shared<olp::cache::DefaultCache>();
     EXPECT_EQ(disk_cache_->Open(),
@@ -171,29 +166,13 @@ class DataserviceWriteStreamLayerClientCacheTest : public ::testing::Test {
   }
 
  protected:
-  static std::shared_ptr<olp::http::Network> s_network;
-  static std::shared_ptr<olp::thread::TaskScheduler> s_task_scheduler;
-
   std::shared_ptr<StreamLayerClient> client_;
   std::shared_ptr<std::vector<unsigned char>> data_;
 
   std::shared_ptr<olp::cache::DefaultCache> disk_cache_;
   StreamLayerClientSettings stream_client_settings_;
 };
 
-// Static network instance is necessary as it needs to outlive any created
-// clients. This is a known limitation as triggered send requests capture the
-// network instance inside the callbacks.
-std::shared_ptr<olp::http::Network>
-    DataserviceWriteStreamLayerClientCacheTest::s_network;
-
-// Static network instance is necessary as it needs to outlive any created
-// clients. This is a known limitation as triggered send requests capture the
-// task_scheduler instance inside the callbacks, and it could happen that the
-// task is trying to destroy task scheduler, that will result in a crash.
-std::shared_ptr<olp::thread::TaskScheduler>
-    DataserviceWriteStreamLayerClientCacheTest::s_task_scheduler;
-
 TEST_F(DataserviceWriteStreamLayerClientCacheTest, Queue) {
   auto error = client_->Queue(
       PublishDataRequest().WithData(data_).WithLayerId(GetTestLayer()));

tests/functional/olp-cpp-sdk-dataservice-write/DataserviceWriteStreamLayerClientTest.cpp

@@ -157,15 +157,9 @@ class DataserviceWriteStreamLayerClientTest : public ::testing::Test {
     }
   }
 
-  static void SetUpTestSuite() {
-    s_network = olp::client::OlpClientSettingsFactory::
-        CreateDefaultNetworkRequestHandler();
-    s_task_scheduler =
-        olp::client::OlpClientSettingsFactory::CreateDefaultTaskScheduler(1u);
-  }
-
   virtual std::shared_ptr<StreamLayerClient> CreateStreamLayerClient() {
-    auto network = s_network;
+    auto network = olp::client::OlpClientSettingsFactory::
+        CreateDefaultNetworkRequestHandler();
 
     const auto app_id = CustomParameters::getArgument(kAppid);
     const auto secret = CustomParameters::getArgument(kSecret);
@@ -183,7 +177,8 @@ class DataserviceWriteStreamLayerClientTest : public ::testing::Test {
     olp::client::OlpClientSettings settings;
     settings.authentication_settings = auth_client_settings;
     settings.network_request_handler = network;
-    settings.task_scheduler = s_task_scheduler;
+    settings.task_scheduler =
+        olp::client::OlpClientSettingsFactory::CreateDefaultTaskScheduler(1u);
 
     return std::make_shared<StreamLayerClient>(
         olp::client::HRN{GetTestCatalog()}, StreamLayerClientSettings{},
@@ -203,27 +198,11 @@ class DataserviceWriteStreamLayerClientTest : public ::testing::Test {
   }
 
  protected:
-  static std::shared_ptr<olp::http::Network> s_network;
-  static std::shared_ptr<olp::thread::TaskScheduler> s_task_scheduler;
-
   std::shared_ptr<StreamLayerClient> client_;
   std::shared_ptr<std::vector<unsigned char>> data_;
   std::shared_ptr<std::vector<unsigned char>> sdii_data_;
 };
 
-// Static network instance is necessary as it needs to outlive any created
-// clients. This is a known limitation as triggered send requests capture the
-// network instance inside the callbacks.
-std::shared_ptr<olp::http::Network>
-    DataserviceWriteStreamLayerClientTest::s_network;
-
-// Static network instance is necessary as it needs to outlive any created
-// clients. This is a known limitation as triggered send requests capture the
-// task_scheduler instance inside the callbacks, and it could happen that the
-// task is trying to destroy task scheduler, that will result in a crash.
-std::shared_ptr<olp::thread::TaskScheduler>
-    DataserviceWriteStreamLayerClientTest::s_task_scheduler;
-
 TEST_F(DataserviceWriteStreamLayerClientTest, PublishData) {
   auto response =
       client_