Skip to content

Commit 3a5cef8

Browse files
PKEuSPKEuS
committed
Refactorization: Improved usage of Settings instances in test suite
1 parent 1d7c3c3 commit 3a5cef8

36 files changed

Lines changed: 553 additions & 892 deletions

‎test/test64bit.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ class Test64BitPortability : public TestFixture {
2727
}
2828

2929
private:
30-
30+
Settings settings;
3131

3232
void run() {
33+
settings.addEnabled("portability");
34+
3335
TEST_CASE(novardecl);
3436
TEST_CASE(functionpar);
3537
TEST_CASE(structmember);
@@ -42,9 +44,6 @@ class Test64BitPortability : public TestFixture {
4244
// Clear the error buffer..
4345
errout.str("");
4446

45-
Settings settings;
46-
settings.addEnabled("portability");
47-
4847
// Tokenize..
4948
Tokenizer tokenizer(&settings, this);
5049
std::istringstream istr(code);

‎test/testassert.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ class TestAssert : public TestFixture {
2626
TestAssert() : TestFixture("TestAssert") {}
2727

2828
private:
29+
Settings settings;
30+
2931
void check(const char code[], const char *filename = "test.cpp") {
3032
// Clear the error buffer..
3133
errout.str("");
3234

33-
Settings settings;
34-
settings.addEnabled("warning");
35-
3635
// Tokenize..
3736
Tokenizer tokenizer(&settings, this);
3837
std::istringstream istr(code);
@@ -44,6 +43,8 @@ class TestAssert : public TestFixture {
4443
}
4544

4645
void run() {
46+
settings.addEnabled("warning");
47+
4748
TEST_CASE(assignmentInAssert);
4849
TEST_CASE(functionCallInAssert);
4950
TEST_CASE(memberFunctionCallInAssert);

‎test/testbool.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ class TestBool : public TestFixture {
2727
}
2828

2929
private:
30-
30+
Settings settings;
3131

3232
void run() {
33+
settings.addEnabled("style");
34+
settings.addEnabled("warning");
35+
settings.inconclusive = true;
36+
3337
TEST_CASE(bitwiseOnBoolean); // if (bool & bool)
3438
TEST_CASE(incrementBoolean);
3539
TEST_CASE(assignBoolToPointer);
@@ -64,10 +68,6 @@ class TestBool : public TestFixture {
6468
// Clear the error buffer..
6569
errout.str("");
6670

67-
Settings settings;
68-
settings.addEnabled("style");
69-
settings.addEnabled("warning");
70-
settings.inconclusive = true;
7171
settings.experimental = experimental;
7272

7373
// Tokenize..

‎test/testboost.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ class TestBoost : public TestFixture {
2727
}
2828

2929
private:
30+
Settings settings;
31+
3032
void run() {
33+
settings.addEnabled("style");
34+
settings.addEnabled("performance");
35+
3136
TEST_CASE(BoostForeachContainerModification)
3237
}
3338

3439
void check(const char code[]) {
3540
// Clear the error buffer..
3641
errout.str("");
3742

38-
Settings settings;
39-
settings.addEnabled("style");
40-
settings.addEnabled("performance");
41-
4243
// Tokenize..
4344
Tokenizer tokenizer(&settings, this);
4445
std::istringstream istr(code);

‎test/testbufferoverrun.cpp‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,24 @@ class TestBufferOverrun : public TestFixture {
3030
}
3131

3232
private:
33+
Settings settings0;
3334

3435
void check(const char code[], bool experimental = true, const char filename[] = "test.cpp") {
3536
// Clear the error buffer..
3637
errout.str("");
3738

38-
Settings settings;
39-
settings.inconclusive = true;
40-
settings.experimental = experimental;
41-
settings.addEnabled("warning");
42-
settings.addEnabled("style");
43-
settings.addEnabled("portability");
39+
settings0.inconclusive = true;
40+
settings0.experimental = experimental;
4441

4542
// Tokenize..
46-
Tokenizer tokenizer(&settings, this);
43+
Tokenizer tokenizer(&settings0, this);
4744
std::istringstream istr(code);
4845
tokenizer.tokenize(istr, filename);
4946
tokenizer.simplifyTokenList2();
5047

5148
// Check for buffer overruns..
5249
CheckBufferOverrun checkBufferOverrun;
53-
checkBufferOverrun.runSimplifiedChecks(&tokenizer, &settings, this);
50+
checkBufferOverrun.runSimplifiedChecks(&tokenizer, &settings0, this);
5451
}
5552

5653
void check(const char code[], const Settings &settings, const char filename[] = "test.cpp") {
@@ -70,6 +67,10 @@ class TestBufferOverrun : public TestFixture {
7067
}
7168

7269
void run() {
70+
settings0.addEnabled("warning");
71+
settings0.addEnabled("style");
72+
settings0.addEnabled("portability");
73+
7374
TEST_CASE(noerr1);
7475
TEST_CASE(noerr2);
7576
TEST_CASE(noerr3);
@@ -3431,16 +3432,14 @@ class TestBufferOverrun : public TestFixture {
34313432
// Clear the error buffer..
34323433
errout.str("");
34333434

3434-
Settings settings;
3435-
34363435
// Tokenize..
3437-
Tokenizer tokenizer(&settings, this);
3436+
Tokenizer tokenizer(&settings0, this);
34383437
std::istringstream istr(code);
34393438
tokenizer.tokenize(istr, filename);
34403439
tokenizer.simplifyTokenList2();
34413440

34423441
// Check for buffer overruns..
3443-
CheckBufferOverrun checkBufferOverrun(&tokenizer, &settings, this);
3442+
CheckBufferOverrun checkBufferOverrun(&tokenizer, &settings0, this);
34443443
checkBufferOverrun.bufferOverrun();
34453444
}
34463445

‎test/testcharvar.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ class TestCharVar : public TestFixture {
2727
}
2828

2929
private:
30-
30+
Settings settings;
3131

3232
void run() {
33+
settings.addEnabled("warning");
34+
3335
TEST_CASE(array_index_1);
3436
TEST_CASE(array_index_2);
3537
TEST_CASE(bitop);
@@ -39,9 +41,6 @@ class TestCharVar : public TestFixture {
3941
// Clear the error buffer..
4042
errout.str("");
4143

42-
Settings settings;
43-
settings.addEnabled("warning");
44-
4544
// Tokenize..
4645
Tokenizer tokenizer(&settings, this);
4746
std::istringstream istr(code);

0 commit comments

Comments
 (0)