Skip to content

Commit 10b9199

Browse files
Bohdan Kurylovychystefinko
authored andcommitted
Fixed the VersionedClient's Prefetch functional test on FV
Fixed the DataserviceReadVersionedLayerClientTest.Prefetch functional test on FV job by providing the additional prefetch variables. Also, updated the olp-cpp-sdk-functional-test.variables with new prefetch values. Fixes: OLPEDGE-964 Signed-off-by: Bohdan Kurylovych <[email protected]>
1 parent 8f3194a commit 10b9199

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

scripts/linux/fv/olp-cpp-sdk-functional-test.variables

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ export dataservice_read_test_versioned_layer="omv-base-v2"
1212
export dataservice_read_test_versioned_partition="269"
1313
export dataservice_read_test_versioned_layer_version="108"
1414

15+
export dataservice_read_test_versioned_prefetch_catalog="hrn:here:data:::hereos-internal-test-v2"
16+
export dataservice_read_test_versioned_prefetch_layer="hype-test-prefetch"
17+
export dataservice_read_test_versioned_prefetch_tile="5904591"
18+
export dataservice_read_test_versioned_prefetch_subpartition1="23618365"
19+
export dataservice_read_test_versioned_prefetch_subpartition2="1476147"

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,13 @@ TEST_F(DataserviceReadVersionedLayerClientTest, GetDataFromPartitionSync) {
171171
}
172172

173173
TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
174-
const auto catalog = olp::client::HRN::FromString(
175-
CustomParameters::getArgument("dataservice_read_test_versioned_catalog"));
176-
constexpr auto kLayerId = "hype-test-prefetch";
177-
constexpr auto kTileId = "5904591";
174+
const auto catalog =
175+
olp::client::HRN::FromString(CustomParameters::getArgument(
176+
"dataservice_read_test_versioned_prefetch_catalog"));
177+
const auto kLayerId = CustomParameters::getArgument(
178+
"dataservice_read_test_versioned_prefetch_layer");
179+
const auto kTileId = CustomParameters::getArgument(
180+
"dataservice_read_test_versioned_prefetch_tile");
178181

179182
auto client = std::make_unique<olp::dataservice::read::VersionedLayerClient>(
180183
catalog, kLayerId, *settings_);
@@ -230,10 +233,12 @@ TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
230233

231234
{
232235
SCOPED_TRACE("Read cached data from pre-fetched sub-partition #1");
236+
const auto kSubPartitionId1 = CustomParameters::getArgument(
237+
"dataservice_read_test_versioned_prefetch_subpartition1");
233238
VersionedLayerClient::CallbackResponse response;
234239
auto token = client->GetData(
235240
olp::dataservice::read::DataRequest()
236-
.WithPartitionId("23618365")
241+
.WithPartitionId(kSubPartitionId1)
237242
.WithFetchOption(CacheOnly),
238243
[&response](VersionedLayerClient::CallbackResponse resp) {
239244
response = std::move(resp);
@@ -245,10 +250,12 @@ TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
245250

246251
{
247252
SCOPED_TRACE("Read cached data from pre-fetched sub-partition #2");
253+
const auto kSubPartitionId2 = CustomParameters::getArgument(
254+
"dataservice_read_test_versioned_prefetch_subpartition2");
248255
VersionedLayerClient::CallbackResponse response;
249256
auto token = client->GetData(
250257
olp::dataservice::read::DataRequest()
251-
.WithPartitionId("1476147")
258+
.WithPartitionId(kSubPartitionId2)
252259
.WithFetchOption(CacheOnly),
253260
[&response](VersionedLayerClient::CallbackResponse resp) {
254261
response = std::move(resp);

0 commit comments

Comments
 (0)