? .DS_Store
? simpletest
Index: drupal_reporter.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_reporter.php,v
retrieving revision 1.3
diff -u -p -r1.3 drupal_reporter.php
--- drupal_reporter.php 4 Oct 2006 09:53:51 -0000 1.3
+++ drupal_reporter.php 10 Jul 2007 12:01:04 -0000
@@ -11,6 +11,7 @@ class DrupalReporter extends SimpleRepor
var $_passes_stack = array(0);
var $_progress_stack = array(0);
var $test_info_stack = array();
+ var $_output_stack_id = -1;
var $form;
var $form_depth = array();
var $current_field_set = array();
@@ -169,7 +170,7 @@ class DrupalReporter extends SimpleRepor
$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));
- unset($this->test_stack);
+ $this->test_stack = array();
}
array_pop($this->form_depth);
}
@@ -255,7 +256,7 @@ class DrupalReporter extends SimpleRepor
return $form['#weight'];
}
}
-function unit_tests($reporter) {
- return $reporter->form;
+function unit_tests($args, $reporter) {
+ return $reporter->form['Drupal Unit Tests'];
}
?>
\ No newline at end of file
Index: drupal_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_test_case.php,v
retrieving revision 1.28
diff -u -p -r1.28 drupal_test_case.php
--- drupal_test_case.php 24 Jun 2007 08:05:07 -0000 1.28
+++ drupal_test_case.php 10 Jul 2007 12:01:05 -0000
@@ -101,7 +101,7 @@ class DrupalTestCase extends WebTestCase
* @param boolean $reporting assertations or not
*/
function drupalPostRequest($path, $edit = array(), $submit, $edit_multi = array()) {
- $url = url($path, NULL, NULL, TRUE);
+ $url = url($path, array('absolute' => TRUE));
$ret = $this->drupalGet($url);
$this->assertTrue($ret, " [browser] GET $url");
@@ -329,7 +329,7 @@ class DrupalTestCase extends WebTestCase
*/
function drupalLoginUser($user = NULL) {
- $this->drupalGet( url("user", NULL, NULL, TRUE) );
+ $this->drupalGet( url("user", array('absolute' => TRUE)) );
// Going to the page retrieves the cookie, as the browser should save it
if ($user === NULL) {
Index: simpletest.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.info,v
retrieving revision 1.3
diff -u -p -r1.3 simpletest.info
--- simpletest.info 23 Jun 2007 10:23:44 -0000 1.3
+++ simpletest.info 10 Jul 2007 12:01:05 -0000
@@ -1,4 +1,5 @@
; $Id $
name = "SimpleTest module"
description = "Provides simpletest classes to developers as well as some standard tests for Drupal"
-package = Simpletest
\ No newline at end of file
+package = Simpletest
+core = 6.x
\ No newline at end of file
Index: simpletest.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.module,v
retrieving revision 1.24
diff -u -p -r1.24 simpletest.module
--- simpletest.module 2 Jul 2007 19:11:12 -0000 1.24
+++ simpletest.module 10 Jul 2007 12:01:05 -0000
@@ -22,23 +22,21 @@ function simpletest_help($section) {
/**
* Implementation of hook_menu().
*/
-function simpletest_menu($may_cache) {
- if ($may_cache) {
- $items = array();
- $items[] = array('path' => 'admin/build/simpletest',
- 'title' => 'Simpletest unit testing',
- 'callback' => 'simpletest_entrypoint',
- 'description' => t('Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.'),
- 'access' => user_access('administer unit tests'));
- $items[] = array('path' => 'admin/settings/simpletest',
- 'title' => t('Simpletest settings'),
- 'description' => t('Configure unit testing framework.'),
- 'callback' => 'drupal_get_form',
- 'callback arguments' => 'simpletest_settings',
- 'access' => user_access('administer unit tests')
- );
- return $items;
- }
+function simpletest_menu() {
+ $items['admin/build/simpletest'] = array(
+ 'title' => 'Simpletest unit testing',
+ 'page callback' => 'simpletest_entrypoint',
+ 'description' => t('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'),
+ );
+ $items['admin/settings/simpletest'] = array(
+ 'title' => t('Simpletest settings'),
+ 'description' => t('Configure unit testing framework.'),
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('simpletest_settings'),
+ 'access arguments' => array('access administration pages'),
+ );
+ return $items;
}
/**
@@ -110,13 +108,14 @@ function simpletest_entrypoint() {
*/
return ' ';
}
- $output = drupal_get_form('simpletest_overview_form');
+
+ $output = drupal_get_form('simpletest_overview_form');
- if (simpletest_running_output()) {
- print theme('page', simpletest_running_output() . $output);
- } else {
- print theme('page', $output);
- }
+ if (simpletest_running_output()) {
+ print theme('page', simpletest_running_output() . $output);
+ } else {
+ print theme('page', $output);
+ }
}
function simpletest_running_output($output = NULL) {
@@ -130,12 +129,12 @@ function simpletest_running_output($outp
/**
* FAPI form submit for simpletest_overview_form
*
- * @param $form_id
- * @param $form_values
+ * @param $form
+ * @param $form_state
*/
-function simpletest_overview_form_submit($form_id, $form_values) {
-
- switch ($form_values['running_options']){
+function simpletest_overview_form_submit($form, &$form_state) {
+ $form_state['redirect'] = FALSE;
+ switch ($form_state['values']['running_options']){
case 'all_tests':
$output = simpletest_run_tests();
@@ -143,8 +142,8 @@ function simpletest_overview_form_submit
case 'selected_tests':
$test_list = array();
- foreach ($form_values as $test => $checked){
- if ($checked && ($test != 'running_options' && $test != 'op' && $test != 'form_token' && $test != 'form_id')) {
+ foreach ($form_state['values'] as $test => $checked){
+ if ($checked == 1) {
$tests_list[] = $test;
}
}
@@ -162,7 +161,7 @@ function simpletest_overview_form_submit
}
simpletest_running_output($output);
- return false;
+ return FALSE;
}
/**
@@ -245,14 +244,15 @@ function &simpletest_get_total_test($cla
$total_test = &new DrupalUnitTests();
}
if (!is_null($classes)) {
- return new DrupalUnitTests($classes);
+ $dut = new DrupalUnitTests($classes);
+ return $dut;
}
return $total_test;
}
function simpletest_settings() {
- $from = array();
+ $form = array();
$form['http_auth'] = array(
'#type' => 'fieldset',
Index: simpletest_xmlrpc.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest_xmlrpc.info,v
retrieving revision 1.2
diff -u -p -r1.2 simpletest_xmlrpc.info
--- simpletest_xmlrpc.info 2 Sep 2006 18:56:57 -0000 1.2
+++ simpletest_xmlrpc.info 10 Jul 2007 12:01:05 -0000
@@ -1,3 +1,5 @@
; $Id: simpletest_xmlrpc.info,v 1.2 2006/09/02 18:56:57 rokZlender Exp $
name = Simpletest_xmlrpc
description = Supports the simpletest module for the xmlrpc tests. Does not need to manually enabled.
+package = Simpletest
+core = 6.x