Move GetData() tests to mock server. (#1039)

GetDataWithInvalidDataHandle and GetDataFromPartitionLatestVersionAsync
are moved to mock server.

Resolves: OLPEDGE-1970, OLPEDGE-1964

Signed-off-by: Kostiantyn Zvieriev <ext-kostiantyn.zvieriev@here.com>

Author: kzvieriev

tests/functional/olp-cpp-sdk-dataservice-read/DataserviceReadVersionedLayerClientTest.cpp

@@ -89,36 +89,6 @@ class DataserviceReadVersionedLayerClientTest : public ::testing::Test {
   std::shared_ptr<olp::client::OlpClientSettings> settings_;
 };
 
-TEST_F(DataserviceReadVersionedLayerClientTest,
-       GetDataFromPartitionLatestVersionAsync) {
-  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, PrefetchWideRange) {
   const auto catalog =
       olp::client::HRN::FromString(CustomParameters::getArgument(
@@ -413,25 +383,6 @@ TEST_F(DataserviceReadVersionedLayerClientTest, GetDataWithInvalidHrn) {
             data_response.GetError().GetHttpStatusCode());
 }
 
-TEST_F(DataserviceReadVersionedLayerClientTest, GetDataWithInvalidDataHandle) {
-  olp::client::HRN hrn(GetTestCatalog());
-
-  auto catalog_client =
-      std::make_unique<olp::dataservice::read::VersionedLayerClient>(
-          hrn, "testlayer", boost::none, *settings_);
-
-  auto request = olp::dataservice::read::DataRequest();
-  request.WithDataHandle("invalidDataHandle");
-  auto data_response = GetExecutionTime<dataservice_read::DataResponse>([&] {
-    auto future = catalog_client->GetData(request);
-    return future.GetFuture().get();
-  });
-
-  ASSERT_FALSE(data_response.IsSuccessful());
-  ASSERT_EQ(http::HttpStatusCode::NOT_FOUND,
-            data_response.GetError().GetHttpStatusCode());
-}
-
 TEST_F(DataserviceReadVersionedLayerClientTest, GetDataHandleWithInvalidLayer) {
   olp::client::HRN hrn(GetTestCatalog());
 

tests/functional/olp-cpp-sdk-dataservice-read/VersionedLayerClientGetDataTest.cpp

@@ -59,6 +59,13 @@ class VersionedLayerClientGetDataTest : public ::testing::Test {
     return "/query/v1/catalogs/" + hrn + "/layers/" + layer + "/partitions";
   }
 
+  std::string GenerateGetDataPath(const std::string& hrn,
+                                  const std::string& layer,
+                                  const std::string& data_handle) {
+    return "/blob/v1/catalogs/" + hrn + "/layers/" + layer + "/data/" +
+           data_handle;
+  }
+
   std::shared_ptr<olp::client::OlpClientSettings> settings_;
   std::shared_ptr<mockserver::MockServerHelper> mock_server_client_;
 };
@@ -229,4 +236,79 @@ TEST_F(VersionedLayerClientGetDataTest, GetDataWithPartitionIdVersion2) {
   EXPECT_TRUE(mock_server_client_->Verify());
 }
 
+TEST_F(VersionedLayerClientGetDataTest,
+       GetDataFromPartitionLatestVersionAsync) {
+  const olp::client::HRN kHrn(kTestHrn);
+  const auto kPartitionName = "269";
+  const std::string tile_data =
+      mockserver::ReadDefaultResponses::GenerateData();
+
+  auto partition = mockserver::ReadDefaultResponses::GeneratePartitionResponse(
+      kPartitionName);
+  auto data_handle = partition.GetDataHandle();
+  olp::dataservice::read::model::Partitions partitions;
+  partitions.SetPartitions({partition});
+
+  {
+    mock_server_client_->MockAuth();
+    mock_server_client_->MockLookupResourceApiResponse(
+        mockserver::ApiDefaultResponses::GenerateResourceApisResponse(
+            kTestHrn));
+    mock_server_client_->MockGetVersionResponse(
+        mockserver::ReadDefaultResponses::GenerateVersionResponse(kVersion));
+    mock_server_client_->MockGetResponse(
+        partitions, GenerateGetPartitionsPath(kTestHrn, kLayer));
+    mock_server_client_->MockGetResponse(kLayer, data_handle, tile_data);
+  }
+
+  olp::dataservice::read::VersionedLayerClient client(kHrn, kLayer, boost::none,
+                                                      *settings_);
+
+  std::promise<olp::dataservice::read::DataResponse> promise;
+  std::future<olp::dataservice::read::DataResponse> future =
+      promise.get_future();
+
+  auto token = client.GetData(
+      olp::dataservice::read::DataRequest().WithPartitionId(kPartitionName),
+      [&promise](olp::dataservice::read::DataResponse response) {
+        promise.set_value(response);
+      });
+
+  auto response = future.get();
+  auto result = response.GetResult();
+
+  ASSERT_TRUE(response.IsSuccessful());
+  ASSERT_EQ(result->size(), tile_data.size());
+  EXPECT_TRUE(std::equal(tile_data.begin(), tile_data.end(), result->begin()));
+  EXPECT_TRUE(mock_server_client_->Verify());
+}
+
+TEST_F(VersionedLayerClientGetDataTest, GetDataWithInvalidDataHandle) {
+  const olp::client::HRN kHrn(kTestHrn);
+  constexpr auto kDataHandle = "invalidDataHandle";
+
+  {
+    mock_server_client_->MockAuth();
+    mock_server_client_->MockLookupResourceApiResponse(
+        mockserver::ApiDefaultResponses::GenerateResourceApisResponse(
+            kTestHrn));
+    mock_server_client_->MockGetError(
+        {olp::http::HttpStatusCode::NOT_FOUND, "Not found"},
+        GenerateGetDataPath(kTestHrn, kLayer, kDataHandle));
+  }
+
+  olp::dataservice::read::VersionedLayerClient client(kHrn, kLayer, boost::none,
+                                                      *settings_);
+
+  auto request = olp::dataservice::read::DataRequest();
+  request.WithDataHandle(kDataHandle);
+  auto future = client.GetData(request).GetFuture();
+  auto response = future.get();
+
+  ASSERT_FALSE(response.IsSuccessful());
+  ASSERT_EQ(olp::http::HttpStatusCode::NOT_FOUND,
+            response.GetError().GetHttpStatusCode());
+  EXPECT_TRUE(mock_server_client_->Verify());
+}
+
 }  // namespace