3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring ResultData out of ResultInfo/ Builder pt2

Browse Source
This commit is contained in:
Phil Nash
2012-10-09 11:48:55 +01:00
parent 86e1915099
commit 6730512afa
7 changed files with 184 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_approx.hpp
View File

@@ -70,7 +70,7 @@ namespace Detail {
std::string toString() const {
std::ostringstream oss;
oss << "Approx( " << m_value << ")";
oss << "Approx( " << m_value << " )";
return oss.str();
}

5
include/internal/catch_expression.hpp
View File

@@ -62,7 +62,10 @@ public:
}
operator ResultInfoBuilder& () {
return captureBoolExpression( m_result, m_lhs );
return m_result
.setLhs( Catch::toString( m_lhs ) )
.setOp( "" )
.setResultType( m_lhs ? ResultWas::Ok : ResultWas::ExpressionFailed );
}
template<typename RhsT>

17
include/internal/catch_resultinfo.h
View File

@@ -43,25 +43,8 @@ namespace Catch {
std::size_t getLine() const;
std::string getTestMacroName() const;
protected:
ResultInfo( const char* expr,
ResultWas::OfType result,
bool isNot,
const SourceLineInfo& lineInfo,
const char* macroName,
const char* message );
std::string getExpandedExpressionInternal() const;
bool isNotExpression( const char* expr );
protected:
ResultData m_data;
std::string m_macroName;
SourceLineInfo m_lineInfo;
std::string m_expr, m_lhs, m_rhs, m_op;
std::string m_message;
ResultWas::OfType m_result;
bool m_isNot;
};
} // end namespace Catch

75
include/internal/catch_resultinfo.hpp
View File

@@ -12,105 +12,54 @@
namespace Catch {
ResultInfo::ResultInfo()
: m_macroName(),
m_expr(),
m_lhs(),
m_rhs(),
m_op(),
m_message(),
m_result( ResultWas::Unknown ),
m_isNot( false )
{}
ResultInfo::ResultInfo() {}
ResultInfo::ResultInfo( const ResultData& data ) : m_data( data ) {}
ResultInfo::ResultInfo(const char* expr,
ResultWas::OfType result,
bool isNot,
const SourceLineInfo& lineInfo,
const char* macroName,
const char* message )
: m_macroName( macroName ),
m_lineInfo( lineInfo ),
m_expr( expr ),
m_lhs(),
m_rhs(),
m_op( isNotExpression( expr ) ? "!" : "" ),
m_message( message ),
m_result( result ),
m_isNot( isNot )
{
if( isNot )
m_expr = "!(" + m_expr + ")";
}
ResultInfo::~ResultInfo() {}
bool ResultInfo::ok() const {
return ( m_result & ResultWas::FailureBit ) != ResultWas::FailureBit;
return isOk( m_data.resultType );
}
ResultWas::OfType ResultInfo::getResultType() const {
return m_result;
return m_data.resultType;
}
bool ResultInfo::hasExpression() const {
return !m_expr.empty();
return !m_data.capturedExpression.empty();
}
bool ResultInfo::hasMessage() const {
return !m_message.empty();
return !m_data.message.empty();
}
std::string ResultInfo::getExpression() const {
return m_expr;
return m_data.capturedExpression;
}
bool ResultInfo::hasExpandedExpression() const {
return hasExpression() && getExpandedExpressionInternal() != m_expr;
return hasExpression() && getExpandedExpression() != getExpression();
}
std::string ResultInfo::getExpandedExpression() const {
return hasExpression() ? getExpandedExpressionInternal() : "";
return m_data.reconstructedExpression;
}
std::string ResultInfo::getMessage() const {
return m_message;
return m_data.message;
}
std::string ResultInfo::getFilename() const {
return m_lineInfo.file;
return m_data.lineInfo.file;
}
std::size_t ResultInfo::getLine() const {
return m_lineInfo.line;
return m_data.lineInfo.line;
}
std::string ResultInfo::getTestMacroName() const {
return m_macroName;
}
std::string ResultInfo::getExpandedExpressionInternal() const {
if( m_op == "" || m_isNot )
return m_lhs.empty() ? m_expr : m_op + m_lhs;
else if( m_op == "matches" )
return m_lhs + " " + m_rhs;
else if( m_op != "!" )
{
if( m_lhs.size() + m_rhs.size() < 30 )
return m_lhs + " " + m_op + " " + m_rhs;
else if( m_lhs.size() < 70 && m_rhs.size() < 70 )
return "\n\t" + m_lhs + "\n\t" + m_op + "\n\t" + m_rhs;
else
return "\n" + m_lhs + "\n" + m_op + "\n" + m_rhs + "\n\n";
}
else
return "{can't expand - use " + m_macroName + "_FALSE( " + m_expr.substr(1) + " ) instead of " + m_macroName + "( " + m_expr + " ) for better diagnostics}";
}
bool ResultInfo::isNotExpression( const char* expr ) {
return expr && expr[0] == '!';
return m_data.macroName;
}
} // end namespace Catch

