? simpletest
? simpletest.d6port-3.patch
? simpletest.d6port.patch
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	3 Sep 2007 05:17:29 -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('<strong>' . $this->getPassCount() . '</strong> passes, <strong>' . $this->getFailCount() . '</strong> fails and <strong>' . $this->getExceptionCount() . '</strong> 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.30
diff -u -p -r1.30 drupal_test_case.php
--- drupal_test_case.php	20 Aug 2007 05:59:20 -0000	1.30
+++ drupal_test_case.php	3 Sep 2007 05:17:30 -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");
@@ -330,7 +330,7 @@ class DrupalTestCase extends WebTestCase
    */
   function drupalLoginUser($user = NULL, $submit = 'Log in') {
 
-    $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	3 Sep 2007 05:17:30 -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.25
diff -u -p -r1.25 simpletest.module
--- simpletest.module	13 Aug 2007 18:37:50 -0000	1.25
+++ simpletest.module	3 Sep 2007 05:17:30 -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;
 }
 
 /**
@@ -109,13 +107,14 @@ function simpletest_entrypoint() {
      */
     return '&nbsp;';  
   }  
-	$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) {
@@ -129,12 +128,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();
@@ -142,8 +141,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;
         }
       }
@@ -161,7 +160,7 @@ function simpletest_overview_form_submit
   }
   
   simpletest_running_output($output);
-  return false;
+  return FALSE;
 }
 
 /**
@@ -244,14 +243,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	3 Sep 2007 05:17:30 -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
Index: tests/page_creation.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/page_creation.test,v
retrieving revision 1.11
diff -u -p -r1.11 page_creation.test
--- tests/page_creation.test	23 Jun 2007 10:23:44 -0000	1.11
+++ tests/page_creation.test	3 Sep 2007 05:17:30 -0000
@@ -25,7 +25,7 @@ class PageCreationTest extends  DrupalTe
     $edit = array();
     $edit['title']    = '!SimpleTest test node! ' . $this->randomName(10);
     $edit['body']     = '!SimpleTest test body! ' . $this->randomName(32) . ' ' . $this->randomName(32);
-    $this->drupalPostRequest('node/add/page', $edit, 'Submit');
+    $this->drupalPostRequest('node/add/page', $edit, 'Save');
     
     $this->assertWantedRaw(t('Your %post has been created.', array ('%post' => 'Page')), 'Page created');
     
Index: tests/page_view.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/page_view.test,v
retrieving revision 1.8
diff -u -p -r1.8 page_view.test
--- tests/page_view.test	23 Jun 2007 10:23:44 -0000	1.8
+++ tests/page_view.test	3 Sep 2007 05:17:30 -0000
@@ -41,14 +41,14 @@ class PageViewTest extends DrupalTestCas
     $this->assertNotNull(node_load($node->nid), 'Node created');
 
     /* Tries to edit with anonymous user */
-    $html = $this->drupalGet(url("node/$node->nid/edit", NULL, NULL, TRUE));
+    $html = $this->drupalGet(url("node/$node->nid/edit", array('absolute' => TRUE)));
     $this->assertResponse(403);
     
     /* Prepare a user to request the node view */
     $test_user = $this->drupalCreateUserRolePerm(array('access content'));
     $this->drupalLoginUser($test_user);
     
-    $html = $this->drupalGet(url("node/$node->nid/edit", NULL, NULL, TRUE));
+    $html = $this->drupalGet(url("node/$node->nid/edit", array('absolute' => TRUE)));
     $this->assertResponse(403);
     
     $test_user = $this->drupalCreateUserRolePerm(array('administer nodes'));
Index: tests/profile_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/profile_module.test,v
retrieving revision 1.11
diff -u -p -r1.11 profile_module.test
--- tests/profile_module.test	23 Jun 2007 10:23:44 -0000	1.11
+++ tests/profile_module.test	3 Sep 2007 05:17:32 -0000
@@ -46,7 +46,7 @@ class ProfileModuleTestSingle extends Dr
     $this->drupalModuleEnable('profile');
     // create test user
     $edit['name'] = 'Profile '. $this->randomName(5);
