? .DS_Store
? doc_fixes.patch
? garland_page_cleanup.patch
? module_revamp_3.patch
? simpletest_message_filtering_04.patch
? simpletest_replace_simpletest.patch
? taxonomy_vocab.patch
? modules/.DS_Store
? modules/simpletest/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/simpletest/default_reporter.php
===================================================================
RCS file: modules/simpletest/default_reporter.php
diff -N modules/simpletest/default_reporter.php
--- modules/simpletest/default_reporter.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
- 'case', 't' => 'test');
- protected $case = '';
- protected $test = '';
- protected $xml = false;
-
- function SimpleCommandLineParser($arguments) {
- if (!is_array($arguments)) {
- return;
- }
- foreach ($arguments as $i => $argument) {
- if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
- $this->{$this->_parseProperty($matches[1])} = $matches[2];
- }
- elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
- if (isset($arguments[$i + 1])) {
- $this->{$this->_parseProperty($matches[1])} = $arguments[$i + 1];
- }
- }
- elseif (preg_match('/^--?(xml|x)$/', $argument)) {
- $this->xml = true;
- }
- }
- }
- function _parseProperty($property) {
- if (isset($this->to_property[$property])) {
- return $this->to_property[$property];
- }
- else {
- return $property;
- }
- }
- function getTest() {
- return $this->test;
- }
-
- function getTestCase() {
- return $this->case;
- }
-
- function isXml() {
- return $this->xml;
- }
-}
-
-/**
- * The default reporter used by SimpleTest's autorun
- * feature. The actual reporters used are dependency
- * injected and can be overridden.
- */
-class DefaultReporter extends SimpleReporterDecorator {
- /**
- * Assembles the appopriate reporter for the environment.
- */
- function DefaultReporter() {
- if (SimpleReporter::inCli()) {
- global $argv;
- $parser = new SimpleCommandLineParser($argv);
- $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
- $reporter = &new SelectiveReporter(SimpleTest::preferred($interfaces), $parser->getTestCase(), $parser->getTest());
- }
- else {
- $reporter = &new SelectiveReporter(SimpleTest::preferred('HtmlReporter'), @$_GET['c'], @$_GET['t']);
- }
- $this->SimpleReporterDecorator($reporter);
- }
-}
Index: modules/simpletest/drupal_reporter.php
===================================================================
RCS file: modules/simpletest/drupal_reporter.php
diff -N modules/simpletest/drupal_reporter.php
--- modules/simpletest/drupal_reporter.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,257 +0,0 @@
-SimpleReporter();
- drupal_add_css(drupal_get_path('module', 'simpletest') .'/simpletest.css');
- $this->_character_set = $character_set;
- }
-
- /**
- * Paints the top of the web page setting the
- * title to the name of the starting test.
- * @param string $test_name Name class of test.
- * @access public
- **/
- function paintHeader($test_name) {
-
- }
-
- /**
- * Paints the end of the test with a summary of
- * the passes and failures.
- * @param string $test_name Name class of test.
- * @access public
- */
- function paintFooter($test_name) {
- $ok = ($this->getFailCount() + $this->getExceptionCount() == 0);
- $class = $ok ? 'simpletest-pass' : 'simpletest-fail';
- $this->writeContent('' . $this->getPassCount() . ' passes, ' . $this->getFailCount() . ' fails and ' . $this->getExceptionCount() . ' exceptions.');
- }
-
- /**
- * Paints the test passes
- * @param string $message Failure message displayed in
- * the context of the other tests.
- * @access public
- **/
- function paintPass($message, $group) {
- parent::paintPass($message);
- if ($group == 'Other') {
- $group = t($group);
- }
- $this->test_stack[] = array(
- 'data' => array($message, "[$group]", t('Pass'), theme('image', 'misc/watchdog-ok.png')),
- 'class' => 'simpletest-pass',
- );
- }
-
- /**
- * Paints the test failure with a breadcrumbs
- * trail of the nesting test suites below the
- * top level test.
- * @param string $message Failure message displayed in
- * the context of the other tests.
- * @access public
- */
- function paintFail($message, $group) {
- parent::paintFail($message);
- if ($group == 'Other') {
- $group = t($group);
- }
- $this->test_stack[] = array(
- 'data' => array($message, "[$group]", t('Fail'), theme('image', 'misc/watchdog-error.png')),
- 'class' => 'simpletest-fail',
- );
- }
-
-
- /**
- * Paints a PHP error or exception.
- * @param string $message Message is ignored.
- * @access public
- **/
- function paintError($message) {
- parent::paintError($message);
- $this->test_stack[] = array(
- 'data' => array($message, '[PHP]', t('Exception'), theme('image', 'misc/watchdog-warning.png')),
- 'class' => 'simpletest-exception',
- );
- }
-
- /**
- * Paints the start of a group test. Will also paint
- * the page header and footer if this is the
- * first test. Will stash the size if the first
- * start.
- * @param string $test_name Name of test that is starting.
- * @param integer $size Number of test cases starting.
- * @access public
- */
- function paintGroupStart($test_name, $size, $extra = '') {
- $this->_progress_stack[] = $this->_progress;
- $this->_progress = 0;
- $this->_exceptions_stack[] = $this->_exceptions;
- $this->_exceptions = 0;
- $this->_fails_stack[] = $this->_fails;
- $this->_fails = 0;
- $this->_passes_stack[] = $this->_passes;
- $this->_passes = 0;
- $this->form_depth[] = $test_name;
- $this->writeToLastField($this->form, array(
- '#type' => 'fieldset',
- '#title' => $test_name,
- '#weight' => $this->weight++,
- ), $this->form_depth);
-
- if (! isset($this->_size)) {
- $this->_size = $size;
- }
-
- if (($c = count($this->test_info_stack)) > 0) {
- $info = $this->test_info_stack[$c - 1];
- $this->writeContent('' . $info['name'] . ': ' . $info['description'], $this->getParentWeight() );
- }
-
- $this->_test_stack[] = $test_name;
- }
-
- function paintCaseStart($test_name) {
- $this->_progress++;
- $this->paintGroupStart($test_name, 1);
- }
-
-
- /**
- * Paints the end of a group test. Will paint the page
- * footer if the stack of tests has unwound.
- * @param string $test_name Name of test that is ending.
- * @param integer $progress Number of test cases ending.
- * @access public
- */
- function paintGroupEnd($test_name) {
- array_pop($this->_test_stack);
- $ok = ($this->getFailCount() + $this->getExceptionCount() == 0);
- $class = $ok ? "simpletest-pass" : "simpletest-fail";
- $parent_weight = $this->getParentWeight() - 0.5;
- /* Exception for the top groups, no subgrouping for singles */
- if (($this->_output_stack_id == 2) && ($this->_output_stack[$this->_output_stack_id]['size'] == 1)) {
- $this->writeContent(format_plural($this->getTestCaseProgress(), '1 test case complete: ', '@count test cases complete: '), -10);
- $parent_weight = $this->getParentWeight() - 0.5;
- $this->writeContent('' . $this->getPassCount() . ' passes, ' . $this->getFailCount() . ' fails and ' . $this->getExceptionCount() . ' exceptions.', $parent_weight, $class);
- array_pop($this->form_depth);
- }
- else {
- $collapsed = $ok ? TRUE : FALSE;
- if ($this->getTestCaseProgress()) {
- $this->writeContent(format_plural($this->getTestCaseProgress(), '1 test case complete: ', '@count test cases complete: '), -10);
- $use_grouping = FALSE;
- }
- else {
- $use_grouping = TRUE;
- }
- $write = array('#collapsible' => $use_grouping, '#collapsed' => $collapsed);
- $this->writeToLastField($this->form, $write, $this->form_depth);
- $this->writeContent('' . $this->getPassCount() . ' passes, ' . $this->getFailCount() . ' fails and ' . $this->getExceptionCount() . ' exceptions.', $parent_weight, $class);
- if (count($this->test_stack) != 0) {
- $this->writeContent(theme('table', array(), $this->test_stack));
- $this->test_stack = array();
- }
- array_pop($this->form_depth);
- }
-
- $this->_progress += array_pop($this->_progress_stack);
- $this->_exceptions += array_pop($this->_exceptions_stack);
- $this->_fails += array_pop($this->_fails_stack);
- $this->_passes += array_pop($this->_passes_stack);
- }
-
- function paintCaseEnd($test_name) {
- $this->paintGroupEnd($test_name);
- }
-
- /**
- * Could be extended to show more headers or whatever?
- **/
- function getOutput() {
- return drupal_get_form('unit_tests', $this);
- }
-
- /**
- * Recursive function that writes attr to the deepest array
- */
- function writeToLastField(&$form, $attr, $keys) {
- while(count($keys) != 0) {
- $value = array_shift($keys);
- if (isset($form[$value])) {
- if (count($keys) == 0) {
- $form[$value] += $attr;
- }
- else {
- $this->writeToLastField($form[$value], $attr, $keys);
- }
- $keys = array();
- }
- else {
- $form[$value] = $attr;
- }
- }
- }
-
- /**
- * writes $msg into the deepest fieldset
- * @param $msg content to write
- */
- function writeContent($msg, $weight = NULL, $class = 'simpletest') {
- if (!$weight) {
- $weight = $this->weight++;
- }
- $write['content'.$this->content_count++] = array(
- '#value' => '
' . $msg . '
',
- '#weight' => $weight,
- );
- $this->writeToLastField($this->form, $write, $this->form_depth);
- }
-
- /**
- * Retrieves weight of the currently deepest fieldset
- */
- function getParentWeight($form = NULL, $keys = NULL ) {
- if (!isset($form)) {
- $form = $this->form;
- }
- if (!isset($keys)) {
- $keys = $this->form_depth;
- }
- if(count($keys) != 0) {
- $value = array_shift($keys);
- return $this->getParentWeight($form[$value], $keys);
- }
- return $form['#weight'];
- }
-}
-
-function unit_tests($args, $reporter) {
- return $reporter->form['Drupal Unit Tests'];
-}
-?>
\ No newline at end of file
Index: modules/simpletest/drupal_test_case.php
===================================================================
RCS file: modules/simpletest/drupal_test_case.php
diff -N modules/simpletest/drupal_test_case.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/simpletest/drupal_test_case.php 29 Apr 2008 05:22:45 -0000
@@ -0,0 +1,92 @@
+test_stack[] = array(
+ 'status' => $status,
+ 'message' => $message,
+ 'group' => $group,
+ 'caller' => $function['function'],
+ 'line' => $function['line'],
+ 'file' => $function['file'],
+ );
+ }
+ protected function assertTrue($value, $message = '', $group = 'Other') {
+ $this->assert((bool) $value, $message, $group);
+ }
+ protected function assertFalse($value, $message = '', $group = 'Other') {
+ $this->assert(!((bool) $value), $message, $group);
+ }
+ protected function assertNull($value, $message = '', $group = 'Other') {
+ $this->assert(!isset($value), $message, $group);
+ }
+ protected function assertNotNull($value, $message = '', $group = 'Other') {
+ $this->assert(isset($value), $message, $group);
+ }
+ protected function assertEqual($first, $second, $message = '', $group = 'Other') {
+ $this->assert($first == $second, $message, $group);
+ }
+ protected function assertNotEqual($first, $second, $message = '', $group = 'Other') {
+ $this->assert($first != $second, $message, $group);
+ }
+ protected function assertIdentical($first, $second, $message = '', $group = 'Other') {
+ $this->assert($first === $second, $message, $group);
+ }
+ protected function assertNotIdentical($first, $second, $message = '', $group = 'Other') {
+ $this->assert($first !== $second, $message, $group);
+ }
+ protected function assertPattern($pattern, $subject, $message = '', $group = 'Other') {
+ $this->assert((bool) preg_match($pattern, $subject), $message, $group);
+ }
+ protected function assertNoPattern($pattern, $subject, $message = '', $group = 'Other') {
+ $this->assert(!((bool) preg_match($pattern, $subject)), $group);
+ }
+ function error($message, $type, $caller) {
+ $this->assert(SIMPLETEST_ASSERTION_ERROR, $message, $type, $caller);
+ }
+ function run() {
+ $this->setUp();
+ $methods = array();
+ foreach (get_class_methods(get_class($this)) as $method) {
+ if (strtolower(substr($method, 0, 4)) == 'test') {
+ $this->$method();
+ }
+ }
+ $this->tearDown();
+ return $this->test_stack;
+ }
+ protected function setUp() {
+ set_error_handler('simpletest_error_handler');
+ }
+ protected function tearDown() {
+ restore_error_handler();
+ }
+ protected function pass($message = NULL, $group = 'Other') {
+ $this->assert(TRUE, $message, $group);
+ }
+ protected function fail($message = NULL, $group = 'Other') {
+ $this->assert(FALSE, $message, $group);
+ }
+}
Index: modules/simpletest/drupal_test_suite.php
===================================================================
RCS file: modules/simpletest/drupal_test_suite.php
diff -N modules/simpletest/drupal_test_suite.php
--- modules/simpletest/drupal_test_suite.php 23 Apr 2008 17:49:50 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,147 +0,0 @@
-TestSuite($label);
- }
-
- /**
- * @return
- * An array of instantiated tests that this GroupTests holds.
- */
- function getTestInstances() {
- for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
- if (is_string($this->_test_cases[$i])) {
- $class = $this->_test_cases[$i];
- $this->_test_cases[$i] = &new $class();
- }
- }
- return $this->_test_cases;
- }
-}
-
-class DrupalTests extends DrupalTestSuite {
- /**
- * Constructor for the DrupalTests class.
- *
- * @param array $class_list
- * List containing the classes of tests to be processed,
- * defaults to process all tests.
- */
- function DrupalTests($class_list = NULL) {
- static $classes;
- $this->DrupalTestSuite('Drupal Unit Tests');
-
- // Tricky part to avoid double inclusion.
- if (!$classes) {
-
- $files = $this->getFiles();
-
- $existing_classes = get_declared_classes();
- foreach ($files as $file) {
- include_once($file);
- }
- $classes = array_diff(get_declared_classes(), $existing_classes);
- }
- if (!is_null($class_list)) {
- $classes = $class_list;
- }
- if (count($classes) == 0) {
- drupal_set_message('No test cases found.', 'error');
- return;
- }
- $groups = array();
- foreach ($classes as $class) {
- if ($this->classIsTest($class)) {
- $this->_addClassToGroups($groups, $class);
- }
- }
- foreach ($groups as $group_name => $group) {
- $group_test = &new DrupalTestSuite($group_name);
- foreach ($group as $key => $v) {
- $group_test->addTestCase($group[$key]);
- }
- $this->addTestCase($group_test);
- }
- }
-
- /**
- * Adds a class to a groups array specified by the getInfo() of the group.
- *
- * @param array $groups
- * Group of categorized tests.
- * @param string $class
- * Name of the class.
- */
- function _addClassToGroups(&$groups, $class) {
- $test = &new $class();
- if (method_exists($test, 'getInfo')) {
- $info = $test->getInfo();
- $groups[$info['group']][] = $test;
- }
- }
-
- /**
- * Invokes run() on all of the held test cases, instantiating
- * them if necessary.
- * The Drupal version uses paintHeader instead of paintGroupStart
- * to avoid collapsing of the very top level.
- *
- * @param SimpleReporter $reporter
- * Current test reporter.
- * @access public
- */
- function run(&$reporter) {
- @set_time_limit(0);
- ignore_user_abort(TRUE);
-
- $this->cleanupBeforeRun();
- $result = parent::run($reporter);
- return $result;
- }
-
- /**
- * Gets the files which contains the tests.
- *
- * @return
- * A list of files that contains the tests.
- */
- function getFiles() {
- $files = array();
- foreach (array_keys(module_rebuild_cache()) as $module) {
- $module_path = drupal_get_path('module', $module);
- $test = $module_path . "/$module.test";
- if (file_exists($test)) {
- $files[] = $test;
- }
- }
- return $files;
- }
-
- /**
- * Determines whether the class is a test.
- *
- * @return
- * TRUE / FALSE depending on whether the class is a test.
- */
- function classIsTest($class) {
- return is_subclass_of($class, 'DrupalWebTestCase');
- }
-
- /**
- * Called before the tests are run.
- */
- function cleanupBeforeRun() {
- cache_clear_all();
- // Disable devel output, check simpletest settings page.
- if (!variable_get('simpletest_devel', FALSE)) {
- $GLOBALS['devel_shutdown'] = FALSE;
- }
- }
-}
Index: modules/simpletest/drupal_unit_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_unit_test_case.php,v
retrieving revision 1.1
diff -u -p -r1.1 drupal_unit_test_case.php
--- modules/simpletest/drupal_unit_test_case.php 20 Apr 2008 18:34:43 -0000 1.1
+++ modules/simpletest/drupal_unit_test_case.php 29 Apr 2008 05:22:46 -0000
@@ -4,27 +4,12 @@
/**
* Test case Drupal unit tests.
*/
-class DrupalUnitTestCase extends UnitTestCase {
+class DrupalUnitTestCase extends DrupalTestCase {
protected $created_temp_environment = FALSE;
protected $db_prefix_original;
protected $original_file_directory;
/**
- * Retrieve the test information from getInfo().
- *
- * @param string $label Name of the test to be used by the SimpleTest library.
- */
- function __construct($label = NULL) {
- if (!$label) {
- if (method_exists($this, 'getInfo')) {
- $info = $this->getInfo();
- $label = $info['name'];
- }
- }
- parent::__construct($label);
- }
-
- /**
* Generates a random database prefix and runs the install scripts on the prefixed database.
* After installation many caches are flushed and the internal browser is setup so that the page
* requests will run on the new prefix. A temporary files directory is created with the same name
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.1
diff -u -p -r1.1 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php 20 Apr 2008 18:34:43 -0000 1.1
+++ modules/simpletest/drupal_web_test_case.php 29 Apr 2008 05:22:46 -0000
@@ -4,7 +4,7 @@
/**
* Test case for typical Drupal tests.
*/
-class DrupalWebTestCase extends UnitTestCase {
+class DrupalWebTestCase extends DrupalTestCase {
protected $_logged_in = FALSE;
protected $_content;
protected $plain_text;
@@ -19,21 +19,6 @@ class DrupalWebTestCase extends UnitTest
protected $original_file_directory;
/**
- * Retrieve the test information from getInfo().
- *
- * @param string $label Name of the test to be used by the SimpleTest library.
- */
- function __construct($label = NULL) {
- if (!$label) {
- if (method_exists($this, 'getInfo')) {
- $info = $this->getInfo();
- $label = $info['name'];
- }
- }
- parent::__construct($label);
- }
-
- /**
* Creates a node based on default settings.
*
* @param settings
@@ -401,19 +386,6 @@ class DrupalWebTestCase extends UnitTest
}
/**
- * Set necessary reporter info.
- */
- function run(&$reporter) {
- $arr = array('class' => get_class($this));
- if (method_exists($this, 'getInfo')) {
- $arr = array_merge($arr, $this->getInfo());
- }
- $reporter->test_info_stack[] = $arr;
- parent::run($reporter);
- array_pop($reporter->test_info_stack);
- }
-
- /**
* Initializes the cURL connection and gets a session cookie.
*
* This function will add authentaticon headers as specified in
Index: modules/simpletest/dumper.php
===================================================================
RCS file: modules/simpletest/dumper.php
diff -N modules/simpletest/dumper.php
--- modules/simpletest/dumper.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-getType($value);
- switch ($type) {
- case "Null":
- return "NULL";
-
- case "Bool":
- return "Boolean: ". ($value ? "true" : "false");
-
- case "Array":
- return "Array: ". count($value) ." items";
-
- case "Object":
- return "Object: of ". get_class($value);
-
- case "String":
- return "String: ". $this->clipString($value, 200);
-
- default:
- return "$type: $value";
- }
- }
-
- /**
- * Gets the string representation of a type.
- * @param mixed $value Variable to check against.
- * @return string Type.
- * @access public
- */
- function getType($value) {
- if (!isset($value)) {
- return "Null";
- }
- $functions = array('bool', 'string', 'integer', 'float', 'array', 'resource', 'object');
- foreach ($functions as $function) {
- $function_name = 'is_'. $function;
- if ($function_name($value)) {
- return ucfirst($function);
- }
- }
- return "Unknown";
- }
-
- /**
- * Clips a string to a maximum length.
- * @param string $value String to truncate.
- * @param integer $size Minimum string size to show.
- * @param integer $position Centre of string section.
- * @return string Shortened version.
- * @access public
- */
- function clipString($value, $size, $position = 0) {
- $length = strlen($value);
- if ($length <= $size) {
- return $value;
- }
- $position = min($position, $length);
- $start = ($size / 2 > $position ? 0 : $position - $size / 2);
- if ($start + $size > $length) {
- $start = $length - $size;
- }
- $value = substr($value, $start, $size);
- return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
- }
-}
Index: modules/simpletest/errors.php
===================================================================
RCS file: modules/simpletest/errors.php
diff -N modules/simpletest/errors.php
--- modules/simpletest/errors.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,240 +0,0 @@
-SimpleInvokerDecorator($invoker);
- }
-
- /**
- * Invokes a test method and dispatches any
- * untrapped errors. Called back from
- * the visiting runner.
- * @param string $method Test method to call.
- * @access public
- */
- function invoke($method) {
- $queue = &$this->_createErrorQueue();
- set_error_handler('SimpleTestErrorHandler');
- parent::invoke($method);
- restore_error_handler();
- $queue->tally();
- }
-
- /**
- * Wires up the error queue for a single test.
- * @return SimpleErrorQueue Queue connected to the test.
- * @access private
- */
- function & _createErrorQueue() {
- $context = &SimpleTest::getContext();
- $test = &$this->getTestCase();
- $queue = &$context->get('SimpleErrorQueue');
- $queue->setTestCase($test);
- return $queue;
- }
-}
-
-/**
- * Error queue used to record trapped
- * errors.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleErrorQueue {
- var $_queue;
- var $_expectation_queue;
- var $_test;
- var $_using_expect_style = false;
-
- /**
- * Starts with an empty queue.
- */
- function SimpleErrorQueue() {
- $this->clear();
- }
-
- /**
- * Discards the contents of the error queue.
- * @access public
- */
- function clear() {
- $this->_queue = array();
- $this->_expectation_queue = array();
- }
-
- /**
- * Sets the currently running test case.
- * @param SimpleTestCase $test Test case to send messages to.
- * @access public
- */
- function setTestCase(&$test) {
- $this->_test = &$test;
- }
-
- /**
- * Sets up an expectation of an error. If this is
- * not fulfilled at the end of the test, a failure
- * will occour. If the error does happen, then this
- * will cancel it out and send a pass message.
- * @param SimpleExpectation $expected Expected error match.
- * @param string $message Message to display.
- * @access public
- */
- function expectError($expected, $message) {
- $this->_using_expect_style = true;
- array_push($this->_expectation_queue, array($expected, $message));
- }
-
- /**
- * Adds an error to the front of the queue.
- * @param integer $severity PHP error code.
- * @param string $content Text of error.
- * @param string $filename File error occoured in.
- * @param integer $line Line number of error.
- * @access public
- */
- function add($severity, $content, $filename, $line) {
- $content = str_replace('%', '%%', $content);
- if ($this->_using_expect_style) {
- $this->_testLatestError($severity, $content, $filename, $line);
- }
- else {
- array_push($this->_queue, array($severity, $content, $filename, $line));
- }
- }
-
- /**
- * Any errors still in the queue are sent to the test
- * case. Any unfulfilled expectations trigger failures.
- * @access public
- */
- function tally() {
- while (list($severity, $message, $file, $line) = $this->extract()) {
- $severity = $this->getSeverityAsString($severity);
- $this->_test->error($severity, $message, $file, $line);
- }
- while (list($expected, $message) = $this->_extractExpectation()) {
- $this->_test->assert($expected, false, "%s -> Expected error not caught");
- }
- }
-
- /**
- * Tests the error against the most recent expected
- * error.
- * @param integer $severity PHP error code.
- * @param string $content Text of error.
- * @param string $filename File error occoured in.
- * @param integer $line Line number of error.
- * @access private
- */
- function _testLatestError($severity, $content, $filename, $line) {
- if ($expectation = $this->_extractExpectation()) {
- list($expected, $message) = $expectation;
- $this->_test->assert($expected, $content, sprintf(
- $message,
- "%s -> PHP error [$content] severity [".
- $this->getSeverityAsString($severity) .
- "] in [$filename] line [$line]"));
- }
- else {
- $this->_test->error($severity, $content, $filename, $line);
- }
- }
-
- /**
- * Pulls the earliest error from the queue.
- * @return mixed False if none, or a list of error
- * information. Elements are: severity
- * as the PHP error code, the error message,
- * the file with the error, the line number
- * and a list of PHP super global arrays.
- * @access public
- */
- function extract() {
- if (count($this->_queue)) {
- return array_shift($this->_queue);
- }
- return false;
- }
-
- /**
- * Pulls the earliest expectation from the queue.
- * @return SimpleExpectation False if none.
- * @access private
- */
- function _extractExpectation() {
- if (count($this->_expectation_queue)) {
- return array_shift($this->_expectation_queue);
- }
- return false;
- }
-
- /**
- * Converts an error code into it's string
- * representation.
- * @param $severity PHP integer error code.
- * @return String version of error code.
- * @access public
- * @static
- */
- function getSeverityAsString($severity) {
- static $map = array(
- E_STRICT => 'E_STRICT',
- E_ERROR => 'E_ERROR',
- E_WARNING => 'E_WARNING',
- E_PARSE => 'E_PARSE',
- E_NOTICE => 'E_NOTICE',
- E_CORE_ERROR => 'E_CORE_ERROR',
- E_CORE_WARNING => 'E_CORE_WARNING',
- E_COMPILE_ERROR => 'E_COMPILE_ERROR',
- E_COMPILE_WARNING => 'E_COMPILE_WARNING',
- E_USER_ERROR => 'E_USER_ERROR',
- E_USER_WARNING => 'E_USER_WARNING',
- E_USER_NOTICE => 'E_USER_NOTICE'
- );
- if (version_compare(phpversion(), '5.2.0', '>=')) {
- $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
- }
- return $map[$severity];
- }
-}
-
-/**
- * Error handler that simply stashes any errors into the global
- * error queue. Simulates the existing behaviour with respect to
- * logging errors, but this feature may be removed in future.
- * @param $severity PHP error code.
- * @param $message Text of error.
- * @param $filename File error occoured in.
- * @param $line Line number of error.
- * @param $super_globals Hash of PHP super global arrays.
- * @static
- * @access public
- */
-function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
- $severity = $severity & error_reporting();
- if ($severity) {
- restore_error_handler();
- if (ini_get('log_errors')) {
- $label = SimpleErrorQueue::getSeverityAsString($severity);
- error_log("$label: $message in $filename on line $line");
- }
- $context = &SimpleTest::getContext();
- $queue = &$context->get('SimpleErrorQueue');
- $queue->add($severity, $message, $filename, $line);
- set_error_handler('SimpleTestErrorHandler');
- }
- return true;
-}
-
-
Index: modules/simpletest/exceptions.php
===================================================================
RCS file: modules/simpletest/exceptions.php
diff -N modules/simpletest/exceptions.php
--- modules/simpletest/exceptions.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,171 +0,0 @@
-SimpleInvokerDecorator($invoker);
- }
-
- /**
- * Invokes a test method whilst trapping expected
- * exceptions. Any left over unthrown exceptions
- * are then reported as failures.
- * @param string $method Test method to call.
- */
- function invoke($method) {
- $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
- $trap->clear();
- try {
- parent::invoke($method);
- }
- catch (Exception $exception) {
- if (!$trap->isExpected($this->getTestCase(), $exception)) {
- $this->getTestCase()->exception($exception);
- }
- $trap->clear();
- $this->_invoker->getTestCase()->tearDown();
- }
- if ($message = $trap->getOutstanding()) {
- $this->getTestCase()->fail($message);
- }
- }
-}
-
-/**
- * Tests exceptions either by type or the exact
- * exception. This could be improved to accept
- * a pattern expectation to test the error
- * message, but that will have to come later.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class ExceptionExpectation extends SimpleExpectation {
- private$expected;
-
- /**
- * Sets up the conditions to test against.
- * If the expected value is a string, then
- * it will act as a test of the class name.
- * An exception as the comparison will
- * trigger an identical match. Writing this
- * down now makes it look doubly dumb. I hope
- * come up with a better scheme later.
- * @param mixed $expected A class name or an actual
- * exception to compare with.
- * @param string $message Message to display.
- */
- function __construct($expected, $message = '%s') {
- $this->expected = $expected;
- parent::__construct($message);
- }
-
- /**
- * Carry out the test.
- * @param Exception $compare Value to check.
- * @return boolean True if matched.
- */
- function test($compare) {
- if (is_string($this->expected)) {
- return ($compare instanceof $this->expected);
- }
- if (get_class($compare) != get_class($this->expected)) {
- return false;
- }
- return $compare->getMessage() == $this->expected->getMessage();
- }
-
- /**
- * Create the message to display describing the test.
- * @param Exception $compare Exception to match.
- * @return string Final message.
- */
- function testMessage($compare) {
- if (is_string($this->expected)) {
- return "Exception [". $this->describeException($compare) ."] should be type [". $this->expected ."]";
- }
- return "Exception [". $this->describeException($compare) ."] should match [". $this->describeException($this->expected) ."]";
- }
-
- /**
- * Summary of an Exception object.
- * @param Exception $compare Exception to describe.
- * @return string Text description.
- */
- protected function describeException($exception) {
- return get_class($exception) .": ". $exception->getMessage();
- }
-}
-
-/**
- * Stores expected exceptions for when they
- * get thrown. Saves the irritating try...catch
- * block.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleExceptionTrap {
- private$expected;
- private$message;
-
- /**
- * Clears down the queue ready for action.
- */
- function __construct() {
- $this->clear();
- }
-
- /**
- * Sets up an expectation of an exception.
- * This has the effect of intercepting an
- * exception that matches.
- * @param SimpleExpectation $expected Expected exception to match.
- * @param string $message Message to display.
- * @access public
- */
- function expectException($expected = false, $message = '%s') {
- if ($expected === false) {
- $expected = new AnythingExpectation();
- }
- if (!SimpleExpectation::isExpectation($expected)) {
- $expected = new ExceptionExpectation($expected);
- }
- $this->expected = $expected;
- $this->message = $message;
- }
-
- /**
- * Compares the expected exception with any
- * in the queue. Issues a pass or fail and
- * returns the state of the test.
- * @param SimpleTestCase $test Test case to send messages to.
- * @param Exception $exception Exception to compare.
- * @return boolean False on no match.
- */
- function isExpected($test, $exception) {
- if ($this->expected) {
- return $test->assert($this->expected, $exception, $this->message);
- }
- return false;
- }
-
- /**
- * Tests for any left over exception.
- * @return string/false The failure message or false if none.
- */
- function getOutstanding() {
- return sprintf($this->message, 'Failed to trap exception');
- }
-
- /**
- * Discards the contents of the error queue.
- */
- function clear() {
- $this->expected = false;
- $this->message = false;
- }
-}
Index: modules/simpletest/expectation.php
===================================================================
RCS file: modules/simpletest/expectation.php
diff -N modules/simpletest/expectation.php
--- modules/simpletest/expectation.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,144 +0,0 @@
-_message = $message;
- }
-
- /**
- * Tests the expectation. True if correct.
- * @param mixed $compare Comparison value.
- * @return boolean True if correct.
- * @access public
- * @abstract
- */
- function test($compare) {}
-
- /**
- * Returns a human readable test message.
- * @param mixed $compare Comparison value.
- * @return string Description of success
- * or failure.
- * @access public
- * @abstract
- */
- function testMessage($compare) {}
-
- /**
- * Overlays the generated message onto the stored user
- * message. An additional message can be interjected.
- * @param mixed $compare Comparison value.
- * @param SimpleDumper $dumper For formatting the results.
- * @return string Description of success
- * or failure.
- * @access public
- */
- function overlayMessage($compare, $dumper) {
- $this->_dumper = $dumper;
- return sprintf($this->_message, $this->testMessage($compare));
- }
-
- /**
- * Accessor for the dumper.
- * @return SimpleDumper Current value dumper.
- * @access protected
- */
- function &_getDumper() {
- if (!$this->_dumper) {
- $dumper = &new SimpleDumper();
- return $dumper;
- }
- return $this->_dumper;
- }
-
- /**
- * Test to see if a value is an expectation object.
- * A useful utility method.
- * @param mixed $expectation Hopefully an Epectation
- * class.
- * @return boolean True if descended from
- * this class.
- * @access public
- * @static
- */
- function isExpectation($expectation) {
- return is_object($expectation) && is_a($expectation, 'SimpleExpectation');
- }
-}
-
-/**
- * A wildcard expectation always matches.
- * @package SimpleTest
- * @subpackage MockObjects
- */
-class AnythingExpectation extends SimpleExpectation {
-
- /**
- * Tests the expectation. Always true.
- * @param mixed $compare Ignored.
- * @return boolean True.
- * @access public
- */
- function test($compare) {
- return true;
- }
-
- /**
- * Returns a human readable test message.
- * @param mixed $compare Comparison value.
- * @return string Description of success
- * or failure.
- * @access public
- */
- function testMessage($compare) {
- $dumper = &$this->_getDumper();
- return 'Anything always matches ['. $dumper->describeValue($compare) .']';
- }
-}
-
-/**
- * An expectation that passes on boolean true.
- * @package SimpleTest
- * @subpackage MockObjects
- */
-class TrueExpectation extends SimpleExpectation {
-
- /**
- * Tests the expectation.
- * @param mixed $compare Should be true.
- * @return boolean True on match.
- * @access public
- */
- function test($compare) {
- return (boolean)$compare;
- }
-
- /**
- * Returns a human readable test message.
- * @param mixed $compare Comparison value.
- * @return string Description of success
- * or failure.
- * @access public
- */
- function testMessage($compare) {
- $dumper = &$this->_getDumper();
- return 'Expected true, got ['. $dumper->describeValue($compare) .']';
- }
-}
-
Index: modules/simpletest/invoker.php
===================================================================
RCS file: modules/simpletest/invoker.php
diff -N modules/simpletest/invoker.php
--- modules/simpletest/invoker.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,119 +0,0 @@
-_test_case = &$test_case;
- }
-
- /**
- * Accessor for test case being run.
- * @return SimpleTestCase Test case.
- * @access public
- */
- function &getTestCase() {
- return $this->_test_case;
- }
-
- /**
- * Runs test level set up. Used for changing
- * the mechanics of base test cases.
- * @param string $method Test method to call.
- * @access public
- */
- function before($method) {
- $this->_test_case->before($method);
- }
-
- /**
- * Invokes a test method and buffered with setUp()
- * and tearDown() calls.
- * @param string $method Test method to call.
- * @access public
- */
- function invoke($method) {
- $this->_test_case->setUp();
- $this->_test_case->$method();
- $this->_test_case->tearDown();
- }
-
- /**
- * Runs test level clean up. Used for changing
- * the mechanics of base test cases.
- * @param string $method Test method to call.
- * @access public
- */
- function after($method) {
- $this->_test_case->after($method);
- }
-}
-
-/**
- * Do nothing decorator. Just passes the invocation
- * straight through.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleInvokerDecorator {
- var $_invoker;
-
- /**
- * Stores the invoker to wrap.
- * @param SimpleInvoker $invoker Test method runner.
- */
- function SimpleInvokerDecorator(&$invoker) {
- $this->_invoker = &$invoker;
- }
-
- /**
- * Accessor for test case being run.
- * @return SimpleTestCase Test case.
- * @access public
- */
- function &getTestCase() {
- return $this->_invoker->getTestCase();
- }
-
- /**
- * Runs test level set up. Used for changing
- * the mechanics of base test cases.
- * @param string $method Test method to call.
- * @access public
- */
- function before($method) {
- $this->_invoker->before($method);
- }
-
- /**
- * Invokes a test method and buffered with setUp()
- * and tearDown() calls.
- * @param string $method Test method to call.
- * @access public
- */
- function invoke($method) {
- $this->_invoker->invoke($method);
- }
-
- /**
- * Runs test level clean up. Used for changing
- * the mechanics of base test cases.
- * @param string $method Test method to call.
- * @access public
- */
- function after($method) {
- $this->_invoker->after($method);
- }
-}
Index: modules/simpletest/reporter.php
===================================================================
RCS file: modules/simpletest/reporter.php
diff -N modules/simpletest/reporter.php
--- modules/simpletest/reporter.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,283 +0,0 @@
-SimpleReporter();
- $this->_character_set = $character_set;
- }
-
- /**
- * Paints the top of the web page setting the
- * title to the name of the starting test.
- * @param string $test_name Name class of test.
- * @access public
- */
- function paintHeader($test_name) {
- $this->sendNoCacheHeaders();
- print "";
- print "\n\n$test_name\n";
- print "\n";
- print "\n";
- print "\n\n";
- print "
$test_name
\n";
- flush();
- }
-
- /**
- * Send the headers necessary to ensure the page is
- * reloaded on every request. Otherwise you could be
- * scratching your head over out of date test data.
- * @access public
- * @static
- */
- function sendNoCacheHeaders() {
- if (!headers_sent()) {
- header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
- header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
- header("Cache-Control: no-store, no-cache, must-revalidate");
- header("Cache-Control: post-check=0, pre-check=0", false);
- header("Pragma: no-cache");
- }
- }
-
- /**
- * Paints the CSS. Add additional styles here.
- * @return string CSS code as text.
- * @access protected
- */
- function _getCss() {
- return ".fail { background-color: inherit; color: red; }".".pass { background-color: inherit; color: green; }"." pre { background-color: lightgray; color: inherit; }";
- }
-
- /**
- * Paints the end of the test with a summary of
- * the passes and failures.
- * @param string $test_name Name class of test.
- * @access public
- */
- function paintFooter($test_name) {
- $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
- print "
\n";
- print "\n\n";
- }
-
- /**
- * Paints the test failure with a breadcrumbs
- * trail of the nesting test suites below the
- * top level test.
- * @param string $message Failure message displayed in
- * the context of the other tests.
- * @access public
- */
- function paintFail($message) {
- parent::paintFail($message);
- print "Fail: ";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print implode(" -> ", $breadcrumb);
- print " -> ". $this->_htmlEntities($message) ." \n";
- }
-
- /**
- * Paints a PHP error.
- * @param string $message Message is ignored.
- * @access public
- */
- function paintError($message) {
- parent::paintError($message);
- print "Exception: ";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print implode(" -> ", $breadcrumb);
- print " -> ". $this->_htmlEntities($message) ." \n";
- }
-
- /**
- * Paints a PHP exception.
- * @param Exception $exception Exception to display.
- * @access public
- */
- function paintException($exception) {
- parent::paintException($exception);
- print "Exception: ";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print implode(" -> ", $breadcrumb);
- $message = 'Unexpected exception of type ['. get_class($exception) .'] with message ['. $exception->getMessage() .'] in ['. $exception->getFile() .' line '. $exception->getLine() .']';
- print " -> ". $this->_htmlEntities($message) ." \n";
- }
-
- /**
- * Prints the message for skipping tests.
- * @param string $message Text of skip condition.
- * @access public
- */
- function paintSkip($message) {
- parent::paintSkip($message);
- print "Skipped: ";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print implode(" -> ", $breadcrumb);
- print " -> ". $this->_htmlEntities($message) ." \n";
- }
-
- /**
- * Paints formatted text such as dumped variables.
- * @param string $message Text to show.
- * @access public
- */
- function paintFormattedMessage($message) {
- print '
'. $this->_htmlEntities($message) .'
';
- }
-
- /**
- * Character set adjusted entity conversion.
- * @param string $message Plain text or Unicode message.
- * @return string Browser readable message.
- * @access protected
- */
- function _htmlEntities($message) {
- return htmlentities($message, ENT_COMPAT, $this->_character_set);
- }
-}
-
-/**
- * Sample minimal test displayer. Generates only
- * failure messages and a pass count. For command
- * line use. I've tried to make it look like JUnit,
- * but I wanted to output the errors as they arrived
- * which meant dropping the dots.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class TextReporter extends SimpleReporter {
-
- /**
- * Does nothing yet. The first output will
- * be sent on the first test start.
- * @access public
- */
- function TextReporter() {
- $this->SimpleReporter();
- }
-
- /**
- * Paints the title only.
- * @param string $test_name Name class of test.
- * @access public
- */
- function paintHeader($test_name) {
- if (!SimpleReporter::inCli()) {
- header('Content-type: text/plain');
- }
- print "$test_name\n";
- flush();
- }
-
- /**
- * Paints the end of the test with a summary of
- * the passes and failures.
- * @param string $test_name Name class of test.
- * @access public
- */
- function paintFooter($test_name) {
- if ($this->getFailCount() + $this->getExceptionCount() == 0) {
- print "OK\n";
- }
- else {
- print "FAILURES!!!\n";
- }
- print "Test cases run: ". $this->getTestCaseProgress() ."/". $this->getTestCaseCount() .", Passes: ". $this->getPassCount() .", Failures: ". $this->getFailCount() .", Exceptions: ". $this->getExceptionCount() ."\n";
- }
-
- /**
- * Paints the test failure as a stack trace.
- * @param string $message Failure message displayed in
- * the context of the other tests.
- * @access public
- */
- function paintFail($message) {
- parent::paintFail($message);
- print $this->getFailCount() .") $message\n";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print "\tin ". implode("\n\tin ", array_reverse($breadcrumb));
- print "\n";
- }
-
- /**
- * Paints a PHP error or exception.
- * @param string $message Message to be shown.
- * @access public
- * @abstract
- */
- function paintError($message) {
- parent::paintError($message);
- print "Exception ". $this->getExceptionCount() ."!\n$message\n";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print "\tin ". implode("\n\tin ", array_reverse($breadcrumb));
- print "\n";
- }
-
- /**
- * Paints a PHP error or exception.
- * @param Exception $exception Exception to describe.
- * @access public
- * @abstract
- */
- function paintException($exception) {
- parent::paintException($exception);
- $message = 'Unexpected exception of type ['. get_class($exception) .'] with message ['. $exception->getMessage() .'] in ['. $exception->getFile() .' line '. $exception->getLine() .']';
- print "Exception ". $this->getExceptionCount() ."!\n$message\n";
- $breadcrumb = $this->getTestList();
- array_shift($breadcrumb);
- print "\tin ". implode("\n\tin ", array_reverse($breadcrumb));
- print "\n";
- }
-
- /**
- * Prints the message for skipping tests.
- * @param string $message Text of skip condition.
- * @access public
- */
- function paintSkip($message) {
- parent::paintSkip($message);
- print "Skip: $message\n";
- }
-
- /**
- * Paints formatted text such as dumped variables.
- * @param string $message Text to show.
- * @access public
- */
- function paintFormattedMessage($message) {
- print "$message\n";
- flush();
- }
-}
Index: modules/simpletest/scorer.php
===================================================================
RCS file: modules/simpletest/scorer.php
diff -N modules/simpletest/scorer.php
--- modules/simpletest/scorer.php 20 Apr 2008 18:34:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,413 +0,0 @@
-_passes = 0;
- $this->_fails = 0;
- $this->_exceptions = 0;
- $this->_is_dry_run = false;
- }
-
- /**
- * Signals that the next evaluation will be a dry
- * run. That is, the structure events will be
- * recorded, but no tests will be run.
- * @param boolean $is_dry Dry run if true.
- * @access public
- */
- function makeDry($is_dry = true) {
- $this->_is_dry_run = $is_dry;
- }
-
- /**
- * The reporter has a veto on what should be run.
- * @param string $test_case_name name of test case.
- * @param string $method Name of test method.
- * @access public
- */
- function shouldInvoke($test_case_name, $method) {
- return !$this->_is_dry_run;
- }
-
- /**
- * Can wrap the invoker in preperation for running
- * a test.
- * @param SimpleInvoker $invoker Individual test runner.
- * @return SimpleInvoker Wrapped test runner.
- * @access public
- */
- function & createInvoker(&$invoker) {
- return $invoker;
- }
-
- /**
- * Accessor for current status. Will be false
- * if there have been any failures or exceptions.
- * Used for command line tools.
- * @return boolean True if no failures.
- * @access public
- */
- function getStatus() {
- if ($this->_exceptions + $this->_fails > 0) {
- return false;
- }
- return true;
- }
-
- /**
- * Paints the start of a group test.
- * @param string $test_name Name of test or other label.
- * @param integer $size Number of test cases starting.
- * @access public
- */
- function paintGroupStart($test_name, $size) {}
-
- /**
- * Paints the end of a group test.
- * @param string $test_name Name of test or other label.
- * @access public
- */
- function paintGroupEnd($test_name) {}
-
- /**
- * Paints the start of a test case.
- * @param string $test_name Name of test or other label.
- * @access public
- */
- function paintCaseStart($test_name) {}
-
- /**
- * Paints the end of a test case.
- * @param string $test_name Name of test or other label.
- * @access public
- */
- function paintCaseEnd($test_name) {}
-
- /**
- * Paints the start of a test method.
- * @param string $test_name Name of test or other label.
- * @access public
- */
- function paintMethodStart($test_name) {}
-
- /**
- * Paints the end of a test method.
- * @param string $test_name Name of test or other label.
- * @access public
- */
- function paintMethodEnd($test_name) {}
-
- /**
- * Increments the pass count.
- * @param string $message Message is ignored.
- * @access public
- */
- function paintPass($message) {
- $this->_passes++;
- }
-
- /**
- * Increments the fail count.
- * @param string $message Message is ignored.
- * @access public
- */
- function paintFail($message) {
- $this->_fails++;
- }
-
- /**
- * Deals with PHP 4 throwing an error.
- * @param string $message Text of error formatted by
- * the test case.
- * @access public
- */
- function paintError($message) {
- $this->_exceptions++;
- }
-
- /**
- * Deals with PHP 5 throwing an exception.
- * @param Exception $exception The actual exception thrown.
- * @access public
- */
- function paintException($exception) {
- $this->_exceptions++;
- }
-
- /**
- * Prints the message for skipping tests.
- * @param string $message Text of skip condition.
- * @access public
- */
- function paintSkip($message) {}
-
- /**
- * Accessor for the number of passes so far.
- * @return integer Number of passes.
- * @access public
- */
- function getPassCount() {
- return $this->_passes;
- }
-
- /**
- * Accessor for the number of fails so far.
- * @return integer Number of fails.
- * @access public
- */
- function getFailCount() {
- return $this->_fails;
- }
-
- /**
- * Accessor for the number of untrapped errors
- * so far.
- * @return integer Number of exceptions.
- * @access public
- */
- function getExceptionCount() {
- return $this->_exceptions;
- }
-
- /**
- * Paints a simple supplementary message.
- * @param string $message Text to display.
- * @access public
- */
- function paintMessage($message) {}
-
- /**
- * Paints a formatted ASCII message such as a
- * variable dump.
- * @param string $message Text to display.
- * @access public
- */
- function paintFormattedMessage($message) {}
-
- /**
- * By default just ignores user generated events.
- * @param string $type Event type as text.
- * @param mixed $payload Message or object.
- * @access public
- */
- function paintSignal($type, $payload) {}
-}
-
-/**
- * Recipient of generated test messages that can display
- * page footers and headers. Also keeps track of the
- * test nesting. This is the main base class on which
- * to build the finished test (page based) displays.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleReporter extends SimpleScorer {
- var$_test_stack;
- var$_size;
- var$_progress;
-
- /**
- * Starts the display with no results in.
- * @access public
- */
- function SimpleReporter() {
- $this->SimpleScorer();
- $this->_test_stack = array();
- $this->_size = null;
- $this->_progress = 0;
- }
-
- /**
- * Gets the formatter for variables and other small
- * generic data items.
- * @return SimpleDumper Formatter.
- * @access public
- */
- function getDumper() {
- return new SimpleDumper();
- }
-
- /**
- * Paints the start of a group test. Will also paint
- * the page header and footer if this is the
- * first test. Will stash the size if the first
- * start.
- * @param string $test_name Name of test that is starting.
- * @param integer $size Number of test cases starting.
- * @access public
- */
- function paintGroupStart($test_name, $size) {
- if (!isset($this->_size)) {
- $this->_size = $size;
- }
- if (count($this->_test_stack) == 0) {
- $this->paintHeader($test_name);
- }
- $this->_test_stack[] = $test_name;
- }
-
- /**
- * Paints the end of a group test. Will paint the page
- * footer if the stack of tests has unwound.
- * @param string $test_name Name of test that is ending.
- * @param integer $progress Number of test cases ending.
- * @access public
- */
- function paintGroupEnd($test_name) {
- array_pop($this->_test_stack);
- if (count($this->_test_stack) == 0) {
- $this->paintFooter($test_name);
- }
- }
-
- /**
- * Paints the start of a test case. Will also paint
- * the page header and footer if this is the
- * first test. Will stash the size if the first
- * start.
- * @param string $test_name Name of test that is starting.
- * @access public
- */
- function paintCaseStart($test_name) {
- if (!isset($this->_size)) {
- $this->_size = 1;
- }
- if (count($this->_test_stack) == 0) {
- $this->paintHeader($test_name);
- }
- $this->_test_stack[] = $test_name;
- }
-
- /**
- * Paints the end of a test case. Will paint the page
- * footer if the stack of tests has unwound.
- * @param string $test_name Name of test that is ending.
- * @access public
- */
- function paintCaseEnd($test_name) {
- $this->_progress++;
- array_pop($this->_test_stack);
- if (count($this->_test_stack) == 0) {
- $this->paintFooter($test_name);
- }
- }
-
- /**
- * Paints the start of a test method.
- * @param string $test_name Name of test that is starting.
- * @access public
- */
- function paintMethodStart($test_name) {
- $this->_test_stack[] = $test_name;
- }
-
- /**
- * Paints the end of a test method. Will paint the page
- * footer if the stack of tests has unwound.
- * @param string $test_name Name of test that is ending.
- * @access public
- */
- function paintMethodEnd($test_name) {
- array_pop($this->_test_stack);
- }
-
- /**
- * Paints the test document header.
- * @param string $test_name First test top level
- * to start.
- * @access public
- * @abstract
- */
- function paintHeader($test_name) {}
-
- /**
- * Paints the test document footer.
- * @param string $test_name The top level test.
- * @access public
- * @abstract
- */
- function paintFooter($test_name) {}
-
- /**
- * Accessor for internal test stack. For
- * subclasses that need to see the whole test
- * history for display purposes.
- * @return array List of methods in nesting order.
- * @access public
- */
- function getTestList() {
- return $this->_test_stack;
- }
-
- /**
- * Accessor for total test size in number
- * of test cases. Null until the first
- * test is started.
- * @return integer Total number of cases at start.
- * @access public
- */
- function getTestCaseCount() {
- return $this->_size;
- }
-
- /**
- * Accessor for the number of test cases
- * completed so far.
- * @return integer Number of ended cases.
- * @access public
- */
- function getTestCaseProgress() {
- return $this->_progress;
- }
-
- /**
- * Static check for running in the comand line.
- * @return boolean True if CLI.
- * @access public
- * @static
- */
- function inCli() {
- return php_sapi_name() == 'cli';
- }
-}
-
-/**
- * For modifying the behaviour of the visual reporters.
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleReporterDecorator {
- var $_reporter;
-
- /**
- * Mediates between the reporter and the test case.
- * @param SimpleScorer $reporter Reporter to receive events.
- */
- function __construct(&$reporter) {
- $this->_reporter = &$reporter;
- }
-
- function __call($method, $arguments) {
- if (method_exists($this->_reporter, $method)) {
- return call_user_func_array($this->_reporter->$method, $arguments);
- }
- }
-}
Index: modules/simpletest/simpletest.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.css,v
retrieving revision 1.1
diff -u -p -r1.1 simpletest.css
--- modules/simpletest/simpletest.css 20 Apr 2008 18:23:29 -0000 1.1
+++ modules/simpletest/simpletest.css 29 Apr 2008 05:22:46 -0000
@@ -1,9 +1,11 @@
/* $Id: simpletest.css,v 1.1 2008/04/20 18:23:29 dries Exp $ */
-/* Addon for the simpletest module */
-#simpletest {
-}
/* Test Table */
+#simpletest-form-table .description {
+ margin: 0;
+ padding: 0;
+}
+
th.simpletest_run {
width: 50px;
}
@@ -24,6 +26,7 @@ table#simpletest-form-table tr.simpletes
background-color: #EDF5FA !important;
}
+/* Test Results */
div.simpletest-pass {
background: #b6ffb6;
}
Index: modules/simpletest/simpletest.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v
retrieving revision 1.1
diff -u -p -r1.1 simpletest.module
--- modules/simpletest/simpletest.module 20 Apr 2008 18:23:29 -0000 1.1
+++ modules/simpletest/simpletest.module 29 Apr 2008 05:22:46 -0000
@@ -1,6 +1,10 @@
'Testing',
- 'page callback' => 'simpletest_entrypoint',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('simpletest_test_form'),
'description' => 'Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.',
'access arguments' => array('administer unit tests'),
);
@@ -50,7 +55,7 @@ function simpletest_perm() {
*/
function simpletest_theme() {
return array(
- 'simpletest_overview_form' => array(
+ 'simpletest_test_form' => array(
'arguments' => array('form' => NULL)
),
);
@@ -61,93 +66,44 @@ function simpletest_theme() {
* @return boolean TRUE if the load succeeded
*/
function simpletest_load() {
- global $user;
static $loaded;
if (!$loaded) {
$loaded = TRUE;
- if ($user->uid != 1) {
- drupal_set_message(t('It is strongly suggested to run the tests with the first user!'));
- }
$path = drupal_get_path('module', 'simpletest') .'/';
- foreach (array('simpletest.php', 'unit_tester.php', 'reporter.php', 'drupal_reporter.php', 'drupal_web_test_case.php', 'drupal_test_suite.php') as $file) {
+ foreach (array('drupal_test_case.php', 'drupal_unit_test_case.php', 'drupal_web_test_case.php') as $file) {
require_once($path . $file);
}
}
}
/**
- * Menu callback for both running tests and listing possible tests
+ * Form callback; make the form to run tests
*/
-function simpletest_entrypoint() {
+function simpletest_test_form(&$form_state) {
simpletest_load();
- drupal_add_css(drupal_get_path('module', 'simpletest') .'/simpletest.css', 'module');
- drupal_add_js(drupal_get_path('module', 'simpletest') .'/simpletest.js', 'module');
- $output = drupal_get_form('simpletest_overview_form');
-
- if (simpletest_running_output()) {
- return simpletest_running_output() . $output;
- }
- else {
- return $output;
- }
-}
-
-function simpletest_running_output($output = NULL) {
- static $o;
- if ($output != NULL) {
- $o = $output;
- }
- return $o;
-}
+ $form = array();
+ $tests = simpletest_categorize_tests(simpletest_get_all_tests());
-/**
- * Form callback; make the form to run tests
- */
-function simpletest_overview_form() {
- $output = array(
- '#theme' => 'simpletest_overview_form'
- );
-
- $total_test = &simpletest_get_total_test();
-
- $test_instances = $total_test->getTestInstances();
- uasort($test_instances, 'simpletest_compare_instances');
-
- foreach ($test_instances as $group_test) {
- $group = array();
- $tests = $group_test->getTestInstances();
- $group_class = str_replace(' ', '-', strtolower($group_test->getLabel()));
- $group['tests'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => 'Tests',
- '#attributes' => array('class' => $group_class),
- );
- foreach ($tests as $test) {
+ foreach ($tests as $group_name => $test_group) {
+ foreach ($test_group as $test) {
$test_info = $test->getInfo();
- $group['tests'][get_class($test)] = array(
+ $test_class = get_class($test);
+ $form['tests'][$group_name][$test_class] = array(
'#type' => 'checkbox',
- '#title' => $test_info['name'],
- '#default_value' => 0,
+ '#name' => $test_class,
+ '#title' => $test_class,
'#description' => $test_info['description'],
);
}
- $output[] = $group + array(
- '#type' => 'fieldset',
- '#collapsible' => FALSE,
- '#title' => $group_test->getLabel(),
- '#attributes' => array('class' => 'all-tests'),
- );
}
- $output['run'] = array(
+ $form['run'] = array(
'#type' => 'fieldset',
'#collapsible' => FALSE,
'#collapsed' => FALSE,
'#title' => t('Run tests'),
);
- $output['run']['running_options'] = array(
+ $form['run']['running_options'] = array(
'#type' => 'radios',
'#default_value' => 'selected_tests',
'#options' => array(
@@ -155,25 +111,27 @@ function simpletest_overview_form() {
'selected_tests' => t('Run selected tests'),
),
);
- $output['run']['op'] = array(
+ $form['run']['op'] = array(
'#type' => 'submit',
'#value' => t('Run tests'),
- '#submit' => array('simpletest_run_selected_tests')
+ '#submit' => array('simpletest_test_form_submit'),
);
- $output['reset'] = array(
+ $form['reset'] = array(
'#type' => 'fieldset',
'#collapsible' => FALSE,
'#collapsed' => FALSE,
'#title' => t('Clean test environment'),
'#description' => t('Remove tables with the prefix "simpletest" and temporary directories that are left over from tests that crashed.')
);
- $output['reset']['op'] = array(
+ $form['reset']['op'] = array(
'#type' => 'submit',
'#value' => t('Clean environment'),
- '#submit' => array('simpletest_clean_environment')
+ '#submit' => array('simpletest_clean_environment'),
);
- return $output;
+ $form['pr'] = array('#value' => '