Skip to content

Commit a65e08b

Browse files
PKEuSPKEuS
committed
Simplified code in testerrorlogger by reusing constant object.
1 parent 758d685 commit a65e08b

1 file changed

Lines changed: 23 additions & 89 deletions

File tree

‎test/testerrorlogger.cpp‎

Lines changed: 23 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323

2424
class TestErrorLogger : public TestFixture {
2525
public:
26-
TestErrorLogger() : TestFixture("TestErrorLogger") {
26+
TestErrorLogger() : TestFixture("TestErrorLogger"), fooCpp5("foo.cpp", 5), barCpp8("bar.cpp", 8) {
2727
}
2828

2929
private:
30+
const ErrorLogger::ErrorMessage::FileLocation fooCpp5;
31+
const ErrorLogger::ErrorMessage::FileLocation barCpp8;
3032

3133
void run() {
3234
TEST_CASE(FileLocationDefaults);
@@ -68,11 +70,7 @@ class TestErrorLogger : public TestFixture {
6870
}
6971

7072
void ErrorMessageConstruct() const {
71-
ErrorLogger::ErrorMessage::FileLocation loc;
72-
loc.setfile("foo.cpp");
73-
loc.line = 5;
74-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
75-
locs.push_back(loc);
73+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
7674
ErrorMessage msg(locs, Severity::error, "Programming error.", "errorId", false);
7775
ASSERT_EQUALS(1, (int)msg._callStack.size());
7876
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -82,15 +80,9 @@ class TestErrorLogger : public TestFixture {
8280
}
8381

8482
void ErrorMessageConstructLocations() const {
85-
ErrorLogger::ErrorMessage::FileLocation loc;
86-
loc.setfile("foo.cpp");
87-
loc.line = 5;
88-
ErrorLogger::ErrorMessage::FileLocation loc2;
89-
loc2.setfile("bar.cpp");
90-
loc2.line = 8;
9183
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
92-
locs.push_back(loc);
93-
locs.push_back(loc2);
84+
locs.push_back(fooCpp5);
85+
locs.push_back(barCpp8);
9486
ErrorMessage msg(locs, Severity::error, "Programming error.", "errorId", false);
9587
ASSERT_EQUALS(2, (int)msg._callStack.size());
9688
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -100,11 +92,7 @@ class TestErrorLogger : public TestFixture {
10092
}
10193

10294
void ErrorMessageVerbose() const {
103-
ErrorLogger::ErrorMessage::FileLocation loc;
104-
loc.setfile("foo.cpp");
105-
loc.line = 5;
106-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
107-
locs.push_back(loc);
95+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
10896
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
10997
ASSERT_EQUALS(1, (int)msg._callStack.size());
11098
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -114,15 +102,9 @@ class TestErrorLogger : public TestFixture {
114102
}
115103

116104
void ErrorMessageVerboseLocations() const {
117-
ErrorLogger::ErrorMessage::FileLocation loc;
118-
loc.setfile("foo.cpp");
119-
loc.line = 5;
120105
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
121-
ErrorLogger::ErrorMessage::FileLocation loc2;
122-
loc2.setfile("bar.cpp");
123-
loc2.line = 8;
124-
locs.push_back(loc);
125-
locs.push_back(loc2);
106+
locs.push_back(fooCpp5);
107+
locs.push_back(barCpp8);
126108
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
127109
ASSERT_EQUALS(2, (int)msg._callStack.size());
128110
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -132,11 +114,7 @@ class TestErrorLogger : public TestFixture {
132114
}
133115

134116
void CustomFormat() const {
135-
ErrorLogger::ErrorMessage::FileLocation loc;
136-
loc.setfile("foo.cpp");
137-
loc.line = 5;
138-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
139-
locs.push_back(loc);
117+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
140118
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
141119
ASSERT_EQUALS(1, (int)msg._callStack.size());
142120
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -146,11 +124,7 @@ class TestErrorLogger : public TestFixture {
146124
}
147125

148126
void CustomFormat2() const {
149-
ErrorLogger::ErrorMessage::FileLocation loc;
150-
loc.setfile("foo.cpp");
151-
loc.line = 5;
152-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
153-
locs.push_back(loc);
127+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
154128
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
155129
ASSERT_EQUALS(1, (int)msg._callStack.size());
156130
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -161,15 +135,9 @@ class TestErrorLogger : public TestFixture {
161135

162136
void CustomFormatLocations() const {
163137
// Check that first location from location stack is used in template
164-
ErrorLogger::ErrorMessage::FileLocation loc;
165-
loc.setfile("foo.cpp");
166-
loc.line = 5;
167-
ErrorLogger::ErrorMessage::FileLocation loc2;
168-
loc2.setfile("bar.cpp");
169-
loc2.line = 8;
170138
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
171-
locs.push_back(loc);
172-
locs.push_back(loc2);
139+
locs.push_back(fooCpp5);
140+
locs.push_back(barCpp8);
173141
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
174142
ASSERT_EQUALS(2, (int)msg._callStack.size());
175143
ASSERT_EQUALS("Programming error.", msg.shortMessage());
@@ -179,67 +147,43 @@ class TestErrorLogger : public TestFixture {
179147
}
180148

181149
void ToXml() const {
182-
ErrorLogger::ErrorMessage::FileLocation loc;
183-
loc.setfile("foo.cpp");
184-
loc.line = 5;
185-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
186-
locs.push_back(loc);
150+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
187151
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
188152
ASSERT_EQUALS("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results>", ErrorLogger::ErrorMessage::getXMLHeader(1));
189153
ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter(1));
190154
ASSERT_EQUALS(" <error file=\"foo.cpp\" line=\"5\" id=\"errorId\" severity=\"error\" msg=\"Programming error.\"/>", msg.toXML(false,1));
191155
}
192156

193157
void ToXmlLocations() const {
194-
ErrorLogger::ErrorMessage::FileLocation loc;
195-
loc.setfile("foo.cpp");
196-
loc.line = 5;
197-
ErrorLogger::ErrorMessage::FileLocation loc2;
198-
loc2.setfile("bar.cpp");
199-
loc2.line = 8;
200158
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
201-
locs.push_back(loc);
202-
locs.push_back(loc2);
159+
locs.push_back(fooCpp5);
160+
locs.push_back(barCpp8);
203161
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
204162
ASSERT_EQUALS("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results>", ErrorLogger::ErrorMessage::getXMLHeader(1));
205163
ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter(1));
206164
ASSERT_EQUALS(" <error file=\"bar.cpp\" line=\"8\" id=\"errorId\" severity=\"error\" msg=\"Programming error.\"/>", msg.toXML(false,1));
207165
}
208166

209167
void ToVerboseXml() const {
210-
ErrorLogger::ErrorMessage::FileLocation loc;
211-
loc.setfile("foo.cpp");
212-
loc.line = 5;
213-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
214-
locs.push_back(loc);
168+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
215169
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
216170
ASSERT_EQUALS("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results>", ErrorLogger::ErrorMessage::getXMLHeader(1));
217171
ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter(1));
218172
ASSERT_EQUALS(" <error file=\"foo.cpp\" line=\"5\" id=\"errorId\" severity=\"error\" msg=\"Verbose error\"/>", msg.toXML(true,1));
219173
}
220174

221175
void ToVerboseXmlLocations() const {
222-
ErrorLogger::ErrorMessage::FileLocation loc;
223-
loc.setfile("foo.cpp");
224-
loc.line = 5;
225-
ErrorLogger::ErrorMessage::FileLocation loc2;
226-
loc2.setfile("bar.cpp");
227-
loc2.line = 8;
228176
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
229-
locs.push_back(loc);
230-
locs.push_back(loc2);
177+
locs.push_back(fooCpp5);
178+
locs.push_back(barCpp8);
231179
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
232180
ASSERT_EQUALS("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results>", ErrorLogger::ErrorMessage::getXMLHeader(1));
233181
ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter(1));
234182
ASSERT_EQUALS(" <error file=\"bar.cpp\" line=\"8\" id=\"errorId\" severity=\"error\" msg=\"Verbose error\"/>", msg.toXML(true,1));
235183
}
236184

237185
void ToXmlV2() const {
238-
ErrorLogger::ErrorMessage::FileLocation loc;
239-
loc.setfile("foo.cpp");
240-
loc.line = 5;
241-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
242-
locs.push_back(loc);
186+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
243187
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
244188
std::string header("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results version=\"2\">\n");
245189
header += " <cppcheck version=\"";
@@ -254,15 +198,9 @@ class TestErrorLogger : public TestFixture {
254198
}
255199

256200
void ToXmlV2Locations() const {
257-
ErrorLogger::ErrorMessage::FileLocation loc;
258-
loc.setfile("foo.cpp");
259-
loc.line = 5;
260-
ErrorLogger::ErrorMessage::FileLocation loc2;
261-
loc2.setfile("bar.cpp");
262-
loc2.line = 8;
263201
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
264-
locs.push_back(loc);
265-
locs.push_back(loc2);
202+
locs.push_back(fooCpp5);
203+
locs.push_back(barCpp8);
266204
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId", false);
267205
std::string header("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results version=\"2\">\n");
268206
header += " <cppcheck version=\"";
@@ -279,11 +217,7 @@ class TestErrorLogger : public TestFixture {
279217

280218
void InconclusiveXml() const {
281219
// Location
282-
ErrorLogger::ErrorMessage::FileLocation loc;
283-
loc.setfile("foo.cpp");
284-
loc.line = 5;
285-
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
286-
locs.push_back(loc);
220+
std::list<ErrorLogger::ErrorMessage::FileLocation> locs(1, fooCpp5);
287221

288222
// Inconclusive error message
289223
ErrorMessage msg(locs, Severity::error, "Programming error", "errorId", true);

0 commit comments

Comments
 (0)