Skip to content

Commit 377dde9

Browse files
mykhailo-kuchmamykhailo-kuchma
committed
Adapt dataservice-read functional tests for EXCPECT_SUCCESS macro
Relates-To: OLPEDGE-966 Signed-off-by: Mykhailo Kuchma <[email protected]>
1 parent ad5bec5 commit 377dde9

File tree

3 files changed

+31
-51
lines changed

3 files changed

+31
-51
lines changed

‎tests/functional/olp-cpp-sdk-dataservice-read/CatalogClientTest.cpp‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
#include <olp/core/logging/Log.h>
4646
#include <olp/core/porting/make_unique.h>
4747
#include <olp/core/utils/Dir.h>
48+
#include <olp/dataservice/read/CatalogClient.h>
49+
#include <olp/dataservice/read/CatalogRequest.h>
50+
#include <olp/dataservice/read/CatalogVersionRequest.h>
51+
#include <olp/dataservice/read/DataRequest.h>
52+
#include <olp/dataservice/read/PartitionsRequest.h>
4853
#include <olp/dataservice/read/PrefetchTilesRequest.h>
49-
50-
#include "olp/dataservice/read/CatalogClient.h"
51-
#include "olp/dataservice/read/CatalogRequest.h"
52-
#include "olp/dataservice/read/CatalogVersionRequest.h"
53-
#include "olp/dataservice/read/DataRequest.h"
54-
#include "olp/dataservice/read/PartitionsRequest.h"
55-
#include "olp/dataservice/read/model/Catalog.h"
54+
#include <olp/dataservice/read/model/Catalog.h>
55+
#include "Utils.h"
5656

5757
using namespace olp::dataservice::read;
5858
using namespace testing;
@@ -119,14 +119,6 @@ class CatalogClientTest : public ::testing::TestWithParam<CacheType> {
119119
return CustomParameters::getArgument("dataservice_read_test_catalog");
120120
}
121121

122-
std::string PrintError(const olp::client::ApiError& error) {
123-
std::ostringstream result_stream;
124-
result_stream << "ERROR: code: " << static_cast<int>(error.GetErrorCode())
125-
<< ", status: " << error.GetHttpStatusCode()
126-
<< ", message: " << error.GetMessage();
127-
return result_stream.str();
128-
}
129-
130122
template <typename T>
131123
T GetExecutionTime(std::function<T()> func) {
132124
auto start_time = std::chrono::high_resolution_clock::now();
@@ -157,8 +149,7 @@ TEST_P(CatalogClientTest, GetCatalog) {
157149
return future.GetFuture().get();
158150
});
159151

160-
ASSERT_TRUE(catalog_response.IsSuccessful())
161-
<< PrintError(catalog_response.GetError());
152+
EXPECT_SUCCESS(catalog_response);
162153
}
163154

164155
TEST_P(CatalogClientTest, GetPartitionsWithInvalidHrn) {
@@ -193,8 +184,7 @@ TEST_P(CatalogClientTest, GetPartitions) {
193184
return future.GetFuture().get();
194185
});
195186

196-
ASSERT_TRUE(partitions_response.IsSuccessful())
197-
<< PrintError(partitions_response.GetError());
187+
EXPECT_SUCCESS(partitions_response);
198188
ASSERT_EQ(4u, partitions_response.GetResult().GetPartitions().size());
199189
}
200190

@@ -213,7 +203,7 @@ TEST_P(CatalogClientTest, GetPartitionsForInvalidLayer) {
213203
});
214204

215205
ASSERT_FALSE(partitions_response.IsSuccessful())
216-
<< PrintError(partitions_response.GetError());
206+
<< ErrorMessage(partitions_response.GetError());
217207
ASSERT_EQ(olp::client::ErrorCode::InvalidArgument,
218208
partitions_response.GetError().GetErrorCode());
219209
}
@@ -252,8 +242,7 @@ TEST_P(CatalogClientTest, GetDataWithHandle) {
252242
return future.GetFuture().get();
253243
});
254244

255-
ASSERT_TRUE(data_response.IsSuccessful())
256-
<< PrintError(data_response.GetError());
245+
EXPECT_SUCCESS(data_response);
257246
ASSERT_LT(0, data_response.GetResult()->size());
258247
std::string data_string(data_response.GetResult()->begin(),
259248
data_response.GetResult()->end());
@@ -311,8 +300,7 @@ TEST_P(CatalogClientTest, GetDataWithPartitionId) {
311300
return future.GetFuture().get();
312301
});
313302