-    $edit['perm'] = 'access content, administer users, administer site configuration, access administration pages, access configuration pages, access user profiles';
+    $edit['perm'] = 'access administration pages, administer site configuration, administer users';
     $rid = $this->_rolesApi('add', $edit );
     $name = $this->randomName();
     $pass = $this->randomName();
@@ -64,9 +64,9 @@ class ProfileModuleTestSingle extends Dr
     $title = "single_" . $this->randomName(10);
     $form_name = 'profile_' . $title;
     $explanation = $this->randomName(50);
-    $edit = array('category' => $my_category, 
-                  'title' => $title, 
-                  'name' => $form_name, 
+    $edit = array('category' => $my_category,
+                  'title' => $title,
+                  'name' => $form_name,
                   'explanation' => $explanation,
                   );
     $this->drupalPostRequest('admin/user/profile/add/textfield', $edit, 'Save field',0);
@@ -88,7 +88,7 @@ class ProfileModuleTestSingle extends Dr
     $edit = array();
     $checking = array();
     $edit[$form_name] = $this->randomName(20);
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
 
     // checking profile page
@@ -202,7 +202,7 @@ class ProfileModuleTestTextarea extends 
     $edit = array();
     $checking = array();
     $edit[$form_name] = $this->randomName(20);
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
 
     // checking profile page
@@ -316,7 +316,7 @@ class ProfileModuleTestFreelist extends 
     $edit = array();
     $checking = array();
     $edit[$form_name] = $this->randomName(20);
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
 
     // checking profile page
@@ -431,7 +431,7 @@ class ProfileModuleTestCheckbox extends 
     $edit = array();
     $checking = array();
     $edit[$form_name] = 1;
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
     // checking profile page
     $this->assertWantedText($title, "Checking checkbox");
@@ -544,7 +544,7 @@ class ProfileModuleTestUrl extends Drupa
     $edit = array();
     $checking = array();
     $edit[$form_name] = 'http://www.' . $this->randomName(10). '.org';
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
 
     // checking profile page
@@ -667,7 +667,7 @@ class ProfileModuleTestSelection extends
     $element = rand(0,2);
     $key = $form_name;
     $edit[$key] = rtrim($op_tab[$element]);
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
 
     // checking profile page
@@ -796,7 +796,7 @@ class ProfileModuleTestDate extends Drup
                        'M' => map_month(1),
                        'Y' => 1983);
     $data = strtr($format, $replace);
-    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Submit' , 0);
+    $this->drupalPostRequest("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
     $this->_browser->get(url("user/". $user->uid));
 
     // checking profile page
Index: tests/taxonomy.module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/taxonomy.module.test,v
retrieving revision 1.7
diff -u -p -r1.7 taxonomy.module.test
--- tests/taxonomy.module.test	23 Jun 2007 10:23:44 -0000	1.7
+++ tests/taxonomy.module.test	3 Sep 2007 05:17:32 -0000
@@ -46,7 +46,7 @@ class TaxonomyVocabularyFunctions extend
     }
     $edit['vid'] = $vid;
     // get data using function
-    $getEdit = taxonomy_get_vocabulary($vid);
+    $getEdit = taxonomy_vocabulary_load($vid);
     foreach($getEdit as $key => $value ) {
       $this->assertEqual($value, $edit[$key],"Checking value of $key");
     }
@@ -278,13 +278,13 @@ class TaxonomyTestNodeApi extends Drupal
     $patternArray['term name 2'] = $termname;
 
     // create test user and login
-    $perm = array('access content', 'create story content', 'edit story content');
+    $perm = array('access content', 'create story content', 'edit story content', 'delete own story content');
     $account = $this->drupalCreateUserRolePerm($perm);
     $this->drupalLoginUser($account);
     
     // why is this printing out the user profile page?
     // go to node/add/story
-    $this->drupalGet(url('node/add/story', NULL, NULL, TRUE));
+    $this->drupalGet(url('node/add/story', array('absolute' => TRUE)));
     $req = $this->_browser->getRequest();
 
     $headers = $this->_browser->getHeaders();
@@ -303,8 +303,8 @@ class TaxonomyTestNodeApi extends Drupal
     
     // multiple slect box was failing through drupalPostRequest. Use raw POST instead
     // Failing because they were being sent/handled wrong (earnest.berry@gmail.com <Souvent22>)
