### Eclipse Workspace Patch 1.0 #P simpletest Index: simpletest.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.module,v retrieving revision 1.41 diff -u -r1.41 simpletest.module --- simpletest.module 3 Apr 2008 19:57:15 -0000 1.41 +++ simpletest.module 5 Apr 2008 18:58:00 -0000 @@ -124,30 +124,37 @@ * @param $form_state */ function simpletest_overview_form_submit($form, &$form_state) { - $form_state['redirect'] = FALSE; - $output = ''; - switch ($form_state['values']['running_options']) { - case 'all_tests': - $output = simpletest_run_tests(); - break; - case 'selected_tests': - $tests_list = array(); - foreach ($form_state['values'] as $item => $value) { - if ($value === 1 && strpos($item, 'selectall') === FALSE) { - $tests_list[] = $item; - } - } - if (count($tests_list) > 0 ) { - $output = simpletest_run_tests($tests_list); + var_dump($form_state['clicked_button']['#value']); + print 'submitted...'; + if ($form_state['clicked_button']['#value'] == t('Begin')) { + $form_state['redirect'] = FALSE; + $output = ''; + switch ($form_state['values']['running_options']) { + case 'all_tests': + $output = simpletest_run_tests(); break; - } - // Fall through - default: - simpletest_trigger_error('no tests selected'); + case 'selected_tests': + $tests_list = array(); + foreach ($form_state['values'] as $item => $value) { + if ($value === 1 && strpos($item, 'selectall') === FALSE) { + $tests_list[] = $item; + } + } + if (count($tests_list) > 0 ) { + $output = simpletest_run_tests($tests_list); + break; + } + // Fall through + default: + simpletest_trigger_error('no tests selected'); + } + + simpletest_running_output($output); + return FALSE; + } + else if ($form_state['clicked_button']['#value'] == t('Clean Database')) { + print 'clean...'; } - - simpletest_running_output($output); - return FALSE; } /** @@ -186,8 +193,14 @@ '#attributes' => array('class' => 'select_all'), ); } - - $submit['running_options'] = array( + + $output['run'] = array( + '#type' => 'fieldset', + '#collapsible' => FALSE, + '#collapsed' => FALSE, + '#title' => 'Run tests', + ); + $output['run']['running_options'] = array( '#type' => 'radios', '#default_value' => 'selected_tests', '#options' => array( @@ -195,16 +208,22 @@ 'selected_tests' => t('Run selected tests'), ), ); - $submit['op'] = array( + $output['run']['op'] = array( '#type' => 'submit', '#value' => t('Begin'), ); - - $output[] = $submit + array( + + $output['reset'] = array( '#type' => 'fieldset', '#collapsible' => FALSE, '#collapsed' => FALSE, - '#title' => 'Run tests', + '#title' => 'Clean Database', + '#description' => 'Remove tables with the prefix "simpletest" that are left over from tests that crashed.' + ); + $output['reset']['op'] = array( + '#type' => 'submit', + '#value' => t('Clean Database'), + '#executes_submit_callback' => TRUE ); return $output; }