Added an hr() method to draw horizontal line separators and changed the output alignment.

nigel.stanger / sqlmarker

Browse code Added an hr() method to draw horizontal line separators and changed the output alignment. master
1 parent 2a72d8e commit a5394cdbe64b6d30214bbeb0e2bddc0ac60b4703 Nigel Stanger authored on 23 Jul 2013

Patch

Showing 3 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) 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 ( $count > 1 ) ? $manyText : $oneText; } public function setVerbosity( $newVerbosity ) { $this->verbosity = $newVerbosity; } public function getVerbosity() { return $this->verbosity; } /** * $reportText 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 / public function report( $statusText, $reportText, $printfArguments ) { if ( $this->verbosity ) vprintf( $statusText . $reportText, $printfArguments ); } 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 ( $count > 1 ) ? $manyText : $oneText; } public function setVerbosity( $newVerbosity ) { $this->verbosity = $newVerbosity; } public function getVerbosity() { return $this->verbosity; } /* * $reportText 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 */ public function report( $statusText, $reportText, $printfArguments ) { if ( $this->verbosity ) vprintf( $statusText . $reportText, $printfArguments ); } } ?>

Ignore Space Show notes View

Unit_testing/Reporter.php

<?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 ( $count > 1 ) ? $manyText : $oneText;
	}
	
	public function setVerbosity( $newVerbosity )
	{
		$this->verbosity = $newVerbosity;
	}
	
	public function getVerbosity()
	{
		return $this->verbosity;
	}
	
	/**
	 *	$reportText 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
	 */
	public function report( $statusText, $reportText, $printfArguments )
	{
		if ( $this->verbosity ) vprintf( $statusText . $reportText, $printfArguments );
	}
	
	abstract public function hr();
}

<?php

Ignore Space Show notes View Unit_testing/Reporter/HTMLReporter.php
<?php require_once 'Reporter.php'; class HTMLReporter extends Reporter { public function report( $status, $reportText, $printfArguments ) { if ( $this->getVerbosity() ) { $statusText = '<p class="blackboard"><span'; switch ( $status ) { case Reporter::STATUS_PASS: $statusText .= ' style="color: green;">✔ '; break; case Reporter::STATUS_SKIPPED: $statusText .= ' style="padding-left: 2em;"># '; break; case Reporter::STATUS_INCOMPLETE: $statusText .= ' style="background-color: yellow;">% '; break; case Reporter::STATUS_FAILURE: $statusText .= ' style="color: red;">✘ '; break; case Reporter::STATUS_ERROR: $statusText .= ' style="color: red;">☠ '; break; case Reporter::STATUS_WARNING: $statusText .= ' style="color: orange;">⚠ '; break; case Reporter::STATUS_NOTE: $statusText .= ' style="background-color: yellow;">⚠ '; break; default: case Reporter::STATUS_TEST: $statusText .= ' style="font-weight: bold;">'; break; default: $statusText .= ' style="background-color: yellow;">? '; break; } if ( $this->getVerbosity() > 1 ) $statusText .= "<strong>" . ucfirst( strtolower( $status ) ) . ':</strong> '; parent::report( $statusText, $reportText . "</span></p>\n", $printfArguments ); } } public function hr() { echo "<hr />\n"; } } ?> <?php require_once 'Reporter.php'; class HTMLReporter extends Reporter { public function report( $status, $reportText, $printfArguments ) { if ( $this->getVerbosity() ) { $statusText = '<p><span'; switch ( $status ) { case Reporter::STATUS_PASS: $statusText .= ' style="color: green; padding-left: 2em;">✔ '; break; case Reporter::STATUS_SKIPPED: $statusText .= ' style="padding-left: 2em;"># '; break; case Reporter::STATUS_INCOMPLETE: $statusText .= ' style="background-color: yellow; padding-left: 2em;">% '; break; case Reporter::STATUS_FAILURE: $statusText .= ' style="color: red; padding-left: 2em;">✘ '; break; case Reporter::STATUS_ERROR: $statusText .= ' style="color: red; padding-left: 2em;">☠ '; break; case Reporter::STATUS_WARNING: $statusText .= ' style="color: orange; padding-left: 2em;">⚠ '; break; case Reporter::STATUS_NOTE: $statusText .= ' style="background-color: yellow; padding-left: 2em;">⚠ '; break; default: case Reporter::STATUS_TEST: $statusText .= ' style="font-weight: bold; font-size: large;">'; break; default: $statusText .= ' style="background-color: yellow; padding-left: 2em;">? '; break; } if ( $this->getVerbosity() > 1 ) $statusText .= "<strong>" . ucfirst( strtolower( $status ) ) . ':</strong> '; parent::report( $statusText, $reportText . "</span></p>\n", $printfArguments ); } } } ?>

Ignore Space Show notes View

Unit_testing/Reporter/HTMLReporter.php

<?php
require_once 'Reporter.php';