-    $action = url('node/add/story', NULL, NULL, TRUE);
-    $this->drupalPostRequest($action, $edit, 'Submit', $edit_multi);
+    $action = url('node/add/story', array('absolute' => TRUE));
+    $this->drupalPostRequest($action, $edit, 'Save', $edit_multi);
     $content = $this->drupalGetContent();
     $patternArray['body text'] = $body;
     $patternArray['title'] = $title;
@@ -348,7 +348,7 @@ class TaxonomyTestNodeApi extends Drupal
     // than other form/field types
     $edit_multi = array('taxonomy-' . $vid => $parent);
     
-    $this->drupalPostRequest('node/'. $node->nid .'/edit', $edit, 'Submit', $edit_multi);
+    $this->drupalPostRequest('node/'. $node->nid .'/edit', $edit, 'Save', $edit_multi);
 
     // TODO Do a MUCH better check here of the information msg
     $patternArray['information message'] = 'been updated';
@@ -370,8 +370,8 @@ class TaxonomyTestNodeApi extends Drupal
     $this->_browser->get(url("node/".$node->nid));
     $this->assertNoUnwantedText($termname, "Checking if node exists");
     // checking database fields
-    $result = db_query('SELECT tid FROM {term_node} WHERE nid = %d', $node->nid);
-    $this->assertEqual(db_num_rows($result), 0, 'Checking database field after deletion');
+    $num_rows = db_result(db_query('SELECT COUNT(*) FROM {term_node} WHERE nid = %d', $node->nid));
+    $this->assertEqual($num_rows, 0, 'Checking database field after deletion');
 
     // delete vocabulary
     // to avoid exception messages create array with empty fields
Index: tests/upload_tests.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/upload_tests.test,v
retrieving revision 1.10
diff -u -p -r1.10 upload_tests.test
--- tests/upload_tests.test	25 Jun 2007 07:43:57 -0000	1.10
+++ tests/upload_tests.test	3 Sep 2007 05:17:32 -0000
@@ -43,8 +43,8 @@ class UploadPictureTests extends DrupalT
     // not a image
     $img_path = realpath(drupal_get_path('module', 'simpletest'). "/tests/upload_tests.test");
     $edit = array('files[picture_upload]' => $img_path);
-    $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Submit' );
-    $this->assertWantedText(t('The uploaded file was not an image.'), 'The uploaded file was not an image.');
+    $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Save' );
+    $this->assertWantedText(t('The selected file @file could not be uploaded. Only JPEG, PNG and GIF images are allowed.', array('@file' => 'upload_tests.test')), 'The uploaded file was not an image.');
      variable_set('user_pictures', $old_pic_set);
 
     // do we have to check users roles?
@@ -89,7 +89,7 @@ class UploadPictureTests extends DrupalT
 
         // TEST:
         $edit = array('picture' => $img_path);
-        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Submit' );
+        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Save' );
         $file_dir = variable_get('file_directory_path', 'files');
         $picture_dir = variable_get('user_picture_path', 'pictures');
         $pic_path = $file_dir .'/'.$picture_dir .'/picture-'.$user->uid.'.jpg';
@@ -146,7 +146,7 @@ class UploadPictureTests extends DrupalT
 
         // TEST:
         $edit = array('picture' => $img_path);
-        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Submit' );
+        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Save' );
         $file_dir = variable_get('file_directory_path', 'files');
         $picture_dir = variable_get('user_picture_path', 'pictures');
         $pic_path = $file_dir .'/'.$picture_dir .'/picture-'.$user->uid.'.jpg';
@@ -201,7 +201,7 @@ class UploadPictureTests extends DrupalT
 
         // TEST:
         $edit = array('picture' => $img_path);
-        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Submit' );
+        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Save' );
         $text = t('The uploaded image is too large; the maximum dimensions are %dimensions pixels.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85')));
         $this->assertWantedText($text, 'Checking response on invalid image (dimensions).');
 
@@ -250,7 +250,7 @@ class UploadPictureTests extends DrupalT
         variable_set('user_picture_file_size', $test_size);
 
         $edit = array('picture' => $img_path);
