Skip to content

Commit 3237497

Browse files
asfernandesasfernandes
committed
Keep client creation out of test discovery
1 parent a246760 commit 3237497

18 files changed

Lines changed: 370 additions & 345 deletions

‎src/test/Attachment.cpp‎

Lines changed: 44 additions & 44 deletions
Large diffs are not rendered by default.

‎src/test/AttachmentPool.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_SUITE(AttachmentPoolSuite)
3838
BOOST_AUTO_TEST_CASE(lifecycleAndCounts)
3939
{
4040
const auto database = getTempFile("AttachmentPool-lifecycleAndCounts.fdb");
41-
Attachment setup{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
41+
Attachment setup{getClient(), database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
4242
FbDropDatabase setupDrop{setup};
4343

4444
{ // scope
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(lifecycleAndCounts)
5050
AttachmentPoolOptions options;
5151
options.setAttachmentOptions(AttachmentOptions().setConnectionCharSet("UTF8")).setMinSize(2u).setMaxSize(4u);
5252

53-
AttachmentPool pool{CLIENT, database, options};
53+
AttachmentPool pool{getClient(), database, options};
5454
BOOST_CHECK_EQUAL(pool.size(), 2u);
5555
BOOST_CHECK_EQUAL(pool.availableCount(), 2u);
5656
BOOST_CHECK_EQUAL(pool.inUseCount(), 0u);
@@ -76,10 +76,10 @@ BOOST_AUTO_TEST_CASE(lifecycleAndCounts)
7676
BOOST_AUTO_TEST_CASE(acquireReusesUnderlyingConnection)
7777
{
7878
const auto database = getTempFile("AttachmentPool-acquireReusesUnderlyingConnection.fdb");
79-
Attachment setup{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
79+
Attachment setup{getClient(), database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
8080
FbDropDatabase setupDrop{setup};
8181

82-
AttachmentPool pool{CLIENT, database, AttachmentPoolOptions().setMinSize(1u).setMaxSize(1u)};
82+
AttachmentPool pool{getClient(), database, AttachmentPoolOptions().setMinSize(1u).setMaxSize(1u)};
8383

8484
fb::IAttachment* firstHandle = nullptr;
8585

@@ -99,11 +99,11 @@ BOOST_AUTO_TEST_CASE(acquireReusesUnderlyingConnection)
9999
BOOST_AUTO_TEST_CASE(acquireThrowsWhenExhaustedAndUnblocksOnRelease)
100100
{
101101
const auto database = getTempFile("AttachmentPool-acquireThrowsWhenExhaustedAndUnblocksOnRelease.fdb");
102-
Attachment setup{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
102+
Attachment setup{getClient(), database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
103103
FbDropDatabase setupDrop{setup};
104104

105105
AttachmentPool pool{
106-
CLIENT, database, AttachmentPoolOptions().setMinSize(0u).setMaxSize(1u).setAcquireTimeout(200ms)};
106+
getClient(), database, AttachmentPoolOptions().setMinSize(0u).setMaxSize(1u).setAcquireTimeout(200ms)};
107107

108108
auto lease1 = pool.acquire();
109109
BOOST_CHECK_EQUAL(pool.inUseCount(), 1u);
@@ -121,10 +121,10 @@ BOOST_AUTO_TEST_CASE(acquireThrowsWhenExhaustedAndUnblocksOnRelease)
121121
BOOST_AUTO_TEST_CASE(leaseSemantics)
122122
{
123123
const auto database = getTempFile("AttachmentPool-leaseSemantics.fdb");
124-
Attachment setup{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
124+
Attachment setup{getClient(), database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
125125
FbDropDatabase setupDrop{setup};
126126

127-
AttachmentPool pool{CLIENT, database, AttachmentPoolOptions().setMinSize(1u).setMaxSize(1u)};
127+
AttachmentPool pool{getClient(), database, AttachmentPoolOptions().setMinSize(1u).setMaxSize(1u)};
128128

129129
auto lease1 = pool.acquire();
130130
BOOST_CHECK(lease1.isValid());
@@ -145,11 +145,11 @@ BOOST_AUTO_TEST_CASE(leaseSemantics)
145145
BOOST_AUTO_TEST_CASE(sessionResetOnRelease)
146146
{
147147
const auto database = getTempFile("AttachmentPool-sessionResetOnRelease.fdb");
148-
Attachment setup{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
148+
Attachment setup{getClient(), database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
149149
FbDropDatabase setupDrop{setup};
150150

151151
AttachmentPool pool{
152-
CLIENT, database, AttachmentPoolOptions().setMinSize(1u).setMaxSize(1u).setSessionResetOnRelease(true)};
152+
getClient(), database, AttachmentPoolOptions().setMinSize(1u).setMaxSize(1u).setSessionResetOnRelease(true)};
153153

154154
fb::IAttachment* firstHandle = nullptr;
155155

‎src/test/BackupManager.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(restoreOptionsRejectLengthAfterItemWithoutLength)
140140

141141
BOOST_AUTO_TEST_CASE(serviceManagerDisconnectAndMove)
142142
{
143-
ServiceManager manager1{CLIENT, makeServiceManagerOptions()};
143+
ServiceManager manager1{getClient(), makeServiceManagerOptions()};
144144
BOOST_CHECK(manager1.isValid());
145145

146146
auto manager2 = std::move(manager1);
@@ -163,7 +163,7 @@ BOOST_DATA_TEST_CASE(backupAndRestoreRoundTrip, data::make(BACKUP_RESTORE_VERBOS
163163

164164
{ // scope
165165
Attachment attachment{
166-
CLIENT, sourceDatabaseUri, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
166+
getClient(), sourceDatabaseUri, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
167167

168168
Transaction transaction{attachment};
169169

@@ -177,7 +177,7 @@ BOOST_DATA_TEST_CASE(backupAndRestoreRoundTrip, data::make(BACKUP_RESTORE_VERBOS
177177
transaction.commit();
178178
}
179179

180-
BackupManager manager{CLIENT, makeServiceManagerOptions()};
180+
BackupManager manager{getClient(), makeServiceManagerOptions()};
181181
std::vector<std::string> backupVerboseLines;
182182
auto backupOptions = BackupOptions().setDatabase(sourceDatabasePath).setBackupFile(backupFile);
183183

@@ -196,7 +196,7 @@ BOOST_DATA_TEST_CASE(backupAndRestoreRoundTrip, data::make(BACKUP_RESTORE_VERBOS
196196
manager.restore(restoreOptions);
197197
BOOST_CHECK_EQUAL(!restoreVerboseLines.empty(), testCase.restoreVerbose);
198198

199-
Attachment restored{CLIENT, restoredDatabaseUri, attachmentOptions};
199+
Attachment restored{getClient(), restoredDatabaseUri, attachmentOptions};
200200
FbDropDatabase restoredDrop{restored};
201201
Transaction transaction{restored};
202202
Statement query{restored, transaction, "select id, name from test"};
@@ -205,7 +205,7 @@ BOOST_DATA_TEST_CASE(backupAndRestoreRoundTrip, data::make(BACKUP_RESTORE_VERBOS
205205
BOOST_CHECK_EQUAL(query.getString(1).value(), "backup");
206206
transaction.commit();
207207

208-
Attachment cleanup{CLIENT, sourceDatabaseUri, attachmentOptions};
208+
Attachment cleanup{getClient(), sourceDatabaseUri, attachmentOptions};
209209
cleanup.dropDatabase();
210210
}
211211

@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(restoreReplace)
220220

221221
{ // scope
222222
Attachment attachment{
223-
CLIENT, sourceDatabaseUri, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
223+
getClient(), sourceDatabaseUri, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
224224

225225
Transaction transaction{attachment};
226226

@@ -233,20 +233,20 @@ BOOST_AUTO_TEST_CASE(restoreReplace)
233233
transaction.commit();
234234
}
235235

236-
BackupManager manager{CLIENT, makeServiceManagerOptions()};
236+
BackupManager manager{getClient(), makeServiceManagerOptions()};
237237
manager.backup(BackupOptions().setDatabase(sourceDatabasePath).setBackupFile(backupFile));
238238
manager.restore(RestoreOptions().setDatabase(restoredDatabasePath).setBackupFile(backupFile));
239239
manager.restore(RestoreOptions().setDatabase(restoredDatabasePath).setBackupFile(backupFile).setReplace(true));
240240

241-
Attachment restored{CLIENT, restoredDatabaseUri, attachmentOptions};
241+
Attachment restored{getClient(), restoredDatabaseUri, attachmentOptions};
242242
FbDropDatabase restoredDrop{restored};
243243
Transaction transaction{restored};
244244
Statement query{restored, transaction, "select id from test"};
245245
BOOST_REQUIRE(query.execute(transaction));
246246
BOOST_CHECK_EQUAL(query.getInt32(0).value(), 7);
247247
transaction.commit();
248248

249-
Attachment cleanup{CLIENT, sourceDatabaseUri, attachmentOptions};
249+
Attachment cleanup{getClient(), sourceDatabaseUri, attachmentOptions};
250250
cleanup.dropDatabase();
251251
}
252252

@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE(multiFileDatabaseAndBackupRoundTrip)
264264

265265
{ // scope
266266
Attachment attachment{
267-
CLIENT, sourceDatabaseUri, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
267+
getClient(), sourceDatabaseUri, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
268268

269269
Transaction transaction{attachment};
270270

@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE(multiFileDatabaseAndBackupRoundTrip)
295295
transaction.commit();
296296
}
297297

298-
BackupManager manager{CLIENT, makeServiceManagerOptions()};
298+
BackupManager manager{getClient(), makeServiceManagerOptions()};
299299
manager.backup(
300300
BackupOptions().setDatabase(sourceDatabasePath).addBackupFile(backupFile1, 2048).addBackupFile(backupFile2));
301301

@@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE(multiFileDatabaseAndBackupRoundTrip)
305305
.addBackupFile(backupFile1)
306306
.addBackupFile(backupFile2));
307307

308-
Attachment restored{CLIENT, restoredDatabaseUri, attachmentOptions};
308+
Attachment restored{getClient(), restoredDatabaseUri, attachmentOptions};
309309
FbDropDatabase restoredDrop{restored};
310310
Transaction transaction{restored};
311311
Statement query{restored, transaction, "select count(*), min(id), max(id) from test"};
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(multiFileDatabaseAndBackupRoundTrip)
321321
BOOST_CHECK_EQUAL(normalizedFilename(queryFiles.getString(1).value()), normalizedFilename(restoredSecondaryPath));
322322
transaction.commit();
323323

324-
Attachment cleanup{CLIENT, sourceDatabaseUri, attachmentOptions};
324+
Attachment cleanup{getClient(), sourceDatabaseUri, attachmentOptions};
325325
cleanup.dropDatabase();
326326
}
327327

‎src/test/Batch.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(constructorFromStatementAndExecute)
3838
{
3939
const auto database = getTempFile("Batch-constructorFromStatementAndExecute.fdb");
4040

41-
Attachment attachment{CLIENT, database,
41+
Attachment attachment{getClient(), database,
4242
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
4343
FbDropDatabase attachmentDrop{attachment};
4444

@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE(constructorFromAttachmentAndExecute)
104104
{
105105
const auto database = getTempFile("Batch-constructorFromAttachmentAndExecute.fdb");
106106

107-
Attachment attachment{CLIENT, database,
107+
Attachment attachment{getClient(), database,
108108
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
109109
FbDropDatabase attachmentDrop{attachment};
110110

@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE(constructorFromAttachmentAndExecute)
124124
// Get metadata to build raw messages.
125125
auto metadata = batch.getInputMetadata();
126126

127-
impl::StatusWrapper tempWrapper{CLIENT};
127+
impl::StatusWrapper tempWrapper{getClient()};
128128
const auto msgLength = metadata->getMessageLength(&tempWrapper);
129129
const auto idOffset = metadata->getOffset(&tempWrapper, 0);
130130
const auto idNullOffset = metadata->getNullOffset(&tempWrapper, 0);
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(moveConstructorTransfersOwnership)
177177
{
178178
const auto database = getTempFile("Batch-moveConstructorTransfersOwnership.fdb");
179179

180-
Attachment attachment{CLIENT, database,
180+
Attachment attachment{getClient(), database,
181181
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
182182
FbDropDatabase attachmentDrop{attachment};
183183

@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE(executeReportsNoInfoWhenRecordCountsDisabled)
213213
{
214214
const auto database = getTempFile("Batch-noInfo.fdb");
215215

216-
Attachment attachment{CLIENT, database,
216+
Attachment attachment{getClient(), database,
217217
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
218218
FbDropDatabase attachmentDrop{attachment};
219219

@@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE(executeWithBadDataReportsExecuteFailed)
246246
{
247247
const auto database = getTempFile("Batch-badData.fdb");
248248

249-
Attachment attachment{CLIENT, database,
249+
Attachment attachment{getClient(), database,
250250
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
251251
FbDropDatabase attachmentDrop{attachment};
252252

@@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE(cancelDiscardsMessages)
305305
{
306306
const auto database = getTempFile("Batch-cancelDiscardsMessages.fdb");
307307

308-
Attachment attachment{CLIENT, database,
308+
Attachment attachment{getClient(), database,
309309
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
310310
FbDropDatabase attachmentDrop{attachment};
311311

@@ -345,7 +345,7 @@ BOOST_AUTO_TEST_CASE(blobWithIdEngine)
345345
{
346346
const auto database = getTempFile("Batch-blobWithIdEngine.fdb");
347347

348-
Attachment attachment{CLIENT, database,
348+
Attachment attachment{getClient(), database,
349349
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
350350
FbDropDatabase attachmentDrop{attachment};
351351

@@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE(registerExistingBlob)
403403
{
404404
const auto database = getTempFile("Batch-registerExistingBlob.fdb");
405405

406-
Attachment attachment{CLIENT, database,
406+
Attachment attachment{getClient(), database,
407407
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
408408
FbDropDatabase attachmentDrop{attachment};
409409

@@ -466,7 +466,7 @@ BOOST_AUTO_TEST_CASE(closeReleasesHandle)
466466
{
467467
const auto database = getTempFile("Batch-closeReleasesHandle.fdb");
468468

469-
Attachment attachment{CLIENT, database,
469+
Attachment attachment{getClient(), database,
470470
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
471471
FbDropDatabase attachmentDrop{attachment};
472472

‎src/test/Blob.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(readWriteMultiSegment)
4040
{
4141
const auto database = getTempFile("Blob-readWriteMultiSegment.fdb");
4242

43-
Attachment attachment{CLIENT, database,
43+
Attachment attachment{getClient(), database,
4444
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
4545
FbDropDatabase attachmentDrop{attachment};
4646

@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE(createWriteRead)
122122
{
123123
const auto database = getTempFile("Blob-createWriteRead.fdb");
124124

125-
Attachment attachment{CLIENT, database,
125+
Attachment attachment{getClient(), database,
126126
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
127127
FbDropDatabase attachmentDrop{attachment};
128128

@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(cancelDiscardsHandle)
215215
{
216216
const auto database = getTempFile("Blob-cancelDiscardsHandle.fdb");
217217

218-
Attachment attachment{CLIENT, database,
218+
Attachment attachment{getClient(), database,
219219
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
220220
FbDropDatabase attachmentDrop{attachment};
221221

‎src/test/CalendarConverter.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static const std::initializer_list<DateCase> DATE_CASES{
109109

110110
BOOST_DATA_TEST_CASE(dateConversion, data::make(DATE_CASES), dateCase)
111111
{
112-
impl::CalendarConverter converter{CLIENT};
112+
impl::CalendarConverter converter{getClient()};
113113

114114
const auto& date = dateCase.date;
115115
const std::string outputText{dateCase.outputText};
@@ -135,7 +135,7 @@ static const std::initializer_list<TimeCase> TIME_CASES{
135135

136136
BOOST_DATA_TEST_CASE(timeConversion, data::make(TIME_CASES), timeCase)
137137
{
138-
impl::CalendarConverter converter{CLIENT};
138+
impl::CalendarConverter converter{getClient()};
139139

140140
const Time time{timeCase.time};
141141
const std::string outputText{timeCase.outputText};
@@ -162,7 +162,7 @@ static const std::initializer_list<TimestampCase> TIMESTAMP_CASES{
162162

163163
BOOST_DATA_TEST_CASE(timestampConversion, data::make(TIMESTAMP_CASES), timestampCase)
164164
{
165-
impl::CalendarConverter converter{CLIENT};
165+
impl::CalendarConverter converter{getClient()};
166166

167167
const auto timestamp = timestampCase.timestamp;
168168
const std::string outputText{timestampCase.outputText};
@@ -189,9 +189,9 @@ static const std::initializer_list<TimeTzCase> TIME_TZ_CASES{
189189

190190
BOOST_DATA_TEST_CASE(timeTzConversion, data::make(TIME_TZ_CASES), timeTzCase)
191191
{
192-
impl::StatusWrapper statusWrapper{CLIENT};
192+
impl::StatusWrapper statusWrapper{getClient()};
193193

194-
impl::CalendarConverter converter{CLIENT};
194+
impl::CalendarConverter converter{getClient()};
195195

196196
const TimeTz& timeTz = timeTzCase.timeTz;
197197
const std::string outputText{timeTzCase.outputText};
@@ -217,9 +217,9 @@ static const std::initializer_list<TimeTzOffsetCase> TIME_TZ_OFFSET_CASES{
217217

218218
BOOST_DATA_TEST_CASE(timeTzOffsetConversion, data::make(TIME_TZ_OFFSET_CASES), timeTzOffsetCase)
219219
{
220-
impl::StatusWrapper statusWrapper{CLIENT};
220+
impl::StatusWrapper statusWrapper{getClient()};
221221

222-
impl::CalendarConverter converter{CLIENT};
222+
impl::CalendarConverter converter{getClient()};
223223

224224
const std::string outputText{timeTzOffsetCase.outputText};
225225
const std::string inputText{timeTzOffsetCase.inputText.value_or(outputText)};
@@ -241,9 +241,9 @@ static const std::initializer_list<TimestampTzCase> TIMESTAMP_TZ_CASES{
241241

242242
BOOST_DATA_TEST_CASE(timestampTzConversion, data::make(TIMESTAMP_TZ_CASES), timestampTzCase)
243243
{
244-
impl::StatusWrapper statusWrapper{CLIENT};
244+
impl::StatusWrapper statusWrapper{getClient()};
245245

246-
impl::CalendarConverter converter{CLIENT};
246+
impl::CalendarConverter converter{getClient()};
247247

248248
const TimestampTz& timestampTz = timestampTzCase.timestampTz;
249249
const std::string outputText{timestampTzCase.outputText};
@@ -269,9 +269,9 @@ static const std::initializer_list<TimestampTzOffsetCase> TIMESTAMP_TZ_OFFSET_CA
269269

270270
BOOST_DATA_TEST_CASE(timestampTzOffsetConversion, data::make(TIMESTAMP_TZ_OFFSET_CASES), timestampTzOffsetCase)
271271
{
272-
impl::StatusWrapper statusWrapper{CLIENT};
272+
impl::StatusWrapper statusWrapper{getClient()};
273273

274-
impl::CalendarConverter converter{CLIENT};
274+
impl::CalendarConverter converter{getClient()};
275275

276276
const std::string outputText{timestampTzOffsetCase.outputText};
277277
const std::string inputText{timestampTzOffsetCase.inputText.value_or(outputText)};

‎src/test/Client.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ BOOST_AUTO_TEST_SUITE(ClientSuite)
2929

3030
BOOST_AUTO_TEST_CASE(getMaster)
3131
{
32-
const auto master = CLIENT.getMaster();
32+
const auto master = getClient().getMaster();
3333
BOOST_CHECK(master);
3434
}
3535

3636
BOOST_AUTO_TEST_CASE(isNotValidAfterMove)
3737
{
38-
Client client1{CLIENT.getMaster()};
38+
Client client1{getClient().getMaster()};
3939
BOOST_CHECK_EQUAL(client1.isValid(), true);
4040

4141
auto client2 = std::move(client1);

0 commit comments

Comments
 (0)