--- ca_htaccess.test.orig	2008-07-10 12:13:58.000000000 -0400
+++ ca_htaccess.test	2008-08-22 11:30:28.000000000 -0400
@@ -1,11 +1,9 @@
 <?php
-// $Id: ca_htaccess.test,v 1.1.2.3 2008/07/10 16:13:58 douggreen Exp $
-
 class CAHtaccessTest extends DrupalTestCase {
   function get_info() {
     return array(
       'name' => t('Htaccess Tests'),
-      'desc' => t('Is htaccess configured properly?'),
+      'desc' => t('makes sure that htaccess is configured properly.'),
       'group' => 'CivicActions'
     );
   }
@@ -14,14 +12,37 @@ class CAHtaccessTest extends DrupalTestC
   }
 
   function testHtaccessLive() {
-    // TODO: make sure the live site is not protected by htaccess
+    // Grab our URL
+    $home_page_url = url("<front>", NULL, NULL, TRUE);
+    $response = drupal_http_request($home_page_url);
+    $this->assertNotEqual($response->code, "401", "Live site is protected by .htaccess");
   }
 
   function testHtaccessDevQA() {
-    // TODO: make sure the dev and qa sites are protected by htaccess
-  }
+    // Grab our URL
+    $home_page_url = url("<front>", NULL, NULL, TRUE);
 
+    // Test dev for positive .htaccess protection
+    // Build the dev URL.
+    $exp_url = explode(".", $home_page_url);
+    $dev_page_subdomain_url = $exp_url[0] . "-dev";
+    $dev_page_url = implode(".", array($dev_page_subdomain_url, $exp_url[1], $exp_url[2]));
+    unset($exp_url);   
+    $dev_response = drupal_http_request($dev_page_url);
+    $this->assertNotEqual($response->code, "401", "Dev site is protected by .htaccess");
+    
+    // Test for QA
+    $exp_url = explode(".", $home_page_url);
+    $qa_page_subdomain_url = $exp_url[0] . "-qa";
+    $qa_page_url = implode(".", array($qa_page_subdomain_url, $exp_url[1], $exp_url[2]));
+    unset($exp_url);   
+    $qa_response = drupal_http_request($qa_page_url);
+    $this->assertNotEqual($response->code, "401", "QA site is protected by .htaccess");
+  }
+  
   function testHtaccessLink() {
     // TODO: make sure that the dev version of htaccess is linked to Drupal's .htaccess
   }
+  
 }
+