8
include/internal/catch_resultinfo_builder.h
View File

@@ -18,7 +18,7 @@ namespace Catch {
struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
class ResultInfoBuilder : protected ResultInfo {
class ResultInfoBuilder {
public:
ResultInfoBuilder();
@@ -35,7 +35,7 @@ public:
std::string reconstructExpression() const;
const ResultInfo& build() const;
ResultInfo build() const;
// Disable attempts to use || and && in expressions (without parantheses)
template<typename RhsT>
@@ -49,6 +49,8 @@ public:
private:
ResultData m_data;
std::string m_lhs, m_rhs, m_op;
bool m_isNot;
};
template<Internal::Operator Op, typename T1, typename T2>
@@ -65,8 +67,6 @@ ResultInfoBuilder& captureExpression( ResultInfoBuilder& builder, const T* lhs,
return captureExpression<Op>( builder, lhs, reinterpret_cast<const T*>( rhs ) );
}
ResultInfoBuilder& captureBoolExpression( ResultInfoBuilder& builder, bool result );
} // end namespace Catch

41
include/internal/catch_resultinfo_builder.hpp
View File

@@ -17,16 +17,14 @@ namespace Catch {
ResultInfoBuilder& ResultInfoBuilder::setResultType( ResultWas::OfType result ) {
// Flip bool results if isNot is set
if( m_isNot && result == ResultWas::Ok )
m_result = ResultWas::ExpressionFailed;
m_data.resultType = ResultWas::ExpressionFailed;
else if( m_isNot && result == ResultWas::ExpressionFailed )
m_result = ResultWas::Ok;
m_data.resultType = ResultWas::Ok;
else
m_result = result;
m_data.resultType = m_result;
m_data.resultType = result;
return *this;
}
ResultInfoBuilder& ResultInfoBuilder::setCapturedExpression( const std::string& capturedExpression ) {
m_expr = capturedExpression;
m_data.capturedExpression = capturedExpression;
return *this;
}
@@ -36,19 +34,16 @@ namespace Catch {
}
ResultInfoBuilder& ResultInfoBuilder::setMessage( const std::string& message ) {
m_message = message;
m_data.message = message;
return *this;
}
ResultInfoBuilder& ResultInfoBuilder::setLineInfo( const SourceLineInfo& lineInfo ) {
m_lineInfo = lineInfo;
m_data.lineInfo = lineInfo;
return *this;
}
ResultInfoBuilder& ResultInfoBuilder::setMacroName( const std::string& macroName ) {
m_macroName = macroName;
m_data.macroName = macroName;
return *this;
}
@@ -68,27 +63,29 @@ namespace Catch {
return *this;
}
ResultInfoBuilder& captureBoolExpression( ResultInfoBuilder& builder, bool result ) {
return builder
.setLhs( Catch::toString( result ) )
.setOp( builder.getIsFalse() ? "!" : "" )
.setResultType( result ? ResultWas::Ok : ResultWas::ExpressionFailed );
}
const ResultInfo& ResultInfoBuilder::build() const
ResultInfo ResultInfoBuilder::build() const
{
ResultData data = m_data;
data.reconstructedExpression = reconstructExpression();
return *this;
if( m_isNot ) {
if( m_op == "" ) {
data.capturedExpression = "!" + data.capturedExpression;
data.reconstructedExpression = "!" + data.reconstructedExpression;
}
else {
data.capturedExpression = "!(" + data.capturedExpression + ")";
data.reconstructedExpression = "!(" + data.reconstructedExpression + ")";
}
}
return ResultInfo( data );
}
std::string ResultInfoBuilder::reconstructExpression() const {
if( m_op == "" || m_isNot )
return m_lhs.empty() ? m_expr : m_op + m_lhs;
if( m_op == "" )
return m_lhs.empty() ? m_data.capturedExpression : m_op + m_lhs;
else if( m_op == "matches" )
return m_lhs + " " + m_rhs;
else if( m_op != "!" )
{
else if( m_op != "!" ) {
if( m_lhs.size() + m_rhs.size() < 30 )
return m_lhs + " " + m_op + " " + m_rhs;
else if( m_lhs.size() < 70 && m_rhs.size() < 70 )
@@ -97,7 +94,7 @@ namespace Catch {
return "\n" + m_lhs + "\n" + m_op + "\n" + m_rhs + "\n\n";
}
else
return "{can't expand - use " + m_data.macroName + "_FALSE( " + m_expr.substr(1) + " ) instead of " + m_data.macroName + "( " + m_expr + " ) for better diagnostics}";
return "{can't expand - use " + m_data.macroName + "_FALSE( " + m_data.capturedExpression.substr(1) + " ) instead of " + m_data.macroName + "( " + m_data.capturedExpression + " ) for better diagnostics}";
}
} // end namespace Catch