314-
ASSERT_TRUE(data_response.IsSuccessful())
315-
<< PrintError(data_response.GetError());
303+
EXPECT_SUCCESS(data_response);
316304
ASSERT_LT(0, data_response.GetResult()->size());
317305
std::string data_string(data_response.GetResult()->begin(),
318306
data_response.GetResult()->end());
@@ -333,8 +321,7 @@ TEST_P(CatalogClientTest, GetDataWithPartitionIdVersion2) {
333321
return future.GetFuture().get();
334322
});
335323

336-
ASSERT_TRUE(data_response.IsSuccessful())
337-
<< PrintError(data_response.GetError());
324+
EXPECT_SUCCESS(data_response);
338325
ASSERT_LT(0, data_response.GetResult()->size());
339326
std::string data_string(data_response.GetResult()->begin(),
340327
data_response.GetResult()->end());
@@ -386,8 +373,7 @@ TEST_P(CatalogClientTest, GetPartitionsVersion2) {
386373
return future.GetFuture().get();
387374
});
388375

389-
ASSERT_TRUE(partitions_response.IsSuccessful())
390-
<< PrintError(partitions_response.GetError());
376+
EXPECT_SUCCESS(partitions_response);
391377
ASSERT_LT(0, partitions_response.GetResult().GetPartitions().size());
392378
}
393379

@@ -437,8 +423,7 @@ TEST_P(CatalogClientTest, GetDataWithNonExistentPartitionId) {
437423
return future.GetFuture().get();
438424
});
439425

440-
ASSERT_TRUE(data_response.IsSuccessful())
441-
<< PrintError(data_response.GetError());
426+
EXPECT_SUCCESS(data_response);
442427
ASSERT_FALSE(data_response.GetResult());
443428
}
444429

@@ -475,8 +460,7 @@ TEST_P(CatalogClientTest, GetDataWithInlineField) {
475460
return future.GetFuture().get();
476461
});
477462

478-
ASSERT_TRUE(data_response.IsSuccessful())
479-
<< PrintError(data_response.GetError());
463+
EXPECT_SUCCESS(data_response);
480464
ASSERT_LT(0, data_response.GetResult()->size());
481465
std::string data_string(data_response.GetResult()->begin(),
482466
data_response.GetResult()->end());
@@ -497,8 +481,7 @@ TEST_P(CatalogClientTest, GetDataWithEmptyField) {
497481
return future.GetFuture().get();
498482
});
499483

500-
ASSERT_TRUE(data_response.IsSuccessful())
501-
<< PrintError(data_response.GetError());
484+
EXPECT_SUCCESS(data_response);
502485
ASSERT_FALSE(data_response.GetResult());
503486
}
504487

@@ -516,8 +499,7 @@ TEST_P(CatalogClientTest, GetDataCompressed) {
516499
return future.GetFuture().get();
517500
});
518501

519-
ASSERT_TRUE(data_response.IsSuccessful())
520-
<< PrintError(data_response.GetError());
502+
EXPECT_SUCCESS(data_response);
521503
ASSERT_LT(0u, data_response.GetResult()->size());
522504

523505
auto request_compressed = olp::dataservice::read::DataRequest();
@@ -529,8 +511,7 @@ TEST_P(CatalogClientTest, GetDataCompressed) {
529511
return future.GetFuture().get();
530512
});
531513

532-
ASSERT_TRUE(data_response_compressed.IsSuccessful())
533-
<< PrintError(data_response_compressed.GetError());
514+
EXPECT_SUCCESS(data_response_compressed);
534515
ASSERT_LT(0u, data_response_compressed.GetResult()->size());
535516
ASSERT_EQ(data_response.GetResult()->size(),
536517
data_response_compressed.GetResult()->size());
@@ -576,8 +557,7 @@ TEST_P(CatalogClientTest, Prefetch) {
576557

577558
auto data_response = future.GetFuture().get();
578559

579-
ASSERT_TRUE(data_response.IsSuccessful())
580-
<< PrintError(data_response.GetError());
560+
EXPECT_SUCCESS(data_response);
581561
ASSERT_LT(0, data_response.GetResult()->size());
582562
}
583563
// The parent of 5904591 should be fetched too
@@ -590,8 +570,7 @@ TEST_P(CatalogClientTest, Prefetch) {
590570

591571
auto data_response = future.GetFuture().get();
592572

593-
ASSERT_TRUE(data_response.IsSuccessful())
594-
<< PrintError(data_response.GetError());
573+
EXPECT_SUCCESS(data_response);
595574
ASSERT_LT(0, data_response.GetResult()->size());
596575
}
597576
}

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <olp/core/porting/make_unique.h>
3131
#include <olp/dataservice/read/VersionedLayerClient.h>
3232
#include <testutils/CustomParameters.hpp>
33+
#include "Utils.h"
3334