class HTMLReporter extends Reporter
{
	public function report( $status, $reportText, $printfArguments )
	{
		if ( $this->getVerbosity() )
		{
			$statusText = '<span';
			switch ( $status )
			{
				case Reporter::STATUS_PASS:
					$statusText .= ' style="color: green;">✔ ';
					break;
				case Reporter::STATUS_SKIPPED:
					$statusText .= ' style="padding-left: 2em;"># ';
					break;
				case Reporter::STATUS_INCOMPLETE:
					$statusText .= ' style="background-color: yellow;">% ';
					break;
				case Reporter::STATUS_FAILURE:
					$statusText .= ' style="color: red;">✘ ';
					break;
				case Reporter::STATUS_ERROR:
					$statusText .= ' style="color: red;">☠ ';
					break;
				case Reporter::STATUS_WARNING:
					$statusText .= ' style="color: orange;">⚠ ';
					break;
				case Reporter::STATUS_NOTE:
					$statusText .= ' style="background-color: yellow;">⚠ ';
					break;
				default:
				case Reporter::STATUS_TEST:
					$statusText .= ' style="font-weight: bold;">';
					break;
				default:
					$statusText .= ' style="background-color: yellow;">? ';
					break;
			}
			if ( $this->getVerbosity() > 1 ) $statusText .= "" . ucfirst( strtolower( $status ) ) . ': ';
			
			parent::report( $statusText, $reportText . "\n", $printfArguments );
		}
	}
	
	public function hr()
	{
		echo "<hr />\n";
	}
}

<?php
require_once 'Reporter.php';

class HTMLReporter extends Reporter
{
	public function report( $status, $reportText, $printfArguments )
	{
		if ( $this->getVerbosity() )
		{
			$statusText = '<span';
			switch ( $status )
			{
				case Reporter::STATUS_PASS:
					$statusText .= ' style="color: green; padding-left: 2em;">✔ ';
					break;
				case Reporter::STATUS_SKIPPED:
					$statusText .= ' style="padding-left: 2em;"># ';
					break;
				case Reporter::STATUS_INCOMPLETE:
					$statusText .= ' style="background-color: yellow; padding-left: 2em;">% ';
					break;
				case Reporter::STATUS_FAILURE:
					$statusText .= ' style="color: red; padding-left: 2em;">✘ ';
					break;
				case Reporter::STATUS_ERROR:
					$statusText .= ' style="color: red; padding-left: 2em;">☠ ';
					break;
				case Reporter::STATUS_WARNING:
					$statusText .= ' style="color: orange; padding-left: 2em;">⚠ ';
					break;
				case Reporter::STATUS_NOTE:
					$statusText .= ' style="background-color: yellow; padding-left: 2em;">⚠ ';
					break;
				default:
				case Reporter::STATUS_TEST:
					$statusText .= ' style="font-weight: bold; font-size: large;">';
					break;
				default:
					$statusText .= ' style="background-color: yellow; padding-left: 2em;">? ';
					break;
			}
			if ( $this->getVerbosity() > 1 ) $statusText .= "" . ucfirst( strtolower( $status ) ) . ': ';
			
			parent::report( $statusText, $reportText . "\n", $printfArguments );
		}
	}
}

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 ) { if ( $this->getVerbosity() ) { $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: $statusText .= '!!! '; break; case Reporter::STATUS_TEST: break; default: $statusText .= '??? '; break; } if ( $this->getVerbosity() > 1 ) $statusText .= $status . ': '; parent::report( $statusText, $reportText . "\n", $printfArguments ); } } public function hr() { echo "------------------------------------------------------------\n"; } } ?> <?php require_once 'Reporter.php'; class TextReporter extends Reporter { public function report ( $status, $reportText, $printfArguments ) { if ( $this->getVerbosity() ) { $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: $statusText .= ' !!! '; break; case Reporter::STATUS_TEST: break; default: $statusText .= '??? '; break; } if ( $this->getVerbosity() > 1 ) $statusText .= $status . ': '; parent::report( $statusText, $reportText . "\n", $printfArguments ); } } } ?>

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 )
	{
		if ( $this->getVerbosity() )
		{
			$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:
					$statusText .= '!!! ';
					break;
				case Reporter::STATUS_TEST:
					break;
				default:
					$statusText .= '??? ';
					break;
			}
			if ( $this->getVerbosity() > 1 ) $statusText .= $status . ': ';
			
			parent::report( $statusText, $reportText . "\n", $printfArguments );
		}
	}
	
	public function hr()
	{
		echo "------------------------------------------------------------\n";
	}
}

<?php
require_once 'Reporter.php';

class TextReporter extends Reporter
{
	public function report ( $status, $reportText, $printfArguments )
	{
		if ( $this->getVerbosity() )
		{
			$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:
					$statusText .= '    !!! ';
					break;
				case Reporter::STATUS_TEST:
					break;
				default:
					$statusText .= '??? ';
					break;
			}
			if ( $this->getVerbosity() > 1 ) $statusText .= $status . ': ';
			
			parent::report( $statusText, $reportText . "\n", $printfArguments );
		}
	}
}

Show line notes below