mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-13 01:19:54 +01:00
ce612bf656
commit2a1e8bfc6e
Author: Phil Nash <github@philnash.me> Date: Thu Nov 1 08:16:15 2012 +0000 Updated colour comments commitf0f407fc3e
Author: Phil Nash <github@philnash.me> Date: Wed Oct 31 18:28:21 2012 +0000 Manually applied merge #133 from Master commit355b95fda1
Author: Phil Nash <github@philnash.me> Date: Wed Oct 31 18:04:22 2012 +0000 Cleaned up ANSI colour code impl a bit commit778f9c4fc7
Author: Phil Nash <github@philnash.me> Date: Tue Oct 30 09:09:30 2012 +0000 Removed "no-" from Wno-global-constructors when disabling commit5efa4bcb8a
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 20:49:22 2012 +0000 Regenerated single_include commit108f1937d8
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 20:46:45 2012 +0000 Added terminal colour codes for POSIX With thanks to Adam Strzelecki commit8f4cc541d5
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 19:55:34 2012 +0000 Added regression test baselines commit2e203a1834
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 19:55:13 2012 +0000 Fixed remaining reporting regressions commit134e45b3ad
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 20:57:21 2012 +0000 Fixed #132 commit2f92db9898
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 12:15:34 2012 +0000 Updated the readme specifically for the Integration branch commit82acc2ca05
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 12:07:17 2012 +0000 Regenerated single include commitfe1d7c1d08
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 10:27:44 2012 +0000 Small fixes and tweaks commit355b5e546d
Author: Phil Nash <github@philnash.me> Date: Fri Oct 26 09:05:36 2012 +0100 Some tidy-up commitf847186ebb
Author: Phil Nash <github@philnash.me> Date: Fri Oct 26 08:45:23 2012 +0100 AssertionResultBuilder -> ExpressionResultBuilder commit8cca2f1369
Author: Phil Nash <github@philnash.me> Date: Wed Oct 24 22:09:01 2012 +0100 ExpressionBuilder ->ExpressionDecomposer Expression -> ExpressionLhs commite04e74f896
Author: Phil Nash <github@philnash.me> Date: Wed Oct 24 21:59:47 2012 +0100 More AssertionResult refactoring commit1dd56d4d2b
Author: Phil Nash <github@philnash.me> Date: Fri Oct 19 08:01:34 2012 +0100 AssertionResultBuilder can be constructed from result type commitf2d5f1b3e4
Author: Phil Nash <github@philnash.me> Date: Fri Oct 19 08:01:05 2012 +0100 Expression has its own result builder - not passed in from expression builder commite3b111a39a
Author: Phil Nash <github@philnash.me> Date: Thu Oct 18 22:59:16 2012 +0100 streamlined acceptResult commit3ad13256e1
Author: Phil Nash <github@philnash.me> Date: Thu Oct 18 08:39:44 2012 +0100 Refactored assertion builder stuff out of expression builder commitc96f9330a0
Author: Phil Nash <github@philnash.me> Date: Wed Oct 17 08:14:22 2012 +0100 Collect assertion info up front commita5fa78284d
Author: Phil Nash <github@philnash.me> Date: Tue Oct 16 08:33:13 2012 +0100 ResultData -> AssertionResultData commitc597a893fa
Author: Phil Nash <github@philnash.me> Date: Tue Oct 16 08:31:05 2012 +0100 ResultInfo -> AssertionResult filenames and variables commitd16955f63a
Author: Phil Nash <github@philnash.me> Date: Tue Oct 16 08:27:21 2012 +0100 Renamed ResultInfo -> AssertionResult commit175da3ef64
Author: Phil Nash <github@philnash.me> Date: Fri Oct 12 18:39:22 2012 +0100 regen test 3
150 lines
4.6 KiB
C++
150 lines
4.6 KiB
C++
/*
|
|
* Created by Phil on 25/2/2012.
|
|
* Copyright 2012 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_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
|
|
#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
|
|
|
|
#include "catch_console_colour.hpp"
|
|
|
|
#if defined( CATCH_CONFIG_USE_ANSI_COLOUR_CODES )
|
|
|
|
#include <unistd.h>
|
|
|
|
namespace Catch {
|
|
|
|
// use POSIX/ ANSI console terminal codes
|
|
// Implementation contributed by Adam Strzelecki (http://github.com/nanoant)
|
|
// https://github.com/philsquared/Catch/pull/131
|
|
|
|
TextColour::TextColour( Colours colour ) {
|
|
if( colour )
|
|
set( colour );
|
|
}
|
|
|
|
TextColour::~TextColour() {
|
|
set( TextColour::None );
|
|
}
|
|
|
|
namespace { const char colourEscape = '\033'; }
|
|
|
|
void TextColour::set( Colours colour ) {
|
|
if( isatty( fileno(stdout) ) ) {
|
|
switch( colour ) {
|
|
case TextColour::FileName:
|
|
std::cout << colourEscape << "[0m"; // white/ normal
|
|
break;
|
|
case TextColour::ResultError:
|
|
std::cout << colourEscape << "[1;31m"; // bold red
|
|
break;
|
|
case TextColour::ResultSuccess:
|
|
std::cout << colourEscape << "[1;32m"; // bold green
|
|
break;
|
|
case TextColour::Error:
|
|
std::cout << colourEscape << "[0;31m"; // red
|
|
break;
|
|
case TextColour::Success:
|
|
std::cout << colourEscape << "[0;32m"; // green
|
|
break;
|
|
case TextColour::OriginalExpression:
|
|
std::cout << colourEscape << "[0;36m"; // cyan
|
|
break;
|
|
case TextColour::ReconstructedExpression:
|
|
std::cout << colourEscape << "[0;33m"; // yellow
|
|
break;
|
|
case TextColour::None:
|
|
std::cout << colourEscape << "[0m"; // reset
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace Catch
|
|
|
|
#elif defined ( CATCH_PLATFORM_WINDOWS )
|
|
|
|
#include <windows.h>
|
|
|
|
namespace Catch {
|
|
|
|
namespace {
|
|
|
|
WORD mapConsoleColour( TextColour::Colours colour ) {
|
|
switch( colour ) {
|
|
case TextColour::FileName:
|
|
return FOREGROUND_INTENSITY; // greyed out
|
|
case TextColour::ResultError:
|
|
return FOREGROUND_RED | FOREGROUND_INTENSITY; // bright red
|
|
case TextColour::ResultSuccess:
|
|
return FOREGROUND_GREEN | FOREGROUND_INTENSITY; // bright green
|
|
case TextColour::Error:
|
|
return FOREGROUND_RED; // dark red
|
|
case TextColour::Success:
|
|
return FOREGROUND_GREEN; // dark green
|
|
case TextColour::OriginalExpression:
|
|
return FOREGROUND_BLUE | FOREGROUND_GREEN; // turquoise
|
|
case TextColour::ReconstructedExpression:
|
|
return FOREGROUND_RED | FOREGROUND_GREEN; // greeny-yellow
|
|
default: return 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ConsoleColourImpl {
|
|
|
|
ConsoleColourImpl()
|
|
: hStdout( GetStdHandle(STD_OUTPUT_HANDLE) ),
|
|
wOldColorAttrs( 0 )
|
|
{
|
|
GetConsoleScreenBufferInfo( hStdout, &csbiInfo );
|
|
wOldColorAttrs = csbiInfo.wAttributes;
|
|
}
|
|
|
|
~ConsoleColourImpl() {
|
|
SetConsoleTextAttribute( hStdout, wOldColorAttrs );
|
|
}
|
|
|
|
void set( TextColour::Colours colour ) {
|
|
WORD consoleColour = mapConsoleColour( colour );
|
|
if( consoleColour > 0 )
|
|
SetConsoleTextAttribute( hStdout, consoleColour );
|
|
}
|
|
|
|
HANDLE hStdout;
|
|
CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
|
|
WORD wOldColorAttrs;
|
|
};
|
|
|
|
TextColour::TextColour( Colours colour )
|
|
: m_impl( new ConsoleColourImpl() )
|
|
{
|
|
if( colour )
|
|
m_impl->set( colour );
|
|
}
|
|
|
|
TextColour::~TextColour() {
|
|
delete m_impl;
|
|
}
|
|
|
|
void TextColour::set( Colours colour ) {
|
|
m_impl->set( colour );
|
|
}
|
|
|
|
} // end namespace Catch
|
|
|
|
#else
|
|
|
|
namespace Catch {
|
|
|
|
TextColour::TextColour( Colours ){}
|
|
TextColour::~TextColour(){}
|
|
void TextColour::set( Colours ){}
|
|
|
|
} // end namespace Catch
|
|
|
|
#endif
|
|
|
|
#endif // TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
|