mirror of https://github.com/catchorg/Catch2.git
ResultData -> AssertionResultData
This commit is contained in:
parent
c597a893fa
commit
a5fa78284d
|
@ -13,9 +13,9 @@
|
|||
|
||||
namespace Catch {
|
||||
|
||||
struct ResultData
|
||||
struct AssertionResultData
|
||||
{
|
||||
ResultData() : resultType( ResultWas::Unknown ) {}
|
||||
AssertionResultData() : resultType( ResultWas::Unknown ) {}
|
||||
|
||||
std::string macroName;
|
||||
SourceLineInfo lineInfo;
|
||||
|
@ -28,7 +28,7 @@ namespace Catch {
|
|||
class AssertionResult {
|
||||
public:
|
||||
AssertionResult();
|
||||
AssertionResult( const ResultData& data );
|
||||
AssertionResult( const AssertionResultData& data );
|
||||
~AssertionResult();
|
||||
|
||||
bool ok() const;
|
||||
|
@ -44,7 +44,7 @@ namespace Catch {
|
|||
std::string getTestMacroName() const;
|
||||
|
||||
protected:
|
||||
ResultData m_data;
|
||||
AssertionResultData m_data;
|
||||
};
|
||||
|
||||
} // end namespace Catch
|
||||
|
|
|
@ -14,7 +14,7 @@ namespace Catch {
|
|||
|
||||
AssertionResult::AssertionResult() {}
|
||||
|
||||
AssertionResult::AssertionResult( const ResultData& data ) : m_data( data ) {}
|
||||
AssertionResult::AssertionResult( const AssertionResultData& data ) : m_data( data ) {}
|
||||
|
||||
AssertionResult::~AssertionResult() {}
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
ResultData m_data;
|
||||
AssertionResultData m_data;
|
||||
std::string m_lhs, m_rhs, m_op;
|
||||
bool m_isFalse;
|
||||
};
|
||||
|
|
|
@ -65,7 +65,7 @@ namespace Catch {
|
|||
|
||||
AssertionResult AssertionResultBuilder::build() const
|
||||
{
|
||||
ResultData data = m_data;
|
||||
AssertionResultData data = m_data;
|
||||
data.reconstructedExpression = reconstructExpression();
|
||||
if( m_isFalse ) {
|
||||
if( m_op == "" ) {
|
||||
|
|
Loading…
Reference in New Issue