Move tests to mock server (#1037)

Liubov Didkivska · web-flow · commit a64748fc9e56 · 2020-08-28T11:42:39.000+03:00
Move GetDataFromPartitionSync and
GetDataFromPartitionAsync to work
on mock server. Add helper class.
Move host and port to environment
variables.

Relates-To: OLPEDGE-1971

Signed-off-by: Liubov Didkivska &lt;ext-liubov.didkivska@here.com&gt;
diff --git a/scripts/linux/fv/gitlab-olp-cpp-sdk-functional-test-mock.sh b/scripts/linux/fv/gitlab-olp-cpp-sdk-functional-test-mock.sh
@@ -51,7 +51,7 @@ update-ca-certificates
 echo ">>> Starting Functional Test against Mock Server... >>>"
 $REPO_HOME/build/tests/functional/olp-cpp-sdk-functional-tests \
     --gtest_output="xml:$REPO_HOME/reports/olp-functional-test-mock-report.xml" \
-    --gtest_filter="VersionedLayerClientTest.GetPartitions":"VersionedLayerClientTest.GetAggregatedData":"CatalogClientTest.*":"VersionedLayerClientPrefetchTest.Prefetch":"VersionedLayerClientProtectTest.*"
+    --gtest_filter="VersionedLayerClientTest.GetPartitions":"VersionedLayerClientTest.GetAggregatedData":"CatalogClientTest.*":"VersionedLayerClientPrefetchTest.Prefetch":"VersionedLayerClientProtectTest.*":"VersionedLayerClientGetDataTest.*"
 result=$?
 echo "Functional test with Mock finished with status: ${result}"
 
diff --git a/scripts/linux/fv/gitlab-olp-cpp-sdk-functional-test.sh b/scripts/linux/fv/gitlab-olp-cpp-sdk-functional-test.sh
@@ -20,7 +20,7 @@
 echo ">>> Functional Test ... >>>"
 $REPO_HOME/build/tests/functional/olp-cpp-sdk-functional-tests \
     --gtest_output="xml:$REPO_HOME/reports/olp-functional-test-report.xml" \
-    --gtest_filter="-ArcGisAuthenticationTest.SignInArcGis":"FacebookAuthenticationTest.SignInFacebook":"VersionedLayerClientTest.GetPartitions":"VersionedLayerClientTest.GetAggregatedData":"CatalogClientTest.*":"VersionedLayerClientPrefetchTest.Prefetch":"VersionedLayerClientProtectTest.*"
+    --gtest_filter="-ArcGisAuthenticationTest.SignInArcGis":"FacebookAuthenticationTest.SignInFacebook":"VersionedLayerClientTest.GetPartitions":"VersionedLayerClientTest.GetAggregatedData":"CatalogClientTest.*":"VersionedLayerClientPrefetchTest.Prefetch":"VersionedLayerClientProtectTest.*":"VersionedLayerClientGetDataTest.*"
     #The test VersionedLayerClientTest.GetPartitions uses mock server and it will be started in separate script. (OLPEDGE-732)
 result=$?
 echo "Functional test finished with status: ${result}"
diff --git a/scripts/linux/fv/olp-cpp-sdk-functional-test.variables b/scripts/linux/fv/olp-cpp-sdk-functional-test.variables
@@ -31,3 +31,6 @@ export dataservice_read_volatile_test_prefetch_appid="${dataservice_read_volatil
 export dataservice_read_volatile_test_prefetch_secret="${dataservice_read_volatile_test_prefetch_secret}"
 export dataservice_read_volatile_test_prefetch_catalog="hrn:here:data::olp-here-test:test-volatile-prefetch"
 export dataservice_read_volatile_prefetch_layer="volatile_prefetch_layer"
+
+export mock_server_host="localhost"
+export mock_server_port="1080"
diff --git a/tests/common/ReadDefaultResponses.h b/tests/common/ReadDefaultResponses.h
@@ -45,24 +45,32 @@ class ReadDefaultResponses {
     return version_responce;
   }
 
+  static std::string GenerateDataHandle(const std::string& partition) {
+    return partition + "-data-handle";
+  }
+
+  static olp::dataservice::read::model::Partition GeneratePartitionResponse(
+      const std::string& id) {
+    olp::dataservice::read::model::Partition partition;
+    partition.SetPartition(id);
+    partition.SetDataHandle(GenerateDataHandle(id));
+    return partition;
+  }
+
   static olp::dataservice::read::model::Partitions GeneratePartitionsResponse(
       size_t size = 10) {
-    std::vector<olp::dataservice::read::model::Partition> partitions_vect(size);
-    for (size_t i = 0; i < partitions_vect.size(); i++) {
-      partitions_vect[i].SetPartition(std::to_string(i));
-      partitions_vect[i].SetDataHandle(std::to_string(i) + "-" +
-                                       std::to_string(i * 100));
+    std::vector<olp::dataservice::read::model::Partition> partitions_vect;
+    partitions_vect.reserve(size);
+    for (size_t i = 0; i < size; i++) {
+      partitions_vect.emplace_back(
+          GeneratePartitionResponse(std::to_string(i)));
     }
 
     olp::dataservice::read::model::Partitions partitions;
     partitions.SetPartitions(partitions_vect);
     return partitions;
   }
 
-  static std::string GenerateDataHandle(const std::string& partition) {
-    return partition + "-data-handle";
-  }
-
   static std::string GenerateData() {
     std::string result =
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
diff --git a/tests/functional/CMakeLists.txt b/tests/functional/CMakeLists.txt
@@ -24,6 +24,7 @@ set(OLP_SDK_FUNCTIONAL_TESTS_SOURCES
     ./olp-cpp-sdk-dataservice-read/VersionedLayerClientPrefetchTest.cpp
     ./olp-cpp-sdk-dataservice-read/VersionedLayerClientProtectTest.cpp
     ./olp-cpp-sdk-dataservice-read/DataserviceReadVersionedLayerClientTest.cpp
+    ./olp-cpp-sdk-dataservice-read/VersionedLayerClientGetDataTest.cpp
     ./olp-cpp-sdk-dataservice-read/DataserviceReadVolatileLayerClientTest.cpp
     ./olp-cpp-sdk-dataservice-write/DataserviceWriteIndexLayerClientTest.cpp
     ./olp-cpp-sdk-dataservice-write/DataserviceWriteStreamLayerClientCacheTest.cpp
diff --git a/tests/functional/olp-cpp-sdk-dataservice-read/DataserviceReadVersionedLayerClientTest.cpp b/tests/functional/olp-cpp-sdk-dataservice-read/DataserviceReadVersionedLayerClientTest.cpp
@@ -89,35 +89,6 @@ class DataserviceReadVersionedLayerClientTest : public ::testing::Test {
   std::shared_ptr<olp::client::OlpClientSettings> settings_;
 };
 
-TEST_F(DataserviceReadVersionedLayerClientTest, GetDataFromPartitionAsync) {
-  auto catalog = olp::client::HRN::FromString(
-      CustomParameters::getArgument("dataservice_read_test_versioned_catalog"));
-  auto layer =
-      CustomParameters::getArgument("dataservice_read_test_versioned_layer");
-
-  auto catalog_client =
-      std::make_unique<olp::dataservice::read::VersionedLayerClient>(
-          catalog, layer, boost::none, *settings_);
-  ASSERT_TRUE(catalog_client);
-
-  std::promise<dataservice_read::DataResponse> promise;
-  std::future<dataservice_read::DataResponse> future = promise.get_future();
-  auto partition = CustomParameters::getArgument(
-      "dataservice_read_test_versioned_partition");
-  auto token = catalog_client->GetData(
-      olp::dataservice::read::DataRequest().WithPartitionId(partition),
-      [&promise](dataservice_read::DataResponse response) {
-        promise.set_value(response);
-      });
-
-  ASSERT_NE(future.wait_for(kWaitTimeout), std::future_status::timeout);
-  dataservice_read::DataResponse response = future.get();
-
-  EXPECT_SUCCESS(response);
-  ASSERT_TRUE(response.GetResult() != nullptr);
-  ASSERT_NE(response.GetResult()->size(), 0u);
-}
-
 TEST_F(DataserviceReadVersionedLayerClientTest,
        GetDataFromPartitionLatestVersionAsync) {
   auto catalog = olp::client::HRN::FromString(
@@ -148,32 +119,6 @@ TEST_F(DataserviceReadVersionedLayerClientTest,
   ASSERT_NE(response.GetResult()->size(), 0u);
 }
 
-TEST_F(DataserviceReadVersionedLayerClientTest, GetDataFromPartitionSync) {
-  settings_->task_scheduler.reset();
-
-  auto catalog = olp::client::HRN::FromString(
-      CustomParameters::getArgument("dataservice_read_test_versioned_catalog"));
-  auto layer =
-      CustomParameters::getArgument("dataservice_read_test_versioned_layer");
-
-  auto catalog_client =
-      std::make_unique<olp::dataservice::read::VersionedLayerClient>(
-          catalog, layer, boost::none, *settings_);
-  ASSERT_TRUE(catalog_client);
-
-  dataservice_read::DataResponse response;
-  auto partition = CustomParameters::getArgument(
-      "dataservice_read_test_versioned_partition");
-  auto token = catalog_client->GetData(
-      olp::dataservice::read::DataRequest().WithPartitionId(partition),
-      [&response](dataservice_read::DataResponse resp) {
-        response = std::move(resp);
-      });
-  EXPECT_SUCCESS(response);
-  ASSERT_TRUE(response.GetResult() != nullptr);
-  ASSERT_NE(response.GetResult()->size(), 0u);
-}
-
 TEST_F(DataserviceReadVersionedLayerClientTest, PrefetchWideRange) {
   const auto catalog =
       olp::client::HRN::FromString(CustomParameters::getArgument(
diff --git a/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientGetDataTest.cpp b/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientGetDataTest.cpp
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 HERE Europe B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * License-Filename: LICENSE
+ */
+
+#include <gtest/gtest.h>
+#include <olp/core/client/OlpClientSettings.h>
+#include <olp/core/client/OlpClientSettingsFactory.h>
+#include <olp/dataservice/read/VersionedLayerClient.h>
+// clang-format off
+#include "generated/serializer/PartitionsSerializer.h"
+#include "generated/serializer/JsonSerializer.h"
+// clang-format on
+#include "SetupMockServer.h"
+#include "ApiDefaultResponses.h"
+#include "MockServerHelper.h"
+#include "ReadDefaultResponses.h"
+#include "Utils.h"
+
+namespace {
+
+const auto kTestHrn = "hrn:here:data::olp-here-test:hereos-internal-test";
+const auto kLayer = "testlayer";
+const auto kVersion = 44;
+constexpr auto kWaitTimeout = std::chrono::seconds(10);
+const auto kPartitionsResponsePath =
+    "/query/v1/catalogs/hrn:here:data::olp-here-test:hereos-internal-test/"
+    "layers/testlayer/partitions";
+
+class VersionedLayerClientGetDataTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    auto network = olp::client::OlpClientSettingsFactory::
+        CreateDefaultNetworkRequestHandler();
+    settings_ = mockserver::SetupMockServer::CreateSettings(network);
+    mock_server_client_ =
+        mockserver::SetupMockServer::CreateMockServer(network, kTestHrn);
+  }
+
+  void TearDown() override {
+    auto network = std::move(settings_->network_request_handler);
+    settings_.reset();
+    mock_server_client_.reset();
+  }
+
+  std::shared_ptr<olp::client::OlpClientSettings> settings_;
+  std::shared_ptr<mockserver::MockServerHelper> mock_server_client_;
+};
+
+TEST_F(VersionedLayerClientGetDataTest, GetDataFromPartitionSync) {
+  olp::client::HRN hrn(kTestHrn);
+  auto partition = std::to_string(0);
+  const auto data = mockserver::ReadDefaultResponses::GenerateData();
+  {
+    mock_server_client_->MockAuth();
+    mock_server_client_->MockLookupResourceApiResponse(
+        mockserver::ApiDefaultResponses::GenerateResourceApisResponse(
+            kTestHrn));
+    mock_server_client_->MockGetVersionResponse(
+        mockserver::ReadDefaultResponses::GenerateVersionResponse(kVersion));
+    mock_server_client_->MockGetResponse(
+        mockserver::ReadDefaultResponses::GeneratePartitionsResponse(1),
+        kPartitionsResponsePath);
+    mock_server_client_->MockGetResponse(
+        kLayer, mockserver::ReadDefaultResponses::GenerateDataHandle(partition),
+        data);
+  }
+
+  auto catalog_client = olp::dataservice::read::VersionedLayerClient(
+      hrn, kLayer, boost::none, *settings_);
+
+  auto future = catalog_client.GetData(
+      olp::dataservice::read::DataRequest().WithPartitionId(partition));
+  auto response = future.GetFuture().get();
+  EXPECT_SUCCESS(response);
+  ASSERT_TRUE(response.GetResult() != nullptr);
+  ASSERT_EQ(response.GetResult()->size(), data.size());
+
+  EXPECT_TRUE(mock_server_client_->Verify());
+}
+
+TEST_F(VersionedLayerClientGetDataTest, GetDataFromPartitionAsync) {
+  olp::client::HRN hrn(kTestHrn);
+  auto partition = std::to_string(0);
+  const auto data = mockserver::ReadDefaultResponses::GenerateData();
+  {
+    mock_server_client_->MockLookupResourceApiResponse(
+        mockserver::ApiDefaultResponses::GenerateResourceApisResponse(
+            kTestHrn));
+    mock_server_client_->MockGetVersionResponse(
+        mockserver::ReadDefaultResponses::GenerateVersionResponse(kVersion));
+    mock_server_client_->MockGetResponse(
+        mockserver::ReadDefaultResponses::GeneratePartitionsResponse(1),
+        kPartitionsResponsePath);
+    mock_server_client_->MockGetResponse(
+        kLayer, mockserver::ReadDefaultResponses::GenerateDataHandle(partition),
+        data);
+  }
+
+  auto catalog_client = olp::dataservice::read::VersionedLayerClient(
+      hrn, kLayer, boost::none, *settings_);
+
+  std::promise<olp::dataservice::read::DataResponse> promise;
+  std::future<olp::dataservice::read::DataResponse> future =
+      promise.get_future();
+
+  auto token = catalog_client.GetData(
+      olp::dataservice::read::DataRequest().WithPartitionId(partition),
+      [&promise](olp::dataservice::read::DataResponse response) {
+        promise.set_value(response);
+      });
+  ASSERT_NE(future.wait_for(kWaitTimeout), std::future_status::timeout);
+
+  olp::dataservice::read::DataResponse response = future.get();
+  EXPECT_SUCCESS(response);
+  ASSERT_TRUE(response.GetResult() != nullptr);
+  ASSERT_EQ(response.GetResult()->size(), data.size());
+
+  EXPECT_TRUE(mock_server_client_->Verify());
+}
+
+}  // namespace
diff --git a/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientPrefetchTest.cpp b/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientPrefetchTest.cpp
@@ -26,35 +26,24 @@
 #include <olp/dataservice/read/FetchOptions.h>
 #include <olp/dataservice/read/VersionedLayerClient.h>
 #include <string>
-#include <testutils/CustomParameters.hpp>
 #include "ApiDefaultResponses.h"
 #include "MockServerHelper.h"
 #include "ReadDefaultResponses.h"
+#include "SetupMockServer.h"
 #include "Utils.h"
 
 namespace {
 
-const auto kMockServerHost = "localhost";
-const auto kMockServerPort = 1080;
 const auto kTestHrn = "hrn:here:data::olp-here-test:hereos-internal-test";
 
 class VersionedLayerClientPrefetchTest : public ::testing::Test {
  protected:
   void SetUp() override {
     auto network = olp::client::OlpClientSettingsFactory::
         CreateDefaultNetworkRequestHandler();
-
-    settings_ = std::make_shared<olp::client::OlpClientSettings>();
-    settings_->network_request_handler = network;
-    settings_->task_scheduler =
-        olp::client::OlpClientSettingsFactory::CreateDefaultTaskScheduler();
-    // setup proxy
-    settings_->proxy_settings =
-        olp::http::NetworkProxySettings()
-            .WithHostname(kMockServerHost)
-            .WithPort(kMockServerPort)
-            .WithType(olp::http::NetworkProxySettings::Type::HTTP);
-    SetUpMockServer(network);
+    settings_ = mockserver::SetupMockServer::CreateSettings(network);
+    mock_server_client_ =
+        mockserver::SetupMockServer::CreateMockServer(network, kTestHrn);
   }
 
   void TearDown() override {
@@ -63,14 +52,6 @@ class VersionedLayerClientPrefetchTest : public ::testing::Test {
     mock_server_client_.reset();
   }
 
-  void SetUpMockServer(std::shared_ptr<olp::http::Network> network) {
-    // create client to set mock server expectations
-    olp::client::OlpClientSettings olp_client_settings;
-    olp_client_settings.network_request_handler = network;
-    mock_server_client_ = std::make_shared<mockserver::MockServerHelper>(
-        olp_client_settings, kTestHrn);
-  }
-
   std::shared_ptr<olp::client::OlpClientSettings> settings_;
   std::shared_ptr<mockserver::MockServerHelper> mock_server_client_;
 };
@@ -96,6 +77,7 @@ TEST_F(VersionedLayerClientPrefetchTest, Prefetch) {
                              .WithMinLevel(12)
                              .WithMaxLevel(15);
     {
+      mock_server_client_->MockAuth();
       mock_server_client_->MockLookupResourceApiResponse(
           mockserver::ApiDefaultResponses::GenerateResourceApisResponse(
               kTestHrn));
diff --git a/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientProtectTest.cpp b/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientProtectTest.cpp
@@ -24,15 +24,15 @@
 #include <olp/core/porting/make_unique.h>
 #include <olp/core/utils/Dir.h>
 #include <olp/dataservice/read/VersionedLayerClient.h>
+#include <testutils/CustomParameters.hpp>
 #include "ApiDefaultResponses.h"
 #include "MockServerHelper.h"
 #include "ReadDefaultResponses.h"
+#include "SetupMockServer.h"
 #include "Utils.h"
 
 namespace {
 
-const auto kMockServerHost = "localhost";
-const auto kMockServerPort = 1080;
 const auto kTestHrn = "hrn:here:data::olp-here-test:hereos-internal-test";
 
 class VersionedLayerClientProtectTest : public ::testing::Test {
@@ -57,11 +57,9 @@ class VersionedLayerClientProtectTest : public ::testing::Test {
     settings_->network_request_handler = network;
     // setup proxy
     settings_->proxy_settings =
-        olp::http::NetworkProxySettings()
-            .WithHostname(kMockServerHost)
-            .WithPort(kMockServerPort)
-            .WithType(olp::http::NetworkProxySettings::Type::HTTP);
-    SetUpMockServer(network);
+        mockserver::SetupMockServer::CreateProxySettings();
+    mock_server_client_ =
+        mockserver::SetupMockServer::CreateMockServer(network, kTestHrn);
   }
 
   void TearDown() override {
@@ -71,14 +69,6 @@ class VersionedLayerClientProtectTest : public ::testing::Test {
     olp::utils::Dir::remove(cache_path_);
   }
 
-  void SetUpMockServer(std::shared_ptr<olp::http::Network> network) {
-    // create client to set mock server expectations
-    olp::client::OlpClientSettings olp_client_settings;
-    olp_client_settings.network_request_handler = network;
-    mock_server_client_ = std::make_shared<mockserver::MockServerHelper>(
-        olp_client_settings, kTestHrn);
-  }
-
   std::shared_ptr<olp::client::OlpClientSettings> settings_;
   std::shared_ptr<mockserver::MockServerHelper> mock_server_client_;
   std::string cache_path_;
diff --git a/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientTest.cpp b/tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientTest.cpp
diff --git a/tests/functional/utils/SetupMockServer.h b/tests/functional/utils/SetupMockServer.h
