From e571e6f4a0566f584025ee42198931cf5f2f0cf5 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Fri, 24 Aug 2012 18:54:56 +0100
Subject: [PATCH] Can specify tests without -t. ex: is shorthand for exclude:

---
 include/internal/catch_commandline.hpp | 22 ++++++++++++++--------
 single_include/catch.hpp               | 22 ++++++++++++++--------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp
index 3b6c9f1f..b0b9f4ce 100644
--- a/include/internal/catch_commandline.hpp
+++ b/include/internal/catch_commandline.hpp
@@ -36,7 +36,7 @@ namespace Catch {
         }
         
         operator SafeBool::type() const {
-            return SafeBool::makeSafe( !m_name.empty() );
+            return SafeBool::makeSafe( !m_name.empty() || !m_args.empty() );
         }
         
         std::string name() const { return m_name; }
@@ -72,16 +72,19 @@ namespace Catch {
             return find( shortArg ) + find( longArg );
         }
         Command find( const std::string& arg ) const {
-            for( std::size_t i = 0; i < m_argc; ++i  )
+            for( std::size_t i = 1; i < m_argc; ++i  )
                 if( m_argv[i] == arg )
-                    return getArgs( i );
+                    return getArgs( m_argv[i], i+1 );
             return Command();
         }
-        
+        Command getDefaultArgs() const {
+            return getArgs( "", 1 );
+        }
+
     private:
-        Command getArgs( std::size_t from ) const {
-            Command command( m_argv[from] );
-            for( std::size_t i = from+1; i < m_argc && m_argv[i][0] != '-'; ++i  )
+        Command getArgs( const std::string& cmdName, std::size_t from ) const {
+            Command command( cmdName );
+            for( std::size_t i = from; i < m_argc && m_argv[i][0] != '-'; ++i  )
                 command += m_argv[i];
             return command;
         }
@@ -117,7 +120,7 @@ namespace Catch {
             }
         }
                             
-        if( Command cmd = parser.find( "-t", "--test" ) ) {
+        if( Command cmd = parser.find( "-t", "--test" ) + parser.getDefaultArgs() ) {
             if( cmd.argsCount() == 0 )
                 cmd.raiseError( "Expected at least one argument" );
             std::string groupName;
@@ -128,8 +131,11 @@ namespace Catch {
             }
             TestCaseFilters filters( groupName );
             for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
+                std::cout << "[" << cmd[i] << "]" << std::endl;
                 if( startsWith( cmd[i], "exclude:" ) )
                     filters.addFilter( TestCaseFilter( cmd[i].substr( 8 ), IfFilterMatches::ExcludeTests ) );
+                else if( startsWith( cmd[i], "ex:" ) )
+                    filters.addFilter( TestCaseFilter( cmd[i].substr( 3 ), IfFilterMatches::ExcludeTests ) );
                 else
                     filters.addFilter( TestCaseFilter( cmd[i] ) );
             }
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 05ff852a..07d2af59 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,5 +1,5 @@
 /*
- *  Generated: 2012-08-24 08:23:10.017875
+ *  Generated: 2012-08-24 18:54:08.754777
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -2499,7 +2499,7 @@ namespace Catch {
         }
 
         operator SafeBool::type() const {
-            return SafeBool::makeSafe( !m_name.empty() );
+            return SafeBool::makeSafe( !m_name.empty() || !m_args.empty() );
         }
 
         std::string name() const { return m_name; }
@@ -2535,16 +2535,19 @@ namespace Catch {
             return find( shortArg ) + find( longArg );
         }
         Command find( const std::string& arg ) const {
-            for( std::size_t i = 0; i < m_argc; ++i  )
+            for( std::size_t i = 1; i < m_argc; ++i  )
                 if( m_argv[i] == arg )
-                    return getArgs( i );
+                    return getArgs( m_argv[i], i+1 );
             return Command();
         }
+        Command getDefaultArgs() const {
+            return getArgs( "", 1 );
+        }
 
     private:
-        Command getArgs( std::size_t from ) const {
-            Command command( m_argv[from] );
-            for( std::size_t i = from+1; i < m_argc && m_argv[i][0] != '-'; ++i  )
+        Command getArgs( const std::string& cmdName, std::size_t from ) const {
+            Command command( cmdName );
+            for( std::size_t i = from; i < m_argc && m_argv[i][0] != '-'; ++i  )
                 command += m_argv[i];
             return command;
         }
@@ -2580,7 +2583,7 @@ namespace Catch {
             }
         }
 
-        if( Command cmd = parser.find( "-t", "--test" ) ) {
+        if( Command cmd = parser.find( "-t", "--test" ) + parser.getDefaultArgs() ) {
             if( cmd.argsCount() == 0 )
                 cmd.raiseError( "Expected at least one argument" );
             std::string groupName;
@@ -2591,8 +2594,11 @@ namespace Catch {
             }
             TestCaseFilters filters( groupName );
             for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
+                std::cout << "[" << cmd[i] << "]" << std::endl;
                 if( startsWith( cmd[i], "exclude:" ) )
                     filters.addFilter( TestCaseFilter( cmd[i].substr( 8 ), IfFilterMatches::ExcludeTests ) );
+                else if( startsWith( cmd[i], "ex:" ) )
+                    filters.addFilter( TestCaseFilter( cmd[i].substr( 3 ), IfFilterMatches::ExcludeTests ) );
                 else
                     filters.addFilter( TestCaseFilter( cmd[i] ) );
             }