Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.137
diff -u -p -r1.137 common.test
--- modules/simpletest/tests/common.test	30 Nov 2010 06:30:21 -0000	1.137
+++ modules/simpletest/tests/common.test	1 Dec 2010 06:26:32 -0000
@@ -66,7 +66,7 @@ class DrupalAlterTestCase extends Drupal
  * url() calls module_implements(), which may issue a db query, which requires
  * inheriting from a web test case rather than a unit test case.
  */
-class CommonURLUnitTest extends DrupalWebTestCase {
+class CommonURLUnitTest extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'URL generation tests',
@@ -501,7 +501,7 @@ class CommonSizeTestCase extends DrupalU
 /**
  * Test drupal_explode_tags() and drupal_implode_tags().
  */
-class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
+class DrupalTagsHandlingTestCase extends DrupalUnitTestCase {
   var $validTags = array(
     'Drupal' => 'Drupal',
     'Drupal with some spaces' => 'Drupal with some spaces',
@@ -558,7 +558,7 @@ class DrupalTagsHandlingTestCase extends
 /**
  * Test the Drupal CSS system.
  */
-class CascadingStylesheetsTestCase extends DrupalWebTestCase {
+class CascadingStylesheetsTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Cascading stylesheets',
@@ -1007,7 +1007,7 @@ class DrupalHTTPRequestTestCase extends 
 /**
  * Testing drupal_add_region_content and drupal_get_region_content.
  */
-class DrupalSetContentTestCase extends DrupalWebTestCase {
+class DrupalSetContentTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Drupal set/get regions',
@@ -1979,7 +1979,7 @@ class DrupalErrorCollectionUnitTest exte
 /**
  * Test the drupal_parse_info_file() API function.
  */
-class ParseInfoFilesTestCase extends DrupalWebTestCase {
+class ParseInfoFilesTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Parsing .info files',
Index: modules/simpletest/tests/image.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/image.test,v
retrieving revision 1.16
diff -u -p -r1.16 image.test
--- modules/simpletest/tests/image.test	1 Sep 2010 20:08:17 -0000	1.16
+++ modules/simpletest/tests/image.test	1 Dec 2010 06:26:32 -0000
@@ -195,7 +195,7 @@ class ImageToolkitUnitTest extends Image
 /**
  * Test the core GD image manipulation functions.
  */
-class ImageToolkitGdTestCase extends DrupalWebTestCase {
+class ImageToolkitGdTestCase extends DrupalUnitTestCase {
   // Colors that are used in testing.
   protected $black       = array(0, 0, 0, 0);
   protected $red         = array(255, 0, 0, 0);
Index: modules/simpletest/tests/theme.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/theme.test,v
retrieving revision 1.23
diff -u -p -r1.23 theme.test
--- modules/simpletest/tests/theme.test	14 Nov 2010 21:04:45 -0000	1.23
+++ modules/simpletest/tests/theme.test	1 Dec 2010 06:26:33 -0000
@@ -162,7 +162,7 @@ class ThemeTableUnitTest extends DrupalW
 /**
  * Unit tests for theme_item_list().
  */
-class ThemeItemListUnitTest extends DrupalWebTestCase {
+class ThemeItemListUnitTest extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Theme item list',
Index: modules/simpletest/tests/unicode.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/unicode.test,v
retrieving revision 1.9
diff -u -p -r1.9 unicode.test
--- modules/simpletest/tests/unicode.test	11 Aug 2010 10:58:22 -0000	1.9
+++ modules/simpletest/tests/unicode.test	1 Dec 2010 06:26:33 -0000
@@ -9,7 +9,7 @@
 /**
  * Test unicode handling features implemented in unicode.inc.
  */
-class UnicodeUnitTest extends DrupalWebTestCase {
+class UnicodeUnitTest extends DrupalUnitTestCase {
 
   /**
    * Whether to run the extended version of the tests (including non latin1 characters).
Index: modules/simpletest/tests/xmlrpc.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/xmlrpc.test,v
retrieving revision 1.21
diff -u -p -r1.21 xmlrpc.test
--- modules/simpletest/tests/xmlrpc.test	2 Oct 2010 01:22:41 -0000	1.21
+++ modules/simpletest/tests/xmlrpc.test	1 Dec 2010 06:26:33 -0000
@@ -4,7 +4,7 @@
 /**
  * Perform basic XML-RPC tests that do not require addition callbacks.
  */
-class XMLRPCBasicTestCase extends DrupalWebTestCase {
+class XMLRPCBasicTestCase extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.153
diff -u -p -r1.153 system.test
--- modules/system/system.test	1 Dec 2010 00:23:36 -0000	1.153
+++ modules/system/system.test	1 Dec 2010 06:26:33 -0000
@@ -1907,7 +1907,7 @@ class FloodFunctionalTest extends Drupal
 /**
  * Test HTTP file downloading capability.
  */
-class RetrieveFileTestCase extends DrupalWebTestCase {
+class RetrieveFileTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'HTTP file retrieval',