Skip to content

Commit f9a4384

Browse files
asfernandesasfernandes
committed
Use FW=OFF in tests
1 parent 306b2a3 commit f9a4384

9 files changed

Lines changed: 272 additions & 250 deletions

File tree

‎src/test/Attachment.cpp‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ BOOST_AUTO_TEST_SUITE(AttachmentSuite)
3535
BOOST_AUTO_TEST_CASE(constructor)
3636
{
3737
const auto database = getTempFile("Attachment-constructor.fdb");
38-
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
38+
Attachment attachment1{CLIENT, database,
39+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
3940
attachment1.disconnect();
4041

4142
Attachment attachment2{CLIENT, database};
@@ -45,7 +46,7 @@ BOOST_AUTO_TEST_CASE(constructor)
4546
BOOST_AUTO_TEST_CASE(disconnect)
4647
{
4748
const auto database = getTempFile("Attachment-disconnect.fdb");
48-
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true)};
49+
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
4950
attachment1.disconnect();
5051

5152
Attachment attachment2{CLIENT, database, AttachmentOptions().setConnectionCharSet("UTF8")};
@@ -55,7 +56,7 @@ BOOST_AUTO_TEST_CASE(disconnect)
5556
BOOST_AUTO_TEST_CASE(dropDatabase)
5657
{
5758
const auto database = getTempFile("Attachment-dropDatabase.fdb");
58-
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true)};
59+
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
5960
attachment1.dropDatabase();
6061

6162
BOOST_CHECK_THROW(Attachment(CLIENT, database), DatabaseException);
@@ -94,7 +95,7 @@ BOOST_AUTO_TEST_CASE(createDatabaseWithForcedWritesOff)
9495
BOOST_AUTO_TEST_CASE(isNotValidAfterMove)
9596
{
9697
const auto database = getTempFile("Attachment-isNotValidAfterMove.fdb");
97-
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true)};
98+
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
9899
BOOST_CHECK_EQUAL(attachment1.isValid(), true);
99100

100101
auto attachment2 = std::move(attachment1);
@@ -108,8 +109,8 @@ BOOST_AUTO_TEST_CASE(moveAssignmentTransfersOwnership)
108109
const auto database1 = getTempFile("Attachment-moveAssign-1.fdb");
109110
const auto database2 = getTempFile("Attachment-moveAssign-2.fdb");
110111

