This is both a really big and a really small commit. It is small in
that it only contains renaming, moving and modification of include
directives caused by this.
It is really big in the obvious way of touching something like 200
files.
The new rules for naming files is simple: headers use the `.hpp`
extension. The rules for physical file layout is still kinda in
progress, but the basics are also simple:
* Significant parts of functionality get their own subfolder
* Benchmarking is in `catch2/benchmark`
* Matchers are in `catch2/matchers`
* Generators are in `catch2/generators`
* Reporters are in `catch2/reporters`
* Baseline testing facilities are in `catch2/`
* Various top level folders also contain `internal` subfolder,
with files that users probably do not want to include directly,
at least not until they have to write something like their own
reporter.
* The exact files in these subfolders is likely to change later
on
Note that while some includes were cleaned up in this commit, it
is only the low hanging fruit and further cleanup using automatic
tooling will happen later.
Also note that various include guards, copyright notices and file
headers will also be standardized later, rather than in this commit.
89 lines
2.7 KiB
C++
89 lines
2.7 KiB
C++
/*
|
|
* Created by Phil on 8/8/2017.
|
|
* Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
|
|
*
|
|
* Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
*/
|
|
#ifndef TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
|
|
#define TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
|
|
|
|
#include <catch2/catch_assertion_info.hpp>
|
|
#include <catch2/internal/catch_decomposer.hpp>
|
|
#include <catch2/interfaces/catch_interfaces_capture.hpp>
|
|
|
|
namespace Catch {
|
|
|
|
struct TestFailureException{};
|
|
struct AssertionResultData;
|
|
struct IResultCapture;
|
|
class RunContext;
|
|
|
|
class LazyExpression {
|
|
friend class AssertionHandler;
|
|
friend struct AssertionStats;
|
|
friend class RunContext;
|
|
|
|
ITransientExpression const* m_transientExpression = nullptr;
|
|
bool m_isNegated;
|
|
public:
|
|
LazyExpression( bool isNegated );
|
|
LazyExpression( LazyExpression const& other );
|
|
LazyExpression& operator = ( LazyExpression const& ) = delete;
|
|
|
|
explicit operator bool() const;
|
|
|
|
friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
|
|
};
|
|
|
|
struct AssertionReaction {
|
|
bool shouldDebugBreak = false;
|
|
bool shouldThrow = false;
|
|
};
|
|
|
|
class AssertionHandler {
|
|
AssertionInfo m_assertionInfo;
|
|
AssertionReaction m_reaction;
|
|
bool m_completed = false;
|
|
IResultCapture& m_resultCapture;
|
|
|
|
public:
|
|
AssertionHandler
|
|
( StringRef const& macroName,
|
|
SourceLineInfo const& lineInfo,
|
|
StringRef capturedExpression,
|
|
ResultDisposition::Flags resultDisposition );
|
|
~AssertionHandler() {
|
|
if ( !m_completed ) {
|
|
m_resultCapture.handleIncomplete( m_assertionInfo );
|
|
}
|
|
}
|
|
|
|
|
|
template<typename T>
|
|
void handleExpr( ExprLhs<T> const& expr ) {
|
|
handleExpr( expr.makeUnaryExpr() );
|
|
}
|
|
void handleExpr( ITransientExpression const& expr );
|
|
|
|
void handleMessage(ResultWas::OfType resultType, StringRef const& message);
|
|
|
|
void handleExceptionThrownAsExpected();
|
|
void handleUnexpectedExceptionNotThrown();
|
|
void handleExceptionNotThrownAsExpected();
|
|
void handleThrowingCallSkipped();
|
|
void handleUnexpectedInflightException();
|
|
|
|
void complete();
|
|
void setCompleted();
|
|
|
|
// query
|
|
auto allowThrows() const -> bool;
|
|
};
|
|
|
|
void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
|
|
|
|
} // namespace Catch
|
|
|
|
#endif // TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
|