3435
using namespace olp::dataservice::read;
3536
using namespace testing;
@@ -104,7 +105,7 @@ TEST_F(DataserviceReadVersionedLayerClientTest, GetDataFromPartitionAsync) {
104105
ASSERT_NE(future.wait_for(kWaitTimeout), std::future_status::timeout);
105106
VersionedLayerClient::CallbackResponse response = future.get();
106107

107-
ASSERT_TRUE(response.IsSuccessful()) << response.GetError().GetMessage();
108+
EXPECT_SUCCESS(response);
108109
ASSERT_TRUE(response.GetResult() != nullptr);
109110
ASSERT_NE(response.GetResult()->size(), 0u);
110111
}
@@ -138,7 +139,7 @@ TEST_F(DataserviceReadVersionedLayerClientTest,
138139
ASSERT_NE(future.wait_for(kWaitTimeout), std::future_status::timeout);
139140
VersionedLayerClient::CallbackResponse response = future.get();
140141

141-
ASSERT_TRUE(response.IsSuccessful()) << response.GetError().GetMessage();
142+
EXPECT_SUCCESS(response);
142143
ASSERT_TRUE(response.GetResult() != nullptr);
143144
ASSERT_NE(response.GetResult()->size(), 0u);
144145
}
@@ -165,7 +166,7 @@ TEST_F(DataserviceReadVersionedLayerClientTest, GetDataFromPartitionSync) {
165166
[&response](VersionedLayerClient::CallbackResponse resp) {
166167
response = std::move(resp);
167168
});
168-
ASSERT_TRUE(response.IsSuccessful());
169+
EXPECT_SUCCESS(response);
169170
ASSERT_TRUE(response.GetResult() != nullptr);
170171
ASSERT_NE(response.GetResult()->size(), 0u);
171172
}
@@ -203,13 +204,13 @@ TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
203204

204205
ASSERT_NE(future.wait_for(kWaitTimeout), std::future_status::timeout);
205206
VersionedLayerClient::PrefetchTilesResponse response = future.get();
206-
ASSERT_TRUE(response.IsSuccessful()) << response.GetError().GetMessage();
207+
EXPECT_SUCCESS(response);
207208
ASSERT_FALSE(response.GetResult().empty());
208209

209210
const auto& result = response.GetResult();
210211

211212
for (auto tile_result : result) {
212-
ASSERT_TRUE(tile_result->IsSuccessful());
213+
EXPECT_SUCCESS(*tile_result);
213214
ASSERT_TRUE(tile_result->tile_key_.IsValid());
214215
}
215216

@@ -226,7 +227,7 @@ TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
226227
[&response](VersionedLayerClient::CallbackResponse resp) {
227228
response = std::move(resp);
228229
});
229-
ASSERT_TRUE(response.IsSuccessful());
230+
EXPECT_SUCCESS(response);
230231
ASSERT_TRUE(response.GetResult() != nullptr);
231232
ASSERT_NE(response.GetResult()->size(), 0u);
232233
}
@@ -243,7 +244,7 @@ TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
243244
[&response](VersionedLayerClient::CallbackResponse resp) {
244245
response = std::move(resp);
245246
});
246-
ASSERT_TRUE(response.IsSuccessful());
247+
EXPECT_SUCCESS(response);
247248
ASSERT_TRUE(response.GetResult() != nullptr);
248249
ASSERT_NE(response.GetResult()->size(), 0u);
249250
}
@@ -260,7 +261,7 @@ TEST_F(DataserviceReadVersionedLayerClientTest, Prefetch) {
260261
[&response](VersionedLayerClient::CallbackResponse resp) {
261262
response = std::move(resp);
262263
});
263-
ASSERT_TRUE(response.IsSuccessful());
264+
EXPECT_SUCCESS(response);
264265
ASSERT_TRUE(response.GetResult() != nullptr);
265266
ASSERT_NE(response.GetResult()->size(), 0u);
266267
}

‎tests/functional/utils/Utils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ std::string ErrorMessage(const olp::client::ApiError& error) {
3434
}
3535

3636
#define EXPECT_SUCCESS(response) \
37-
EXPECT_TRUE(response.IsSuccessful()) << ErrorMessage(response.GetError());
37+
EXPECT_TRUE((response).IsSuccessful()) << ErrorMessage((response).GetError());
3838

3939
} // namespace

0 commit comments

Comments
 (0)