mirror of https://github.com/catchorg/Catch2.git
Random bits of clean-up
This commit is contained in:
parent
9e7e63c687
commit
4104fb735e
|
@ -40,7 +40,7 @@ namespace Catch {
|
|||
m_isNot( isNot )
|
||||
{
|
||||
if( isNot )
|
||||
m_expr = "!" + m_expr;
|
||||
m_expr = "!(" + m_expr + ")";
|
||||
}
|
||||
|
||||
ResultInfo::~ResultInfo() {}
|
||||
|
|
|
@ -38,16 +38,10 @@ public:
|
|||
void setOp( const std::string& op );
|
||||
|
||||
template<typename RhsT>
|
||||
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator ||
|
||||
(
|
||||
const RhsT&
|
||||
);
|
||||
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( const RhsT& );
|
||||
|
||||
template<typename RhsT>
|
||||
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator &&
|
||||
(
|
||||
const RhsT&
|
||||
);
|
||||
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( const RhsT& );
|
||||
|
||||
private:
|
||||
friend class ExpressionBuilder;
|
||||
|
|
|
@ -112,14 +112,6 @@ namespace Catch {
|
|||
m_tags.insert( std::make_pair( tag.getName(), tag ) );
|
||||
}
|
||||
|
||||
// needed?
|
||||
Tag find( const std::string& name ) const {
|
||||
TagMap::const_iterator it = m_tags.find( name );
|
||||
if( it == m_tags.end() )
|
||||
return Tag();
|
||||
else
|
||||
return it->second;
|
||||
}
|
||||
bool empty() const {
|
||||
return m_tags.empty();
|
||||
}
|
||||
|
|
|
@ -39,14 +39,6 @@ struct TestDef {
|
|||
|
||||
};
|
||||
|
||||
//TEST( "./succeeding/conditions/equality" + Description("nyaya") )
|
||||
//{
|
||||
// TEST_CASE( [Name("inner")] )
|
||||
// {
|
||||
//
|
||||
// }
|
||||
//}
|
||||
|
||||
// The "failing" tests all use the CHECK macro, which continues if the specific test fails.
|
||||
// This allows us to see all results, even if an earlier check fails
|
||||
|
||||
|
|
|
@ -304,3 +304,12 @@ TEST_CASE( "first tag", "[tag1]" )
|
|||
TEST_CASE( "second tag", "[tag2]" )
|
||||
{
|
||||
}
|
||||
|
||||
TEST_CASE( "spawn a new process", "[hide]" )
|
||||
{
|
||||
// !TBD Work in progress
|
||||
char line[200];
|
||||
FILE* output = popen("./CatchSelfTest ./failing/matchers/StartsWith", "r");
|
||||
while ( fgets(line, 199, output) )
|
||||
std::cout << line;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue