5 files changed, 14 insertions, 16 deletions
diff --git a/modules/simpletest/tests/batch.test b/modules/simpletest/tests/batch.test
index 451575cf2..82385c5e9 100644
--- a/modules/simpletest/tests/batch.test
+++ b/modules/simpletest/tests/batch.test
@@ -274,7 +274,6 @@ class BatchPageTestCase extends DrupalWebTestCase {
   function testBatchProgressPageTheme() {
     // Make sure that the page which starts the batch (an administrative page)
     // is using a different theme than would normally be used by the batch API.
-    variable_set('theme_default', 'garland');
     variable_set('admin_theme', 'seven');
     // Visit an administrative page that runs a test batch, and check that the
     // theme that was used during batch execution (which the batch callback
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 35c5bbc3b..d81602463 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -23,10 +23,10 @@ class DrupalAlterTestCase extends DrupalWebTestCase {
   }
 
   function testDrupalAlter() {
-    // This test depends on Garland, so make sure that it is always the current
+    // This test depends on Bartik, so make sure that it is always the current
     // active theme.
     global $theme, $base_theme_info;
-    $theme = 'garland';
+    $theme = 'bartik';
     $base_theme_info = array();
 
     $array = array('foo' => 'bar');
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index 1b5dbc351..7320bdaa7 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -133,12 +133,12 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
 }
 
 /**
- * Implements hook_TYPE_alter() on behalf of Garland theme.
+ * Implements hook_TYPE_alter() on behalf of Bartik theme.
  *
  * Same as common_test_drupal_alter_alter(), but here, we verify that themes
  * can also alter and come last.
  */
-function garland_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
+function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
   // Alter first argument.
   if (is_array($data)) {
     $data['foo'] .= ' theme';
diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test
index 3fd90efc2..1dccb6e60 100644
--- a/modules/simpletest/tests/menu.test
+++ b/modules/simpletest/tests/menu.test
@@ -20,8 +20,8 @@ class MenuRouterTestCase extends DrupalWebTestCase {
     parent::setUp('menu_test');
     // Make the tests below more robust by explicitly setting the default theme
     // and administrative theme that they expect.
-    theme_enable(array('garland'));
-    variable_set('theme_default', 'garland');
+    theme_enable(array('bartik'));
+    variable_set('theme_default', 'bartik');
     variable_set('admin_theme', 'seven');
   }
 
@@ -81,7 +81,7 @@ class MenuRouterTestCase extends DrupalWebTestCase {
     // For a regular user, the fact that the site is in maintenance mode means
     // we expect the theme callback system to be bypassed entirely.
     $this->drupalGet('menu-test/theme-callback/use-admin-theme');
-    $this->assertRaw('garland/style.css', t("The maintenance theme's CSS appears on the page."));
+    $this->assertRaw('bartik/css/style.css', t("The maintenance theme's CSS appears on the page."));
 
     // An administrator, however, should continue to see the requested theme.
     $admin_user = $this->drupalCreateUser(array('access site in maintenance mode'));
@@ -130,8 +130,8 @@ class MenuRouterTestCase extends DrupalWebTestCase {
   function testThemeCallbackOptionalTheme() {
     // Request a theme that is not enabled.
     $this->drupalGet('menu-test/theme-callback/use-stark-theme');
-    $this->assertText('Custom theme: NONE. Actual theme: garland.', t('The theme callback system falls back on the default theme when a theme that is not enabled is requested.'));
-    $this->assertRaw('garland/style.css', t("The default theme's CSS appears on the page."));
+    $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when a theme that is not enabled is requested.'));
+    $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page."));
 
     // Now enable the theme and request it again.
     theme_enable(array('stark'));
@@ -145,8 +145,8 @@ class MenuRouterTestCase extends DrupalWebTestCase {
    */
   function testThemeCallbackFakeTheme() {
     $this->drupalGet('menu-test/theme-callback/use-fake-theme');
-    $this->assertText('Custom theme: NONE. Actual theme: garland.', t('The theme callback system falls back on the default theme when a theme that does not exist is requested.'));
-    $this->assertRaw('garland/style.css', t("The default theme's CSS appears on the page."));
+    $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when a theme that does not exist is requested.'));
+    $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page."));
   }
 
   /**
@@ -154,8 +154,8 @@ class MenuRouterTestCase extends DrupalWebTestCase {
    */
   function testThemeCallbackNoThemeRequested() {
     $this->drupalGet('menu-test/theme-callback/no-theme-requested');
-    $this->assertText('Custom theme: NONE. Actual theme: garland.', t('The theme callback system falls back on the default theme when no theme is requested.'));
-    $this->assertRaw('garland/style.css', t("The default theme's CSS appears on the page."));
+    $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when no theme is requested.'));
+    $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page."));
   }
 
   /**
diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test
index 1f6373723..d4dc89842 100644
--- a/modules/simpletest/tests/theme.test
+++ b/modules/simpletest/tests/theme.test
@@ -170,7 +170,6 @@ class ThemeHookInitUnitTest extends DrupalWebTestCase {
 
   function setUp() {
     parent::setUp('theme_test');
-    variable_set('theme_default', 'garland');
   }
 
   /**
@@ -179,6 +178,6 @@ class ThemeHookInitUnitTest extends DrupalWebTestCase {
   function testThemeInitializationHookInit() {
     $this->drupalGet('theme-test/hook-init');
     $this->assertRaw('Themed output generated in hook_init()', t('Themed output generated in hook_init() correctly appears on the page.'));
-    $this->assertRaw('garland/style.css', t("The default theme's CSS appears on the page when the theme system is initialized in hook_init()."));
+    $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page when the theme system is initialized in hook_init()."));
   }
 }