Skip to content

Commit 0e6bf1a

Browse files
mykhailo-kuchmamykhailo-kuchma
committed
Add a test macro.
Adapt dataservice-write functional tests Resolves: OLPEDGE-966 Signed-off-by: Mykhailo Kuchma <[email protected]>
1 parent 6863df6 commit 0e6bf1a

File tree

7 files changed

+107
-59
lines changed

7 files changed

+107
-59
lines changed

‎tests/functional/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ set(OLP_SDK_FUNCTIONAL_TESTS_HEADERS
4242
./olp-cpp-sdk-authentication/AuthenticationCommonTestFixture.h
4343
./olp-cpp-sdk-authentication/AuthenticationTestUtils.h
4444
./olp-cpp-sdk-authentication/TestConstants.h
45+
./utils/Utils.h
4546
)
4647

4748
if (ANDROID OR IOS)
@@ -51,6 +52,7 @@ if (ANDROID OR IOS)
5152
target_include_directories(olp-cpp-sdk-functional-lib
5253
PRIVATE
5354
${PROJECT_SOURCE_DIR}/olp-cpp-sdk-dataservice-read/src
55+
utils
5456
)
5557
target_link_libraries(olp-cpp-sdk-functional-tests-lib
5658
PRIVATE
@@ -84,7 +86,8 @@ else()
8486
target_include_directories(olp-cpp-sdk-functional-tests
8587
PRIVATE
8688
${PROJECT_SOURCE_DIR}/olp-cpp-sdk-dataservice-read/src
87-
)
89+
utils
90+
)
8891
target_link_libraries(olp-cpp-sdk-functional-tests
8992
PRIVATE
9093
custom-params

‎tests/functional/olp-cpp-sdk-dataservice-write/DataserviceWriteIndexLayerClientTest.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <olp/dataservice/write/IndexLayerClient.h>
2727
#include <olp/dataservice/write/model/PublishIndexRequest.h>
2828
#include <testutils/CustomParameters.hpp>
29+
#include "Utils.h"
2930

3031
namespace {
3132

@@ -42,7 +43,7 @@ void PublishDataSuccessAssertions(
4243
const olp::client::ApiResponse<
4344
olp::dataservice::write::model::ResponseOkSingle,
4445
olp::client::ApiError>& result) {
45-
EXPECT_TRUE(result.IsSuccessful());
46+
EXPECT_SUCCESS(result);
4647
EXPECT_FALSE(result.GetResult().GetTraceID().empty());
4748
EXPECT_EQ("", result.GetError().GetMessage());
4849
}
@@ -179,7 +180,7 @@ TEST_F(DataserviceWriteIndexLayerClientTest, DeleteData) {
179180
.GetFuture()
180181
.get();
181182

182-
ASSERT_TRUE(delete_index_response.IsSuccessful());
183+
EXPECT_SUCCESS(delete_index_response);
183184
}
184185

185186
TEST_F(DataserviceWriteIndexLayerClientTest, PublishDataAsync) {
@@ -221,7 +222,7 @@ TEST_F(DataserviceWriteIndexLayerClientTest, UpdateIndex) {
221222
.GetFuture()
222223
.get();
223224

224-
EXPECT_TRUE(response.IsSuccessful());
225+
EXPECT_SUCCESS(response);
225226
EXPECT_EQ("", response.GetError().GetMessage());
226227
}
227228

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <olp/dataservice/write/model/PublishSdiiRequest.h>
4040
#include <testutils/CustomParameters.hpp>
4141
#include "testables/FlushEventListenerTestable.h"
42+
#include "Utils.h"
4243

4344
using namespace olp::dataservice::write;
4445
using namespace olp::dataservice::write::model;
@@ -79,7 +80,7 @@ std::string GenerateRandomUUID() {
7980
void PublishDataSuccessAssertions(
8081
const olp::client::ApiResponse<ResponseOkSingle, olp::client::ApiError>&
8182
result) {
82-
EXPECT_TRUE(result.IsSuccessful());
83+
EXPECT_SUCCESS(result);
8384
EXPECT_FALSE(result.GetResult().GetTraceID().empty());
8485
}
8586

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <olp/dataservice/write/model/PublishDataRequest.h>
3939
#include <olp/dataservice/write/model/PublishSdiiRequest.h>
4040
#include <testutils/CustomParameters.hpp>
41+
#include "Utils.h"
4142

4243
using namespace olp::dataservice::write;
4344
using namespace olp::dataservice::write::model;
@@ -97,13 +98,13 @@ std::string GenerateRandomUUID() {
9798
void PublishDataSuccessAssertions(
9899
const olp::client::ApiResponse<ResponseOkSingle, olp::client::ApiError>&
99100
result) {
100-
EXPECT_TRUE(result.IsSuccessful());
101+
EXPECT_SUCCESS(result);
101102
EXPECT_FALSE(result.GetResult().GetTraceID().empty());
102103
}
103104

104105
void PublishSdiiSuccessAssertions(
105106
const olp::client::ApiResponse<ResponseOk, olp::client::ApiError>& result) {
106-
EXPECT_TRUE(result.IsSuccessful());
107+
EXPECT_SUCCESS(result);
107108
EXPECT_FALSE(result.GetResult().GetTraceID().GetParentID().empty());
108109
ASSERT_FALSE(result.GetResult().GetTraceID().GetGeneratedIDs().empty());
109110
EXPECT_FALSE(result.GetResult().GetTraceID().GetGeneratedIDs().at(0).empty());

‎tests/functional/olp-cpp-sdk-dataservice-write/DataserviceWriteVersionedLayerClientTest.cpp‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <olp/dataservice/write/VersionedLayerClient.h>
2626
#include <olp/dataservice/write/model/StartBatchRequest.h>
2727
#include <testutils/CustomParameters.hpp>
28+
#include "Utils.h"
2829

2930
namespace {
3031

@@ -122,14 +123,14 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, StartBatch) {
122123
.GetFuture()
123124
.get();
124125

125-
ASSERT_TRUE(response.IsSuccessful());
126+
EXPECT_SUCCESS(response);
126127
ASSERT_TRUE(response.GetResult().GetId());
127128
ASSERT_NE("", response.GetResult().GetId().value());
128129

129130
auto get_batch_response =
130131
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
131132

132-
ASSERT_TRUE(get_batch_response.IsSuccessful());
133+
EXPECT_SUCCESS(get_batch_response);
133134
ASSERT_EQ(response.GetResult().GetId().value(),
134135
get_batch_response.GetResult().GetId().value());
135136
ASSERT_EQ("initialized",
@@ -139,12 +140,12 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, StartBatch) {
139140
versioned_client->CompleteBatch(get_batch_response.GetResult())
140141
.GetFuture()
141142
.get();
142-
ASSERT_TRUE(complete_batch_response.IsSuccessful());
143+
EXPECT_SUCCESS(complete_batch_response);
143144

144145
get_batch_response =
145146
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
146147

147-
ASSERT_TRUE(get_batch_response.IsSuccessful());
148+
EXPECT_SUCCESS(get_batch_response);
148149
ASSERT_EQ(response.GetResult().GetId().value(),
149150
get_batch_response.GetResult().GetId().value());
150151
ASSERT_EQ("submitted",
@@ -154,7 +155,7 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, StartBatch) {
154155
get_batch_response =
155156
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
156157

157-
ASSERT_TRUE(get_batch_response.IsSuccessful());
158+
EXPECT_SUCCESS(get_batch_response);
158159
ASSERT_EQ(response.GetResult().GetId().value(),
159160
get_batch_response.GetResult().GetId().value());
160161
if (get_batch_response.GetResult().GetDetails()->GetState() !=
@@ -184,18 +185,18 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, DeleteClient) {
184185

185186
auto response = fut.get();
186187

187-
ASSERT_TRUE(response.IsSuccessful());
188+
EXPECT_SUCCESS(response);
188189
ASSERT_TRUE(response.GetResult().GetId());
189190
ASSERT_NE("", response.GetResult().GetId().value());
190191

191192
auto cancel_batch_response =
192193
client_->CancelBatch(response.GetResult()).GetFuture().get();
193-
ASSERT_TRUE(cancel_batch_response.IsSuccessful());
194+
EXPECT_SUCCESS(cancel_batch_response);
194195

195196
auto get_batch_response =
196197
client_->GetBatch(response.GetResult()).GetFuture().get();
197198

198-
ASSERT_TRUE(get_batch_response.IsSuccessful());
199+
EXPECT_SUCCESS(get_batch_response);
199200
ASSERT_EQ(response.GetResult().GetId().value(),
200201
get_batch_response.GetResult().GetId().value());
201202
ASSERT_EQ("cancelled",
@@ -206,7 +207,7 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, GetBaseVersion) {
206207
auto versioned_client = CreateVersionedLayerClient();
207208
auto response = versioned_client->GetBaseVersion().GetFuture().get();
208209

209-
ASSERT_TRUE(response.IsSuccessful());
210+
EXPECT_SUCCESS(response);
210211
auto version_response = response.GetResult();
211212
ASSERT_GE(version_response.GetVersion(), 0);
212213
}
@@ -219,14 +220,14 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, CancelBatch) {
219220
.GetFuture()
220221
.get();
221222

222-
ASSERT_TRUE(response.IsSuccessful());
223+
EXPECT_SUCCESS(response);
223224
ASSERT_TRUE(response.GetResult().GetId());
224225
ASSERT_NE("", response.GetResult().GetId().value());
225226

226227
auto get_batch_response =
227228
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
228229

229-
ASSERT_TRUE(get_batch_response.IsSuccessful());
230+
EXPECT_SUCCESS(get_batch_response);
230231
ASSERT_EQ(response.GetResult().GetId().value(),
231232
get_batch_response.GetResult().GetId().value());
232233
ASSERT_EQ("initialized",
@@ -236,12 +237,12 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, CancelBatch) {
236237
versioned_client->CancelBatch(get_batch_response.GetResult())
237238
.GetFuture()
238239
.get();
239-
ASSERT_TRUE(cancel_batch_response.IsSuccessful());
240+
EXPECT_SUCCESS(cancel_batch_response);
240241

241242
get_batch_response =
242243
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
243244

244-
ASSERT_TRUE(get_batch_response.IsSuccessful());
245+
EXPECT_SUCCESS(get_batch_response);
245246
ASSERT_EQ(response.GetResult().GetId().value(),
246247
get_batch_response.GetResult().GetId().value());
247248
ASSERT_EQ("cancelled",
@@ -271,14 +272,14 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatch) {
271272
.GetFuture()
272273
.get();
273274

274-
ASSERT_TRUE(response.IsSuccessful());
275+
EXPECT_SUCCESS(response);
275276
ASSERT_TRUE(response.GetResult().GetId());
276277
ASSERT_NE("", response.GetResult().GetId().value());
277278

278279
auto get_batch_response =
279280
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
280281

281-
ASSERT_TRUE(get_batch_response.IsSuccessful());
282+
EXPECT_SUCCESS(get_batch_response);
282283
ASSERT_EQ(response.GetResult().GetId().value(),
283284
get_batch_response.GetResult().GetId().value());
284285
ASSERT_EQ("initialized",
@@ -296,21 +297,21 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatch) {
296297
.GetFuture()
297298
.get();
298299

299-
ASSERT_TRUE(publish_to_batch_response.IsSuccessful());
300+
EXPECT_SUCCESS(publish_to_batch_response);
300301
ASSERT_EQ("1111", publish_to_batch_response.GetResult().GetTraceID());
301302

302303
auto complete_batch_response =
303304
versioned_client->CompleteBatch(get_batch_response.GetResult())
304305
.GetFuture()
305306
.get();
306307

307-
ASSERT_TRUE(complete_batch_response.IsSuccessful());
308+
EXPECT_SUCCESS(complete_batch_response);
308309

309310
for (int i = 0; i < 100; ++i) {
310311
get_batch_response =
311312
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
312313

313-
ASSERT_TRUE(get_batch_response.IsSuccessful());
314+
EXPECT_SUCCESS(get_batch_response);
314315
ASSERT_EQ(response.GetResult().GetId().value(),
315316
get_batch_response.GetResult().GetId().value());
316317
if (get_batch_response.GetResult().GetDetails()->GetState() !=
@@ -338,14 +339,14 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchDeleteClient) {
338339
.GetFuture()
339340
.get();
340341

341-
ASSERT_TRUE(response.IsSuccessful());
342+
EXPECT_SUCCESS(response);
342343
ASSERT_TRUE(response.GetResult().GetId());
343344
ASSERT_NE("", response.GetResult().GetId().value());
344345

345346
auto get_batch_response =
346347
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
347348

348-
ASSERT_TRUE(get_batch_response.IsSuccessful());
349+
EXPECT_SUCCESS(get_batch_response);
349350
ASSERT_EQ(response.GetResult().GetId().value(),
350351
get_batch_response.GetResult().GetId().value());
351352
ASSERT_EQ("initialized",
@@ -378,9 +379,9 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchDeleteClient) {
378379
auto publish_to_batch_response = publish_to_batch_future.get();
379380
auto publish_to_batch_response2 = publish_to_batch_future2.get();
380381

381-
ASSERT_TRUE(publish_to_batch_response.IsSuccessful());
382+
EXPECT_SUCCESS(publish_to_batch_response);
382383
ASSERT_EQ("1111", publish_to_batch_response.GetResult().GetTraceID());
383-
ASSERT_TRUE(publish_to_batch_response2.IsSuccessful());
384+
EXPECT_SUCCESS(publish_to_batch_response2);
384385
ASSERT_EQ("1112", publish_to_batch_response2.GetResult().GetTraceID());
385386

386387
versioned_client = CreateVersionedLayerClient();
@@ -390,13 +391,13 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchDeleteClient) {
390391
.GetFuture()
391392
.get();
392393

393-
ASSERT_TRUE(complete_batch_response.IsSuccessful());
394+
EXPECT_SUCCESS(complete_batch_response);
394395

395396
for (int i = 0; i < 100; ++i) {
396397
get_batch_response =
397398
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
398399

399-
ASSERT_TRUE(get_batch_response.IsSuccessful());
400+
EXPECT_SUCCESS(get_batch_response);
400401
ASSERT_EQ(response.GetResult().GetId().value(),
401402
get_batch_response.GetResult().GetId().value());
402403
if (get_batch_response.GetResult().GetDetails()->GetState() !=
@@ -423,14 +424,14 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchMulti) {
423424
.GetFuture()
424425
.get();
425426

426-
ASSERT_TRUE(response.IsSuccessful());
427+
EXPECT_SUCCESS(response);
427428
ASSERT_TRUE(response.GetResult().GetId());
428429
ASSERT_NE("", response.GetResult().GetId().value());
429430

430431
auto get_batch_response =
431432
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
432433

433-
ASSERT_TRUE(get_batch_response.IsSuccessful());
434+
EXPECT_SUCCESS(get_batch_response);
434435
ASSERT_EQ(response.GetResult().GetId().value(),
435436
get_batch_response.GetResult().GetId().value());
436437
ASSERT_EQ("initialized",
@@ -461,23 +462,23 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchMulti) {
461462
auto publish_to_batch_response = publish_to_batch_future.get();
462463
auto publish_to_batch_response2 = publish_to_batch_future2.get();
463464

464-
ASSERT_TRUE(publish_to_batch_response.IsSuccessful());
465+
EXPECT_SUCCESS(publish_to_batch_response);
465466
ASSERT_EQ("1111", publish_to_batch_response.GetResult().GetTraceID());
466-
ASSERT_TRUE(publish_to_batch_response2.IsSuccessful());
467+
EXPECT_SUCCESS(publish_to_batch_response2);
467468
ASSERT_EQ("1112", publish_to_batch_response2.GetResult().GetTraceID());
468469

469470
auto complete_batch_response =
470471
versioned_client->CompleteBatch(get_batch_response.GetResult())
471472
.GetFuture()
472473
.get();
473474

474-
ASSERT_TRUE(complete_batch_response.IsSuccessful());
475+
EXPECT_SUCCESS(complete_batch_response);
475476

476477
for (int i = 0; i < 100; ++i) {
477478
get_batch_response =
478479
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
479480

480-
ASSERT_TRUE(get_batch_response.IsSuccessful());
481+
EXPECT_SUCCESS(get_batch_response);
481482
ASSERT_EQ(response.GetResult().GetId().value(),
482483
get_batch_response.GetResult().GetId().value());
483484
if (get_batch_response.GetResult().GetDetails()->GetState() !=
@@ -505,14 +506,14 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchCancel) {
505506
.GetFuture()
506507
.get();
507508

508-
ASSERT_TRUE(response.IsSuccessful());
509+
EXPECT_SUCCESS(response);
509510
ASSERT_TRUE(response.GetResult().GetId());
510511
ASSERT_NE("", response.GetResult().GetId().value());
511512

512513
auto get_batch_response =
513514
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
514515

515-
ASSERT_TRUE(get_batch_response.IsSuccessful());
516+
EXPECT_SUCCESS(get_batch_response);
516517
ASSERT_EQ(response.GetResult().GetId().value(),
517518
get_batch_response.GetResult().GetId().value());
518519
ASSERT_EQ("initialized",
@@ -540,12 +541,12 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, PublishToBatchCancel) {
540541
versioned_client->CancelBatch(get_batch_response.GetResult())
541542
.GetFuture()
542543
.get();
543-
ASSERT_TRUE(cancel_batch_response.IsSuccessful());
544+
EXPECT_SUCCESS(cancel_batch_response);
544545

545546
get_batch_response =
546547
versioned_client->GetBatch(response.GetResult()).GetFuture().get();
547548

548-
ASSERT_TRUE(get_batch_response.IsSuccessful());
549+
EXPECT_SUCCESS(get_batch_response);
549550
ASSERT_EQ(response.GetResult().GetId().value(),
550551
get_batch_response.GetResult().GetId().value());
551552
ASSERT_EQ("cancelled",
@@ -565,7 +566,7 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, CheckDataExists) {
565566

566567
auto response = fut.get();
567568

568-
ASSERT_TRUE(response.IsSuccessful());
569+
EXPECT_SUCCESS(response);
569570
ASSERT_EQ(response.GetResult(), 200);
570571
}
571572

@@ -582,7 +583,8 @@ TEST_F(DataserviceWriteVersionedLayerClientTest, CheckDataNotExists) {
582583

583584
auto response = fut.get();
584585

585-
ASSERT_TRUE(response.IsSuccessful());
586+
EXPECT_SUCCESS(response);
587+
586588
ASSERT_EQ(response.GetResult(), 404);
587589
}
588590

0 commit comments

Comments
 (0)