ResultInfo -> AssertionResult filenames and variables

include/internal/catch_assertionresult.hpp

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED
 
-#include "catch_resultinfo.h"
+#include "catch_assertionresult.h"
 
 namespace Catch {
 

include/internal/catch_assertionresult_builder.h

@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_ASSERTIONRESULT_BUILDER_H_INCLUDED
 
 #include "catch_tostring.hpp"
-#include "catch_resultinfo.h"
+#include "catch_assertionresult.h"
 #include "catch_result_type.h"
 #include "catch_evaluate.hpp"
 #include "catch_common.h"

include/internal/catch_assertionresult_builder.hpp

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_ASSERTIONRESULT_BUILDER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_ASSERTIONRESULT_BUILDER_HPP_INCLUDED
 
-#include "catch_resultinfo_builder.h"
+#include "catch_assertionresult_builder.h"
 
 namespace Catch {
 

include/internal/catch_expression.hpp

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_EXPRESSION_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_EXPRESSION_HPP_INCLUDED
 
-#include "catch_resultinfo_builder.h"
+#include "catch_assertionresult_builder.h"
 #include "catch_evaluate.hpp"
 
 namespace Catch {

include/internal/catch_expression_builder.hpp

@@ -9,9 +9,9 @@
 #define TWOBLUECUBES_CATCH_EXPRESSION_BUILDER_HPP_INCLUDED
 
 #include "catch_expression.hpp"
-#include "catch_resultinfo_builder.h"
+#include "catch_assertionresult_builder.h"
 #include "catch_tostring.hpp"
-#include "catch_resultinfo.h"
+#include "catch_assertionresult.h"
 #include "catch_result_type.h"
 #include "catch_context.h"
 #include "catch_common.h"

include/internal/catch_impl.hpp

@@ -22,8 +22,8 @@
 #include "catch_context_impl.hpp"
 #include "catch_console_colour_impl.hpp"
 #include "catch_generators_impl.hpp"
-#include "catch_resultinfo.hpp"
-#include "catch_resultinfo_builder.hpp"
+#include "catch_assertionresult.hpp"
+#include "catch_assertionresult_builder.hpp"
 #include "catch_test_case_info.hpp"
 #include "catch_tags.hpp"
 

include/internal/catch_interfaces_capture.h

@@ -36,7 +36,7 @@ namespace Catch {
         
         virtual ResultAction::Value acceptResult( bool result ) = 0;
         virtual ResultAction::Value acceptResult( ResultWas::OfType result ) = 0;
-        virtual ResultAction::Value acceptExpression( const AssertionResultBuilder& resultInfo ) = 0;
+        virtual ResultAction::Value acceptExpression( const AssertionResultBuilder& assertionResult ) = 0;
         virtual void acceptMessage( const std::string& msg ) = 0;
         
         virtual std::string getCurrentTestName() const = 0;        

include/internal/catch_runner_impl.hpp

@@ -140,8 +140,8 @@ namespace Catch {
             return actOnCurrentResult();
         }
 
-        virtual ResultAction::Value acceptExpression( const AssertionResultBuilder& resultInfo ) {
-            m_currentResult = resultInfo;
+        virtual ResultAction::Value acceptExpression( const AssertionResultBuilder& assertionResult ) {
+            m_currentResult = assertionResult;
             return actOnCurrentResult();
         }