111-
Attachment attachment1{CLIENT, database1, AttachmentOptions().setCreateDatabase(true)};
112-
Attachment attachment2{CLIENT, database2, AttachmentOptions().setCreateDatabase(true)};
112+
Attachment attachment1{CLIENT, database1, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
113+
Attachment attachment2{CLIENT, database2, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
113114
BOOST_CHECK(attachment1.isValid());
114115
BOOST_CHECK(attachment2.isValid());
115116

@@ -131,7 +132,7 @@ BOOST_AUTO_TEST_CASE(moveAssignmentTransfersOwnership)
131132
BOOST_AUTO_TEST_CASE(isNotValidAfterDisconnect)
132133
{
133134
const auto database = getTempFile("Attachment-isNotValidAfterDisconnect.fdb");
134-
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true)};
135+
Attachment attachment1{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
135136
BOOST_CHECK_EQUAL(attachment1.isValid(), true);
136137

137138
attachment1.disconnect();
@@ -143,8 +144,8 @@ BOOST_AUTO_TEST_CASE(isNotValidAfterDisconnect)
143144

144145
BOOST_AUTO_TEST_CASE(isNotValidAfterDropDatabase)
145146
{
146-
Attachment attachment1{
147-
CLIENT, getTempFile("Attachment-isNotValidAfterDropDatabase.fdb"), AttachmentOptions().setCreateDatabase(true)};
147+
Attachment attachment1{CLIENT, getTempFile("Attachment-isNotValidAfterDropDatabase.fdb"),
148+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
148149
BOOST_CHECK_EQUAL(attachment1.isValid(), true);
149150

150151
attachment1.dropDatabase();

‎src/test/Batch.cpp‎

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

41-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
41+
Attachment attachment{CLIENT, database,
42+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
4243
FbDropDatabase attachmentDrop{attachment};
4344

4445
{ // scope
@@ -103,7 +104,8 @@ BOOST_AUTO_TEST_CASE(constructorFromAttachmentAndExecute)
103104
{
104105
const auto database = getTempFile("Batch-constructorFromAttachmentAndExecute.fdb");
105106

106-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
107+
Attachment attachment{CLIENT, database,
108+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
107109
FbDropDatabase attachmentDrop{attachment};
108110

109111
{ // scope
@@ -176,7 +178,8 @@ BOOST_AUTO_TEST_CASE(moveConstructorTransfersOwnership)
176178
{
177179
const auto database = getTempFile("Batch-moveConstructorTransfersOwnership.fdb");
178180

179-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
181+
Attachment attachment{CLIENT, database,
182+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
180183
FbDropDatabase attachmentDrop{attachment};
181184

182185
{ // scope
@@ -211,7 +214,8 @@ BOOST_AUTO_TEST_CASE(executeReportsNoInfoWhenRecordCountsDisabled)
211214
{
212215
const auto database = getTempFile("Batch-noInfo.fdb");
213216

214-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
217+
Attachment attachment{CLIENT, database,
218+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
215219
FbDropDatabase attachmentDrop{attachment};
216220

217221
{ // scope
@@ -243,7 +247,8 @@ BOOST_AUTO_TEST_CASE(executeWithBadDataReportsExecuteFailed)
243247
{
244248
const auto database = getTempFile("Batch-badData.fdb");
245249

246-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
250+
Attachment attachment{CLIENT, database,
251+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
247252
FbDropDatabase attachmentDrop{attachment};
248253

249254
{ // scope
@@ -301,7 +306,8 @@ BOOST_AUTO_TEST_CASE(cancelDiscardsMessages)
301306
{
302307
const auto database = getTempFile("Batch-cancelDiscardsMessages.fdb");
303308

304-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
309+
Attachment attachment{CLIENT, database,
310+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
305311
FbDropDatabase attachmentDrop{attachment};
306312

307313
{ // scope
@@ -340,7 +346,8 @@ BOOST_AUTO_TEST_CASE(blobWithIdEngine)
340346
{
341347
const auto database = getTempFile("Batch-blobWithIdEngine.fdb");
342348

343-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
349+
Attachment attachment{CLIENT, database,
350+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
344351
FbDropDatabase attachmentDrop{attachment};
345352

346353
{ // scope
@@ -397,7 +404,8 @@ BOOST_AUTO_TEST_CASE(registerExistingBlob)
397404
{
398405
const auto database = getTempFile("Batch-registerExistingBlob.fdb");
399406

400-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
407+
Attachment attachment{CLIENT, database,
408+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
401409
FbDropDatabase attachmentDrop{attachment};
402410

403411
{ // scope
@@ -459,7 +467,8 @@ BOOST_AUTO_TEST_CASE(closeReleasesHandle)
459467
{
460468
const auto database = getTempFile("Batch-closeReleasesHandle.fdb");
461469

462-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
470+
Attachment attachment{CLIENT, database,
471+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
463472
FbDropDatabase attachmentDrop{attachment};
464473

465474
{ // scope

‎src/test/Blob.cpp‎

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

43-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
43+
Attachment attachment{CLIENT, database,
44+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
4445
FbDropDatabase attachmentDrop{attachment};
4546

4647
// DDL
@@ -121,7 +122,8 @@ BOOST_AUTO_TEST_CASE(createWriteRead)
121122
{
122123
const auto database = getTempFile("Blob-createWriteRead.fdb");
123124

124-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
125+
Attachment attachment{CLIENT, database,
126+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
125127
FbDropDatabase attachmentDrop{attachment};
126128

127129
// DDL
@@ -213,7 +215,8 @@ BOOST_AUTO_TEST_CASE(cancelDiscardsHandle)
213215
{
214216
const auto database = getTempFile("Blob-cancelDiscardsHandle.fdb");
215217

216-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
218+
Attachment attachment{CLIENT, database,
219+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
217220
FbDropDatabase attachmentDrop{attachment};
218221

219222
Transaction transaction{attachment};

‎src/test/EventListener.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ BOOST_AUTO_TEST_SUITE(EventListenerSuite)
4040
BOOST_AUTO_TEST_CASE(receivesSingleEvent)
4141
{
4242
const auto database = getTempFile("EventListener-receivesSingleEvent.fdb");
43-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
43+
Attachment attachment{CLIENT, database,
44+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
4445
FbDropDatabase attachmentDrop{attachment};
4546

4647
std::mutex mutex;
@@ -78,7 +79,8 @@ BOOST_AUTO_TEST_CASE(receivesSingleEvent)
7879
BOOST_AUTO_TEST_CASE(aggregatesMultipleEvents)
7980
{
8081
const auto database = getTempFile("EventListener-aggregatesMultipleEvents.fdb");
81-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
82+
Attachment attachment{CLIENT, database,
83+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
8284
FbDropDatabase attachmentDrop{attachment};
8385

8486
{ // scope
@@ -143,7 +145,8 @@ BOOST_AUTO_TEST_CASE(aggregatesMultipleEvents)
143145
BOOST_AUTO_TEST_CASE(stopsReceivingEventsAfterStop)
144146
{
145147
const auto database = getTempFile("EventListener-stopsReceivingEventsAfterStop.fdb");
146-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setConnectionCharSet("UTF8")};
148+
Attachment attachment{CLIENT, database,
149+
AttachmentOptions().setCreateDatabase(true).setForcedWrites(false).setConnectionCharSet("UTF8")};
147150
FbDropDatabase attachmentDrop{attachment};
148151

149152
std::mutex mutex;

‎src/test/Exception.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE(syntaxErrorExceptionProperties)
3535
{
3636
const auto database = getTempFile("Exception-syntaxErrorExceptionProperties.fdb");
3737

38-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true)};
38+
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
3939
FbDropDatabase attachmentDrop{attachment};
4040

4141
Transaction transaction{attachment};

‎src/test/ScrollableCursor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(scrollableCursorSupportsFetchMethods)
3939
{
4040
const auto database = getTempFile("ScrollableCursor-fetchMethods.fdb");
4141

42-
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true)};
42+
Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setForcedWrites(false)};
4343
FbDropDatabase attachmentDrop{attachment};
4444

4545
Transaction transaction{attachment};

0 commit comments

Comments
 (0)