• Added constants for verbosity levels. • Added debug verbosity level and status.

nigel.stanger / sqlmarker

Browse code • Added constants for verbosity levels. • Added debug verbosity level and status. master
1 parent c57571d commit 0090f8381e23904ba986986b8ff452c25ed34c09 Nigel Stanger authored on 12 Mar 2014

Patch

Showing 4 changed files

Ignore Space Show notes View Unit_testing/Reporter.php
<?php abstract class Reporter { // 0 == no output // 1 == brief output (students?) // 2 == verbose output (marking) // 3 == debug output const VERBOSITY_NONE = 0; const VERBOSITY_STUDENT = 1; const VERBOSITY_STAFF = 2; const VERBOSITY_DEBUG = 3; private $verbosity = self::VERBOSITY_NONE; const STATUS_PASS = 'PASSED'; const STATUS_SKIPPED = 'SKIPPED'; const STATUS_INCOMPLETE = 'INCOMPLETE'; const STATUS_FAILURE = 'FAILED'; const STATUS_ERROR = 'ERROR'; const STATUS_WARNING = 'WARNING'; const STATUS_NOTE = 'NOTE'; const STATUS_TEST = 'TEST'; const STATUS_DEBUG = 'DEBUG'; function __construct( $verbosity ) { $this->verbosity = $verbosity; } public static function pluralise( $count, $oneText, $manyText ) { return ( abs( $count ) !== 1 ) ? $manyText : $oneText; } public function setVerbosity( $newVerbosity ) { $this->verbosity = $newVerbosity; } public function getVerbosity() { return $this->verbosity; } /** * $statusText is one of: PASSED, FAILED, ERROR, INCOMPLETE, SKIPPED, WARNING, NOTE, MISC, ...? * $reportText is a printf-style string (although we actually use vprintf because of the array) * $printfArguments is an array of arguments to $reportText / abstract public function report( $statusText, $reportText, $printfArguments = null ); abstract public function hr(); } ?> <?php abstract class Reporter { // 0 == no output // 1 == brief output (students?) // 2 == verbose output (marking) private $verbosity = 0; const STATUS_PASS = 'PASSED'; const STATUS_SKIPPED = 'SKIPPED'; const STATUS_INCOMPLETE = 'INCOMPLETE'; const STATUS_FAILURE = 'FAILED'; const STATUS_ERROR = 'ERROR'; const STATUS_WARNING = 'WARNING'; const STATUS_NOTE = 'NOTE'; const STATUS_TEST = 'TEST'; function __construct( $verbosity ) { $this->verbosity = $verbosity; } public static function pluralise( $count, $oneText, $manyText ) { return ( abs( $count ) !== 1 ) ? $manyText : $oneText; } public function setVerbosity( $newVerbosity ) { $this->verbosity = $newVerbosity; } public function getVerbosity() { return $this->verbosity; } /* * $statusText is one of: PASSED, FAILED, ERROR, INCOMPLETE, SKIPPED, WARNING, NOTE, MISC, ...? * $reportText is a printf-style string (although we actually use vprintf because of the array) * $printfArguments is an array of arguments to $reportText */ abstract public function report( $statusText, $reportText, $printfArguments = null ); abstract public function hr(); } ?>

Ignore Space Show notes View

Unit_testing/Reporter.php

<?php

abstract class Reporter
{
	// 0 == no output
	// 1 == brief output (students?)
	// 2 == verbose output (marking)
	// 3 == debug output
	const VERBOSITY_NONE    = 0;
	const VERBOSITY_STUDENT = 1;
	const VERBOSITY_STAFF   = 2;
	const VERBOSITY_DEBUG   = 3;
	
	private $verbosity      = self::VERBOSITY_NONE;
	
	const STATUS_PASS		= 'PASSED';
	const STATUS_SKIPPED	= 'SKIPPED';
	const STATUS_INCOMPLETE	= 'INCOMPLETE';
	const STATUS_FAILURE	= 'FAILED';
	const STATUS_ERROR		= 'ERROR';
	const STATUS_WARNING	= 'WARNING';
	const STATUS_NOTE		= 'NOTE';
	const STATUS_TEST		= 'TEST';
	const STATUS_DEBUG      = 'DEBUG';
	
	function __construct( $verbosity )
	{
		$this->verbosity = $verbosity;
	}
	
	public static function pluralise( $count, $oneText, $manyText )
	{
		return ( abs( $count ) !== 1 ) ? $manyText : $oneText;
	}
	
	public function setVerbosity( $newVerbosity )
	{
		$this->verbosity = $newVerbosity;
	}
	
	public function getVerbosity()
	{
		return $this->verbosity;
	}
	
	/**
	 *	$statusText is one of: PASSED, FAILED, ERROR, INCOMPLETE, SKIPPED, WARNING, NOTE, MISC, ...?
	 *	$reportText is a printf-style string (although we actually use vprintf because of the array)
	 *	$printfArguments is an array of arguments to $reportText
	 */
	abstract public function report( $statusText, $reportText, $printfArguments = null );
	
	abstract public function hr();
}

<?php

abstract class Reporter
{
	// 0 == no output
	// 1 == brief output (students?)
	// 2 == verbose output (marking)
	private $verbosity = 0;
	
	const STATUS_PASS		= 'PASSED';
	const STATUS_SKIPPED	= 'SKIPPED';
	const STATUS_INCOMPLETE	= 'INCOMPLETE';
	const STATUS_FAILURE	= 'FAILED';
	const STATUS_ERROR		= 'ERROR';
	const STATUS_WARNING	= 'WARNING';
	const STATUS_NOTE		= 'NOTE';
	const STATUS_TEST		= 'TEST';
	
	function __construct( $verbosity )
	{
		$this->verbosity = $verbosity;
	}
	
	public static function pluralise( $count, $oneText, $manyText )
	{
		return ( abs( $count ) !== 1 ) ? $manyText : $oneText;
	}
	
	public function setVerbosity( $newVerbosity )
	{
		$this->verbosity = $newVerbosity;
	}
	
	public function getVerbosity()
	{
		return $this->verbosity;
	}
	
	/**
	 *	$statusText is one of: PASSED, FAILED, ERROR, INCOMPLETE, SKIPPED, WARNING, NOTE, MISC, ...?
	 *	$reportText is a printf-style string (although we actually use vprintf because of the array)
	 *	$printfArguments is an array of arguments to $reportText
	 */
	abstract public function report( $statusText, $reportText, $printfArguments = null );
	
	abstract public function hr();
}

Ignore Space Show notes View Unit_testing/Reporter/ANSIReporter.php
<?php require_once 'TextReporter.php'; require_once 'Util/ANSIColors.php'; class ANSIReporter extends TextReporter { private $ANSI; public function __construct( $verbosity ) { $this->ANSI = new ANSIColors(); parent::__construct( $verbosity ); } public function report ( $status, $reportText, $printfArguments = null ) { if ( ( $status === Reporter::STATUS_DEBUG ) && ( $this->getVerbosity() !== Reporter::VERBOSITY_DEBUG ) ) return; if ( $this->getVerbosity() > Reporter::VERBOSITY_NONE ) { $fg = null; $bg = null; switch ( $status ) { case Reporter::STATUS_PASS: $bg = 'green'; break; case Reporter::STATUS_INCOMPLETE: $bg = 'yellow'; break; case Reporter::STATUS_FAILURE: case Reporter::STATUS_ERROR: $fg = 'white'; $bg = 'red'; break; case Reporter::STATUS_WARNING: $bg = 'yellow'; break; case Reporter::STATUS_NOTE: case Reporter::STATUS_DEBUG: $bg = 'light_gray'; break; default: break; } fwrite( STDOUT, $this->ANSI->setColor( $fg, $bg ) ); parent::report( $status, $reportText . $this->ANSI->resetANSI(), $printfArguments ); } } } ?> <?php require_once 'TextReporter.php'; require_once 'Util/ANSIColors.php'; class ANSIReporter extends TextReporter { private $ANSI; public function __construct( $verbosity ) { $this->ANSI = new ANSIColors(); parent::__construct( $verbosity ); } public function report ( $status, $reportText, $printfArguments = null ) { if ( $this->getVerbosity() > 0 ) { $fg = null; $bg = null; switch ( $status ) { case Reporter::STATUS_PASS: $bg = 'green'; break; case Reporter::STATUS_INCOMPLETE: $bg = 'yellow'; break; case Reporter::STATUS_FAILURE: case Reporter::STATUS_ERROR: $fg = 'white'; $bg = 'red'; break; case Reporter::STATUS_WARNING: $bg = 'yellow'; break; case Reporter::STATUS_NOTE: $bg = 'light_gray'; break; default: break; } fwrite( STDOUT, $this->ANSI->setColor( $fg, $bg ) ); parent::report( $status, $reportText . $this->ANSI->resetANSI(), $printfArguments ); } } } ?>

Ignore Space Show notes View

Unit_testing/Reporter/ANSIReporter.php

<?php
require_once 'TextReporter.php';
require_once 'Util/ANSIColors.php';

class ANSIReporter extends TextReporter
{
    private $ANSI;
    
    public function __construct( $verbosity )
    {
        $this->ANSI = new ANSIColors();
        parent::__construct( $verbosity );
    }
    
	public function report ( $status, $reportText, $printfArguments = null )
	{
	    if ( ( $status === Reporter::STATUS_DEBUG ) && ( $this->getVerbosity() !== Reporter::VERBOSITY_DEBUG ) ) return;
	    
		if ( $this->getVerbosity() > Reporter::VERBOSITY_NONE )
		{
			$fg = null;
			$bg = null;
			switch ( $status )
			{
				case Reporter::STATUS_PASS:
					$bg = 'green';
					break;
				case Reporter::STATUS_INCOMPLETE:
					$bg = 'yellow';
					break;
				case Reporter::STATUS_FAILURE:
				case Reporter::STATUS_ERROR:
				    $fg = 'white';
					$bg = 'red';
					break;
				case Reporter::STATUS_WARNING:
					$bg = 'yellow';
					break;
				case Reporter::STATUS_NOTE:
				case Reporter::STATUS_DEBUG:
					$bg = 'light_gray';
					break;
				default:
					break;
			}
			
			fwrite( STDOUT, $this->ANSI->setColor( $fg, $bg ) );
			
			parent::report( $status, $reportText . $this->ANSI->resetANSI(), $printfArguments );
		}
	}
}

<?php
require_once 'TextReporter.php';
require_once 'Util/ANSIColors.php';

class ANSIReporter extends TextReporter
{
    private $ANSI;
    
    public function __construct( $verbosity )
    {
        $this->ANSI = new ANSIColors();
        parent::__construct( $verbosity );
    }
    
	public function report ( $status, $reportText, $printfArguments = null )
	{
		if ( $this->getVerbosity() > 0 )
		{
			$fg = null;
			$bg = null;
			switch ( $status )
			{
				case Reporter::STATUS_PASS:
					$bg = 'green';
					break;
				case Reporter::STATUS_INCOMPLETE:
					$bg = 'yellow';
					break;
				case Reporter::STATUS_FAILURE:
				case Reporter::STATUS_ERROR:
				    $fg = 'white';
					$bg = 'red';
					break;
				case Reporter::STATUS_WARNING:
					$bg = 'yellow';
					break;
				case Reporter::STATUS_NOTE:
					$bg = 'light_gray';
					break;
				default:
					break;
			}
			
			fwrite( STDOUT, $this->ANSI->setColor( $fg, $bg ) );
			
			parent::report( $status, $reportText . $this->ANSI->resetANSI(), $printfArguments );
		}
	}
}

Ignore Space Show notes View Unit_testing/Reporter/HTMLReporter.php
<?php require_once 'Reporter.php'; class HTMLReporter extends Reporter { private $output_stream; function __construct( $verbosity ) { $this->output_stream = fopen( 'php://output', 'w' ); parent::__construct( $verbosity ); } public function report( $status, $reportText, $printfArguments = null ) { if ( ( $status === Reporter::STATUS_DEBUG ) && ( $this->getVerbosity() !== Reporter::VERBOSITY_DEBUG ) ) return; if ( $this->getVerbosity() > Reporter::VERBOSITY_NONE ) { $statusText = '<p class="blackboard'; switch ( $status ) { case Reporter::STATUS_PASS: $statusText .= ' greenbg result"><span style="font-size: large">✔</span> '; break; case Reporter::STATUS_SKIPPED: $statusText .= '" style="padding-left: 2em;"><strong style="font-size: large">#</strong> '; break; case Reporter::STATUS_INCOMPLETE: $statusText .= ' yellow-ou result"><strong style="font-size: large">%</strong> '; break; case Reporter::STATUS_FAILURE: $statusText .= ' red-ou result""><span style="font-size: large">✘</span> '; break; case Reporter::STATUS_ERROR: $statusText .= ' red-ou result"><span style="font-size: large">☠</span> '; break; case Reporter::STATUS_WARNING: $statusText .= ' yellow-ou result"><span style="font-size: large">⚠</span> '; break; case Reporter::STATUS_NOTE: case Reporter::STATUS_DEBUG: $statusText .= ' grey-light result">'; break; default: case Reporter::STATUS_TEST: $statusText .= ' style="font-weight: bold;">'; break; default: $statusText .= ' yellow-ou result"><strong style="font-size: large">?</strong> '; break; } if ( $this->getVerbosity() > Reporter::VERBOSITY_STUDENT ) $statusText .= "<strong>" . ucfirst( strtolower( $status ) ) . ':</strong> '; $message = vsprintf( $statusText . $reportText . "</span></p>\n", $printfArguments ); fwrite( $this->output_stream, $message ); } } public function hr() { echo "<hr />\n"; } } ?> <?php require_once 'Reporter.php'; class HTMLReporter extends Reporter { private $output_stream; function __construct( $verbosity ) { $this->output_stream = fopen( 'php://output', 'w' ); parent::__construct( $verbosity ); } public function report( $status, $reportText, $printfArguments = null ) { if ( $this->getVerbosity() > 0 ) { $statusText = '<p class="blackboard'; switch ( $status ) { case Reporter::STATUS_PASS: $statusText .= ' greenbg result"><span style="font-size: large">✔</span> '; break; case Reporter::STATUS_SKIPPED: $statusText .= '" style="padding-left: 2em;"><strong style="font-size: large">#</strong> '; break; case Reporter::STATUS_INCOMPLETE: $statusText .= ' yellow-ou result"><strong style="font-size: large">%</strong> '; break; case Reporter::STATUS_FAILURE: $statusText .= ' red-ou result""><span style="font-size: large">✘</span> '; break; case Reporter::STATUS_ERROR: $statusText .= ' red-ou result"><span style="font-size: large">☠</span> '; break; case Reporter::STATUS_WARNING: $statusText .= ' yellow-ou result"><span style="font-size: large">⚠</span> '; break; case Reporter::STATUS_NOTE: $statusText .= ' grey-light result">'; break; default: case Reporter::STATUS_TEST: $statusText .= ' style="font-weight: bold;">'; break; default: $statusText .= ' yellow-ou result"><strong style="font-size: large">?</strong> '; break; } if ( $this->getVerbosity() > 1 ) $statusText .= "<strong>" . ucfirst( strtolower( $status ) ) . ':</strong> '; $message = vsprintf( $statusText . $reportText . "</span></p>\n", $printfArguments ); fwrite( $this->output_stream, $message ); } } public function hr() { echo "<hr />\n"; } } ?>

Ignore Space Show notes View

Unit_testing/Reporter/HTMLReporter.php

<?php
require_once 'Reporter.php';

class HTMLReporter extends Reporter
{
    private $output_stream;

<?php
require_once 'Reporter.php';

class HTMLReporter extends Reporter
{
    private $output_stream;

Ignore Space Show notes View Unit_testing/Reporter/TextReporter.php
<?php require_once 'Reporter.php'; class TextReporter extends Reporter { public function report ( $status, $reportText, $printfArguments = null ) { if ( ( $status === Reporter::STATUS_DEBUG ) && ( $this->getVerbosity() !== Reporter::VERBOSITY_DEBUG ) ) return; if ( $this->getVerbosity() > Reporter::VERBOSITY_NONE ) { $statusText = ''; switch ( $status ) { case Reporter::STATUS_PASS: $statusText .= '+++ '; break; case Reporter::STATUS_SKIPPED: $statusText .= '### '; break; case Reporter::STATUS_INCOMPLETE: $statusText .= '%%% '; break; case Reporter::STATUS_FAILURE: $statusText .= '--- '; break; case Reporter::STATUS_ERROR: $statusText .= 'XXX '; break; case Reporter::STATUS_WARNING: $statusText .= '!!! '; break; case Reporter::STATUS_NOTE: case Reporter::STATUS_TEST: case Reporter::STATUS_DEBUG: break; default: $statusText .= '??? '; break; } if ( $this->getVerbosity() > Reporter::VERBOSITY_STUDENT ) $statusText .= $status . ': '; $output = vsprintf( $statusText . $reportText . "\n", $printfArguments ); fwrite( STDOUT, $output ); } } public function hr() { echo "------------------------------------------------------------\n"; } } ?> <?php require_once 'Reporter.php'; class TextReporter extends Reporter { public function report ( $status, $reportText, $printfArguments = null ) { if ( $this->getVerbosity() > 0 ) { $statusText = ''; switch ( $status ) { case Reporter::STATUS_PASS: $statusText .= '+++ '; break; case Reporter::STATUS_SKIPPED: $statusText .= '### '; break; case Reporter::STATUS_INCOMPLETE: $statusText .= '%%% '; break; case Reporter::STATUS_FAILURE: $statusText .= '--- '; break; case Reporter::STATUS_ERROR: $statusText .= 'XXX '; break; case Reporter::STATUS_WARNING: $statusText .= '!!! '; break; case Reporter::STATUS_NOTE: case Reporter::STATUS_TEST: break; default: $statusText .= '??? '; break; } if ( $this->getVerbosity() > 1 ) $statusText .= $status . ': '; $output = vsprintf( $statusText . $reportText . "\n", $printfArguments ); fwrite( STDOUT, $output ); } } public function hr() { echo "------------------------------------------------------------\n"; } } ?>

Ignore Space Show notes View

Unit_testing/Reporter/TextReporter.php

<?php
require_once 'Reporter.php';

class TextReporter extends Reporter
{
	public function report ( $status, $reportText, $printfArguments = null )
	{
	    if ( ( $status === Reporter::STATUS_DEBUG ) && ( $this->getVerbosity() !== Reporter::VERBOSITY_DEBUG ) ) return;
	    
		if ( $this->getVerbosity() > Reporter::VERBOSITY_NONE )
		{
			$statusText = '';
			switch ( $status )
			{
				case Reporter::STATUS_PASS:
					$statusText .= '+++ ';
					break;
				case Reporter::STATUS_SKIPPED:
					$statusText .= '### ';
					break;
				case Reporter::STATUS_INCOMPLETE:
					$statusText .= '%%% ';
					break;
				case Reporter::STATUS_FAILURE:
					$statusText .= '--- ';
					break;
				case Reporter::STATUS_ERROR:
					$statusText .= 'XXX ';
					break;
				case Reporter::STATUS_WARNING:
					$statusText .= '!!! ';
					break;
				case Reporter::STATUS_NOTE:
				case Reporter::STATUS_TEST:
				case Reporter::STATUS_DEBUG:
					break;
				default:
					$statusText .= '??? ';
					break;
			}
			if ( $this->getVerbosity() > Reporter::VERBOSITY_STUDENT ) $statusText .= $status . ': ';
			
		    $output = vsprintf( $statusText . $reportText . "\n", $printfArguments );
		    fwrite( STDOUT, $output );
		}
	}
	
	public function hr()
	{
		echo "------------------------------------------------------------\n";
	}
}

<?php
require_once 'Reporter.php';

class TextReporter extends Reporter
{
	public function report ( $status, $reportText, $printfArguments = null )
	{
		if ( $this->getVerbosity() > 0 )
		{
			$statusText = '';
			switch ( $status )
			{
				case Reporter::STATUS_PASS:
					$statusText .= '+++ ';
					break;
				case Reporter::STATUS_SKIPPED:
					$statusText .= '### ';
					break;
				case Reporter::STATUS_INCOMPLETE:
					$statusText .= '%%% ';
					break;
				case Reporter::STATUS_FAILURE:
					$statusText .= '--- ';
					break;
				case Reporter::STATUS_ERROR:
					$statusText .= 'XXX ';
					break;
				case Reporter::STATUS_WARNING:
					$statusText .= '!!! ';
					break;
				case Reporter::STATUS_NOTE:
				case Reporter::STATUS_TEST:
					break;
				default:
					$statusText .= '??? ';
					break;
			}
			if ( $this->getVerbosity() > 1 ) $statusText .= $status . ': ';
			
		    $output = vsprintf( $statusText . $reportText . "\n", $printfArguments );
		    fwrite( STDOUT, $output );
		}
	}
	
	public function hr()
	{
		echo "------------------------------------------------------------\n";
	}
}

Show line notes below