-        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Submit' );
+        $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Save' );
         $text = t('The uploaded image is too large; the maximum file size is %size kB.', array('%size' => variable_get('user_picture_file_size', '30')));
         $this->assertWantedText($text, 'Checking response on invalid image size.');
 
@@ -301,7 +301,7 @@ class UploadPictureTests extends DrupalT
 
       // TEST:
       $edit = array('files[picture_upload]' => $img_path);
-      $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Submit' );
+      $this->drupalPostRequest('user/'.$user->uid.'/edit', $edit, 'Save' );
       $picture_dir = variable_get('user_picture_path', 'pictures');
       $pic_path = file_directory_path() .'/'.$picture_dir .'/picture-'.$user->uid.'.jpg';
 
Index: tests/user_access.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/user_access.test,v
retrieving revision 1.4
diff -u -p -r1.4 user_access.test
--- tests/user_access.test	24 Jun 2007 07:59:19 -0000	1.4
+++ tests/user_access.test	3 Sep 2007 05:17:32 -0000
@@ -10,8 +10,8 @@ class UserAccessTest extends DrupalTestC
   }
 
   function _addMask($mask, $type, $status = 0) {
-    $aid = db_next_id('{access}_aid');
-    db_query("INSERT INTO {access} (aid, mask, type, status) VALUES ('%s', '%s', '%s', %d)", $aid, $mask, $type, $status);
+    db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $mask, $type, $status);
+    $aid = db_last_insert_id('access', 'aid');
     $str_status = ($status == 0) ? 'deny' : 'allow';
     $this->assertTrue(db_affected_rows() > 0, "$str_status Mask added for $type '$mask'");
     $this->_cleanup_masks[] = $aid;
Index: tests/user_registration_test.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/user_registration_test.test,v
retrieving revision 1.10
diff -u -p -r1.10 user_registration_test.test
--- tests/user_registration_test.test	23 Jun 2007 10:23:44 -0000	1.10
+++ tests/user_registration_test.test	3 Sep 2007 05:17:33 -0000
@@ -44,7 +44,7 @@ class UserRegistrationTest extends Drupa
     $this->assertEqual($user->signature, '','Checking signature field');
     $this->assertTrue(($user->created > time() - 20 ), 0,'Checking creation time.');
     $this->assertEqual($user->status, variable_get('user_register', 1) == 1 ? 1 : 0,'Checking status field');
-    $this->assertEqual($user->timezone, NULL, 'Checking timezone field');
+    $this->assertEqual($user->edit-timezone, NULL, 'Checking timezone field');
     $this->assertEqual($user->language, '', 'Checking language field');
     $this->assertEqual($user->picture, '', 'Check picture field');
     $this->assertEqual($user->init, $mail, 'Check init field');
@@ -69,7 +69,7 @@ class UserRegistrationTest extends Drupa
     $new_pass = user_password();
     $this->assertTrue($this->_browser->setField('pass[pass1]', $new_pass), 'Pass1 field set.');
     $this->assertTrue($this->_browser->setField('pass[pass2]', $new_pass), 'Pass2 field set.');
-    $this->_browser->clickSubmit();
+    $this->_browser->clickSubmit(t('Save'));
     $this->assertText(t('The changes have been saved.'), "Changed password to '$new_pass'");
     
     /* Check if the password changes are present in db */
Index: tests/xmlrpc_validator1.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/xmlrpc_validator1.test,v
retrieving revision 1.3
diff -u -p -r1.3 xmlrpc_validator1.test
--- tests/xmlrpc_validator1.test	2 Sep 2006 18:03:59 -0000	1.3
+++ tests/xmlrpc_validator1.test	3 Sep 2007 05:17:33 -0000
@@ -11,7 +11,7 @@ class XMLRPCValidator1Test extends Drupa
     if (!$this->drupalModuleEnable('simpletest_xmlrpc')) {
       return FALSE; 
     }
-    $xml_url = url(NULL, NULL, NULL, TRUE) . 'xmlrpc.php';
+    $xml_url = url(NULL, array('absolute' => TRUE)) . 'xmlrpc.php';
     srand();
     mt_srand();
 
