Skip to content

Commit 7c551dd

Browse files
Riyuzak2510Riyuzak2510
committed
Refactoring Code to Adjust Scoped Logic into the common constructor for Capturer
1 parent e91c431 commit 7c551dd

16 files changed

+200
-269
lines changed

‎src/catch2/catch_message.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ namespace Catch {
3939
Capturer::Capturer( StringRef macroName,
4040
SourceLineInfo const& lineInfo,
4141
ResultWas::OfType resultType,
42-
StringRef names ):
42+
StringRef names, bool scoped):
4343
m_resultCapture( getResultCapture() ) {
44+
isScoped = scoped;
4445
auto trimmed = [&] (size_t start, size_t end) {
4546
while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
4647
++start;
@@ -106,20 +107,19 @@ namespace Catch {
106107
}
107108

108109
void Capturer::captureValue( size_t index, std::string const& value ) {
109-
assert( index < m_messages.size() );
110-
m_messages[index].message += value;
111-
m_resultCapture.pushScopedMessage( m_messages[index] );
112-
m_captured++;
113-
}
114-
115-
void Capturer::captureUnscopedValue( size_t index, std::string const& value ) {
116-
m_messages[index].message += value;
117-
getResultCapture().emplaceUnscopedMessage(Catch::MessageBuilder(
118-
m_messages[index].macroName,
119-
m_messages[index].lineInfo,
120-
m_messages[index].type) << m_messages[index].message);
121-
if(index == m_messages.size() - 1){
122-
m_messages.clear();
110+
if(isScoped){
111+
assert( index < m_messages.size() );
112+
m_messages[index].message += value;
113+
m_resultCapture.pushScopedMessage( m_messages[index] );
114+
m_captured++;
115+
} else {
116+
getResultCapture().emplaceUnscopedMessage(Catch::MessageBuilder(
117+
m_messages[index].macroName,
118+
m_messages[index].lineInfo,
119+
m_messages[index].type) << value);
120+
if(index == m_messages.size() - 1){
121+
m_messages.clear();
122+
}
123123
}
124124
}
125125

‎src/catch2/catch_message.hpp‎

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,15 @@ namespace Catch {
6565
std::vector<MessageInfo> m_messages;
6666
IResultCapture& m_resultCapture;
6767
size_t m_captured = 0;
68+
bool isScoped;
6869
public:
69-
Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
70+
Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names, bool scoped );
7071

7172
Capturer(Capturer const&) = delete;
7273
Capturer& operator=(Capturer const&) = delete;
7374

7475
~Capturer();
7576

76-
void captureUnscopedValue( size_t index, std::string const& value );
77-
78-
template<typename T>
79-
void captureUnscopedValues( size_t index, T const& value ) {
80-
captureUnscopedValue( index, Catch::Detail::stringify( value ) );
81-
}
82-
83-
template<typename T, typename... Ts>
84-
void captureUnscopedValues( size_t index, T const& value, Ts const&... values ) {
85-
captureUnscopedValue( index, Catch::Detail::stringify(value) );
86-
captureUnscopedValues( index+1, values... );
87-
}
88-
8977
void captureValue( size_t index, std::string const& value );
9078

9179
template<typename T>
@@ -98,10 +86,6 @@ namespace Catch {
9886
captureValue( index, Catch::Detail::stringify(value) );
9987
captureValues( index+1, values... );
10088
}
101-
102-
std::vector<MessageInfo> getMessageDetails() const {
103-
return m_messages;
104-
}
10589
};
10690

10791
} // end namespace Catch
@@ -119,16 +103,18 @@ namespace Catch {
119103
Catch::Capturer varName( macroName##_catch_sr, \
120104
CATCH_INTERNAL_LINEINFO, \
121105
Catch::ResultWas::Info, \
122-
#__VA_ARGS__##_catch_sr ); \
106+
#__VA_ARGS__##_catch_sr, \
107+
true ); \
123108
varName.captureValues( 0, __VA_ARGS__ )
124109

125110
///////////////////////////////////////////////////////////////////////////////
126111
#define INTERNAL_CATCH_UNSCOPED_CAPTURE( varName, macroName, ... ) \
127112
Catch::Capturer varName( macroName##_catch_sr, \
128113
CATCH_INTERNAL_LINEINFO, \
129114
Catch::ResultWas::Info, \
130-
#__VA_ARGS__##_catch_sr ); \
131-
varName.captureUnscopedValues( 0, __VA_ARGS__ );
115+
#__VA_ARGS__##_catch_sr, \
116+
false ); \
117+
varName.captureValues( 0, __VA_ARGS__ );
132118

133119
///////////////////////////////////////////////////////////////////////////////
134120
#define INTERNAL_CATCH_INFO( macroName, log ) \
@@ -149,12 +135,11 @@ namespace Catch {
149135

150136
#elif defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
151137

152-
#define CATCH_INFO( msg ) (void)(0)
153-
#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
154-
#define CATCH_WARN( msg ) (void)(0)
155-
#define CATCH_CAPTURE( ... ) (void)(0)
156-
#define CATCH_UNSCOPED_CAPTURE( ... ) (void)(0)
157-
138+
#define CATCH_INFO( msg ) (void)(0)
139+
#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
140+
#define CATCH_WARN( msg ) (void)(0)
141+
#define CATCH_CAPTURE( ... ) (void)(0)
142+
#define CATCH_UNSCOPED_CAPTURE( ... ) (void)(0)
158143

159144
#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
160145

@@ -167,12 +152,11 @@ namespace Catch {
167152

168153
#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
169154

170-
#define INFO( msg ) (void)(0)
171-
#define UNSCOPED_INFO( msg ) (void)(0)
172-
#define WARN( msg ) (void)(0)
173-
#define CAPTURE( ... ) (void)(0)
174-
#define UNSCOPED_CAPTURE( ... ) (void)(0)
175-
155+
#define INFO(msg) (void)(0)
156+
#define UNSCOPED_INFO(msg) (void)(0)
157+
#define WARN(msg) (void)(0)
158+
#define CAPTURE(...) (void)(0)
159+
#define UNSCOPED_CAPTURE(...) (void)(0)
176160
#endif // end of user facing macro declarations
177161

178162

‎tests/SelfTest/Baselines/compact.sw.approved.txt‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2194,8 +2194,8 @@ MatchersRanges.tests.cpp:<line number>: passed: a, !RangeEquals( b ) for: { 1, 2
21942194
MatchersRanges.tests.cpp:<line number>: passed: a, UnorderedRangeEquals( b ) for: { 1, 2, 3 } unordered elements are { 3, 2, 1 }
21952195
MatchersRanges.tests.cpp:<line number>: passed: vector_a, RangeEquals( array_a_plus_1, close_enough ) for: { 1, 2, 3 } elements are { 2, 3, 4 }
21962196
MatchersRanges.tests.cpp:<line number>: passed: vector_a, UnorderedRangeEquals( array_a_plus_1, close_enough ) for: { 1, 2, 3 } unordered elements are { 2, 3, 4 }
2197-
Message.tests.cpp:<line number>: passed: with 7 messages: 'a := 1' and 'b := 2' and 'c := 3' and 'a + b := 3' and 'a+b := 3' and 'c > b := true' and 'a == 1 := true'
2198-
Message.tests.cpp:<line number>: passed: with 11 messages: '("comma, in string", "escaped, \", ") := "escaped, ", "' and '"single quote in string,'," := "single quote in string,',"' and '"some escapes, \\,\\\\" := "some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[<"' and ''"' := '"'' and ''\'' := '''' and '',' := ','' and ''}' := '}'' and '')' := ')'' and ''(' := '('' and ''{' := '{''
2197+
Message.tests.cpp:<line number>: passed: with 7 messages: '1' and '2' and '3' and '3' and '3' and 'true' and 'true'
2198+
Message.tests.cpp:<line number>: passed: with 11 messages: '"escaped, ", "' and '"single quote in string,',"' and '"some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<"' and ''"'' and ''''' and '','' and ''}'' and '')'' and ''('' and ''{''
21992199
Exception.tests.cpp:<line number>: failed: unexpected exception with message: '3.14000000000000012'
22002200
UniquePtr.tests.cpp:<line number>: passed: bptr->i == 3 for: 3 == 3
22012201
UniquePtr.tests.cpp:<line number>: passed: bptr->i == 3 for: 3 == 3
@@ -2722,9 +2722,9 @@ Skip.tests.cpp:<line number>: skipped: 'skipping because answer = 43'
27222722
StringManip.tests.cpp:<line number>: passed: splitStringRef("", ','), Equals(std::vector<StringRef>()) for: { } Equals: { }
27232723
StringManip.tests.cpp:<line number>: passed: splitStringRef("abc", ','), Equals(std::vector<StringRef>{"abc"}) for: { abc } Equals: { abc }
27242724
StringManip.tests.cpp:<line number>: passed: splitStringRef("abc,def", ','), Equals(std::vector<StringRef>{"abc", "def"}) for: { abc, def } Equals: { abc, def }
2725-
Message.tests.cpp:<line number>: failed: false with 1 message: 'input := { 7, 8, 9 }'
2726-
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 1 to 3..." := "Count 1 to 3..."' and 'input := 1' and 'input := 2' and 'input := 3'
2727-
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 4 to 6..." := "Count 4 to 6..."' and 'input := 4' and 'input := 5' and 'input := 6'
2725+
Message.tests.cpp:<line number>: failed: false with 1 message: '{ 7, 8, 9 }'
2726+
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 1 to 3..."' and '1' and '2' and '3'
2727+
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 4 to 6..."' and '4' and '5' and '6'
27282728
Message.tests.cpp:<line number>: failed: false with 4 messages: 'Count 1 to 3...' and '1' and '2' and '3'
27292729
Message.tests.cpp:<line number>: failed: false with 4 messages: 'Count 4 to 6...' and '4' and '5' and '6'
27302730
StringManip.tests.cpp:<line number>: passed: !(startsWith("", 'c')) for: !false
@@ -2889,12 +2889,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
28892889
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
28902890
Misc.tests.cpp:<line number>: passed:
28912891
Misc.tests.cpp:<line number>: passed:
2892-
<<<<<<< HEAD
28932892
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
28942893
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
2895-
=======
2896-
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
2897-
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
2898-
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
28992894

29002895

‎tests/SelfTest/Baselines/compact.sw.multi.approved.txt‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2187,8 +2187,8 @@ MatchersRanges.tests.cpp:<line number>: passed: a, !RangeEquals( b ) for: { 1, 2
21872187
MatchersRanges.tests.cpp:<line number>: passed: a, UnorderedRangeEquals( b ) for: { 1, 2, 3 } unordered elements are { 3, 2, 1 }
21882188
MatchersRanges.tests.cpp:<line number>: passed: vector_a, RangeEquals( array_a_plus_1, close_enough ) for: { 1, 2, 3 } elements are { 2, 3, 4 }
21892189
MatchersRanges.tests.cpp:<line number>: passed: vector_a, UnorderedRangeEquals( array_a_plus_1, close_enough ) for: { 1, 2, 3 } unordered elements are { 2, 3, 4 }
2190-
Message.tests.cpp:<line number>: passed: with 7 messages: 'a := 1' and 'b := 2' and 'c := 3' and 'a + b := 3' and 'a+b := 3' and 'c > b := true' and 'a == 1 := true'
2191-
Message.tests.cpp:<line number>: passed: with 11 messages: '("comma, in string", "escaped, \", ") := "escaped, ", "' and '"single quote in string,'," := "single quote in string,',"' and '"some escapes, \\,\\\\" := "some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[<"' and ''"' := '"'' and ''\'' := '''' and '',' := ','' and ''}' := '}'' and '')' := ')'' and ''(' := '('' and ''{' := '{''
2190+
Message.tests.cpp:<line number>: passed: with 7 messages: '1' and '2' and '3' and '3' and '3' and 'true' and 'true'
2191+
Message.tests.cpp:<line number>: passed: with 11 messages: '"escaped, ", "' and '"single quote in string,',"' and '"some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<"' and ''"'' and ''''' and '','' and ''}'' and '')'' and ''('' and ''{''
21922192
Exception.tests.cpp:<line number>: failed: unexpected exception with message: '3.14000000000000012'
21932193
UniquePtr.tests.cpp:<line number>: passed: bptr->i == 3 for: 3 == 3
21942194
UniquePtr.tests.cpp:<line number>: passed: bptr->i == 3 for: 3 == 3
@@ -2711,9 +2711,9 @@ Skip.tests.cpp:<line number>: skipped: 'skipping because answer = 43'
27112711
StringManip.tests.cpp:<line number>: passed: splitStringRef("", ','), Equals(std::vector<StringRef>()) for: { } Equals: { }
27122712
StringManip.tests.cpp:<line number>: passed: splitStringRef("abc", ','), Equals(std::vector<StringRef>{"abc"}) for: { abc } Equals: { abc }
27132713
StringManip.tests.cpp:<line number>: passed: splitStringRef("abc,def", ','), Equals(std::vector<StringRef>{"abc", "def"}) for: { abc, def } Equals: { abc, def }
2714-
Message.tests.cpp:<line number>: failed: false with 1 message: 'input := { 7, 8, 9 }'
2715-
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 1 to 3..." := "Count 1 to 3..."' and 'input := 1' and 'input := 2' and 'input := 3'
2716-
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 4 to 6..." := "Count 4 to 6..."' and 'input := 4' and 'input := 5' and 'input := 6'
2714+
Message.tests.cpp:<line number>: failed: false with 1 message: '{ 7, 8, 9 }'
2715+
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 1 to 3..."' and '1' and '2' and '3'
2716+
Message.tests.cpp:<line number>: failed: false with 4 messages: '"Count 4 to 6..."' and '4' and '5' and '6'
27172717
Message.tests.cpp:<line number>: failed: false with 4 messages: 'Count 1 to 3...' and '1' and '2' and '3'
27182718
Message.tests.cpp:<line number>: failed: false with 4 messages: 'Count 4 to 6...' and '4' and '5' and '6'
27192719
StringManip.tests.cpp:<line number>: passed: !(startsWith("", 'c')) for: !false
@@ -2878,12 +2878,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
28782878
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
28792879
Misc.tests.cpp:<line number>: passed:
28802880
Misc.tests.cpp:<line number>: passed:
2881-
<<<<<<< HEAD
28822881
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
28832882
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
2884-
=======
2885-
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
2886-
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
2887-
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
28882883

28892884

‎tests/SelfTest/Baselines/console.std.approved.txt‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@ Message.tests.cpp:<line number>
16871687
Message.tests.cpp:<line number>: FAILED:
16881688
CHECK( false )
16891689
with message:
1690-
input := { 7, 8, 9 }
1690+
{ 7, 8, 9 }
16911691

16921692
-------------------------------------------------------------------------------
16931693
stacks unscoped capture in loops
@@ -1698,18 +1698,18 @@ Message.tests.cpp:<line number>
16981698
Message.tests.cpp:<line number>: FAILED:
16991699
CHECK( false )
17001700
with messages:
1701-
"Count 1 to 3..." := "Count 1 to 3..."
1702-
input := 1
1703-
input := 2
1704-
input := 3
1701+
"Count 1 to 3..."
1702+
1
1703+
2
1704+
3
17051705

17061706
Message.tests.cpp:<line number>: FAILED:
17071707
CHECK( false )
17081708
with messages:
1709-
"Count 4 to 6..." := "Count 4 to 6..."
1710-
input := 4
1711-
input := 5
1712-
input := 6
1709+
"Count 4 to 6..."
1710+
4
1711+
5
1712+
6
17131713

17141714
-------------------------------------------------------------------------------
17151715
stacks unscoped info in loops
@@ -1752,11 +1752,6 @@ due to unexpected exception with message:
17521752
Why would you throw a std::string?
17531753

17541754
===============================================================================
1755-
<<<<<<< HEAD
17561755
test cases: 439 | 337 passed | 78 failed | 7 skipped | 17 failed as expected
17571756
assertions: 2283 | 2103 passed | 139 failed | 41 failed as expected
1758-
=======
1759-
test cases: 438 | 336 passed | 78 failed | 7 skipped | 17 failed as expected
1760-
assertions: 2276 | 2096 passed | 139 failed | 41 failed as expected
1761-
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
17621757

‎tests/SelfTest/Baselines/console.sw.approved.txt‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14240,13 +14240,13 @@ Message.tests.cpp:<line number>
1424014240

1424114241
Message.tests.cpp:<line number>: PASSED:
1424214242
with messages:
14243-
a := 1
14244-
b := 2
14245-
c := 3
14246-
a + b := 3
14247-
a+b := 3
14248-
c > b := true
14249-
a == 1 := true
14243+
1
14244+
2
14245+
3
14246+
3
14247+
3
14248+
true
14249+
true
1425014250

1425114251
-------------------------------------------------------------------------------
1425214252
UNSCOPED_CAPTURE parses string and character constants
@@ -14256,18 +14256,17 @@ Message.tests.cpp:<line number>
1425614256

1425714257
Message.tests.cpp:<line number>: PASSED:
1425814258
with messages:
14259-
("comma, in string", "escaped, \", ") := "escaped, ", "
14260-
"single quote in string,'," := "single quote in string,',"
14261-
"some escapes, \\,\\\\" := "some escapes, \,\\"
14262-
"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[
14263-
<"
14264-
'"' := '"'
14265-
'\'' := '''
14266-
',' := ','
14267-
'}' := '}'
14268-
')' := ')'
14269-
'(' := '('
14270-
'{' := '{'
14259+
"escaped, ", "
14260+
"single quote in string,',"
14261+
"some escapes, \,\\"
14262+
"some, ), unmatched, } prenheses {[<"
14263+
'"'
14264+
'''
14265+
','
14266+
'}'
14267+
')'
14268+
'('
14269+
'{'
1427114270

1427214271
-------------------------------------------------------------------------------
1427314272
Unexpected exceptions can be translated
@@ -18163,7 +18162,7 @@ Message.tests.cpp:<line number>
1816318162
Message.tests.cpp:<line number>: FAILED:
1816418163
CHECK( false )
1816518164
with message:
18166-
input := { 7, 8, 9 }
18165+
{ 7, 8, 9 }
1816718166

1816818167
-------------------------------------------------------------------------------
1816918168
stacks unscoped capture in loops
@@ -18174,18 +18173,18 @@ Message.tests.cpp:<line number>
1817418173
Message.tests.cpp:<line number>: FAILED:
1817518174
CHECK( false )
1817618175
with messages:
18177-
"Count 1 to 3..." := "Count 1 to 3..."
18178-
input := 1
18179-
input := 2
18180-
input := 3
18176+
"Count 1 to 3..."
18177+
1
18178+
2
18179+
3
1818118180

1818218181
Message.tests.cpp:<line number>: FAILED:
1818318182
CHECK( false )
1818418183
with messages:
18185-
"Count 4 to 6..." := "Count 4 to 6..."
18186-
input := 4
18187-
input := 5
18188-
input := 6
18184+
"Count 4 to 6..."
18185+
4
18186+
5
18187+
6
1818918188

1819018189
-------------------------------------------------------------------------------
1819118190
stacks unscoped info in loops
@@ -19337,11 +19336,6 @@ Misc.tests.cpp:<line number>
1933719336
Misc.tests.cpp:<line number>: PASSED:
1933819337

1933919338
===============================================================================
19340-
<<<<<<< HEAD
1934119339
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
1934219340
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
19343-
=======
19344-
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
19345-
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
19346-
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
1934719341

0 commit comments

Comments
 (0)