Index: modules/statistics/statistics.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v
retrieving revision 1.13
diff -u -p -r1.13 statistics.test
--- modules/statistics/statistics.test	20 Dec 2009 19:41:57 -0000	1.13
+++ modules/statistics/statistics.test	3 Jan 2010 22:01:37 -0000
@@ -10,10 +10,12 @@ class StatisticsTestCase extends DrupalW
     parent::setUp('statistics');
 
     // Create user.
-    $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics'));
+    $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics', 'administer blocks', 'administer statistics', 'administer users'));
+    $this->drupalLogin($this->blocking_user);
 
     // Enable access logging.
     variable_set('statistics_enable_access_log', 1);
+    variable_set('statistics_count_content_views', 1);
 
     // Insert dummy access by anonymous user into access log.
     db_insert('accesslog')
@@ -47,7 +49,6 @@ class StatisticsReportsTestCase extends 
    * Verifies that 'Recent hits' renders properly and displays the added hit.
    */
   function testRecentHits() {
-    $this->drupalLogin($this->blocking_user);
     $this->drupalGet('admin/reports/hits');
     $this->assertText('test', t('Hit title found.'));
     $this->assertText('node/1', t('Hit URL found.'));
@@ -58,7 +59,6 @@ class StatisticsReportsTestCase extends 
    * Verifies that 'Top pages' renders properly and displays the added hit.
    */
   function testTopPages() {
-    $this->drupalLogin($this->blocking_user);
     $this->drupalGet('admin/reports/pages');
     $this->assertText('test', t('Hit title found.'));
     $this->assertText('node/1', t('Hit URL found.'));
@@ -68,7 +68,6 @@ class StatisticsReportsTestCase extends 
    * Verifies that 'Top referrers' renders properly and displays the added hit.
    */
   function testTopReferrers() {
-    $this->drupalLogin($this->blocking_user);
     $this->drupalGet('admin/reports/referrers');
     $this->assertText('http://example.com', t('Hit referrer found.'));
   }
@@ -77,7 +76,6 @@ class StatisticsReportsTestCase extends 
    * Verifies that 'Details' page renders properly and displays the added hit.
    */
   function testDetails() {
-    $this->drupalLogin($this->blocking_user);
     $this->drupalGet('admin/reports/access/1');
     $this->assertText('test', t('Hit title found.'));
     $this->assertText('node/1', t('Hit URL found.'));
@@ -88,12 +86,41 @@ class StatisticsReportsTestCase extends 
    * Verifies that access logging is working and is reported correctly.
    */
   function testAccessLogging() {
-    $this->drupalLogin($this->blocking_user);
     $this->drupalGet('admin/reports/referrers');
     $this->drupalGet('admin/reports/hits');
     $this->assertText('Top referrers in the past 3 days', t('Hit title found.'));
     $this->assertText('admin/reports/referrers', t('Hit URL found.'));
   }
+
+  /**
+   * Tests the "popular content" block.
+   */
+  function testPopularContentBlock() {
+    // Visit a node to have something show up in the block
+    $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->blocking_user->uid));
+    $this->drupalGet('node/' . $node->nid);
+
+    // Configure and save the block
+    $block = block_load('statistics', 'popular');
+    $block->theme = 'garland';
+    $block->status = 1;
+    $block->pages = '';
+    $block->region = 'sidebar_first';
+    $block->cache = -1;
+    $block->visibility = 0;
+    $edit = array('statistics_block_top_day_num' => 3, 'statistics_block_top_all_num' => 3, 'statistics_block_top_last_num' => 3);
+    module_invoke('statistics', 'block_save', 'popular', $edit);
+    drupal_write_record('block', $block);
+
+    // Get some page and check if the block is displayed
+    $this->drupalGet('user');
+    $this->assertText('Popular content', t('Found the popular content block.'));
+    $this->assertText("Today's", t('Found today\'s popular content.'));
+    $this->assertText('All time', t('Found the alll time popular content.'));
+    $this->assertText('Last viewed', t('Found the last viewed popular content.'));
+
+    $this->assertRaw(l($node->title[LANGUAGE_NONE][0]['value'], 'node/' . $node->nid), t('Found link to visited node.'));
+  }
 }
 
 /**
@@ -145,3 +172,140 @@ class StatisticsBlockVisitorsTestCase ex
     $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)), t('IP address deleted.'));
   }
 }
+
+class StatisticsAdminTestCase extends DrupalWebTestCase {
+  protected $privileged_user;
+  protected $test_node;
+  
+  public static function getInfo() {
+    return array(
+      'name' => 'Test statistics admin.',
+      'description' => 'Tests the statistics admin.',
+      'group' => 'Statistics'
+    );
+  }
+
+  function setUp() {
+    parent::setUp('statistics');
+    $this->privileged_user = $this->drupalCreateUser(array('access statistics', 'administer statistics', 'view post access counter', 'create page content'));
+    $this->drupalLogin($this->privileged_user);
+    $this->test_node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->privileged_user->uid));
+  }
+
+  /**
+   * Verifies that the statistics settings page works.
+   */
+  function testStatisticsSettings() {
+    $this->assertFalse(variable_get('statistics_enable_access_log', 0), t('Access log is disabled by default.'));
+    $this->assertFalse(variable_get('statistics_count_content_views', 0), t('Count content view log is disabled by default.'));
+
+    $this->drupalGet('admin/reports/pages');
+    $this->assertRaw(t('No statistics available.'), t('Verifying text shown when no statistics is available.'));
+
+    // Enable access log and counter on content view.
+    $edit['statistics_enable_access_log'] = 1;
+    $edit['statistics_count_content_views'] = 1;
+    $this->drupalPost('admin/config/system/statistics', $edit, t('Save configuration'));
+    $this->assertTrue(variable_get('statistics_enable_access_log'), t('Access log is enabled.'));
+    $this->assertTrue(variable_get('statistics_count_content_views'), t('Count content view log is enabled.'));
+
+    // Hit the node.
+    $this->drupalGet('node/' . $this->test_node->nid);
+
+    $this->drupalGet('admin/reports/pages');
+    $this->assertText('node/1', t('Test node found.'));
+
+    // Hit the node again (the counter is incremented after the hit, so 
+    // "1 read" will actually be shown when the node is hit the second time).
+    $this->drupalGet('node/' . $this->test_node->nid);
+    $this->assertText('1 read', t('Node is read once.'));
+
+    $this->drupalGet('node/' . $this->test_node->nid);
+    $this->assertText('2 reads', t('Node is read 2 times.'));
+  }
+
+  /**
+   * Tests that when a node is deleted, the node counter is deleted too.
+   */
+  function testDeleteNode() {
+    variable_set('statistics_count_content_views', 1);
+
+    $this->drupalGet('node/' . $this->test_node->nid);
+
+    $result = db_select('node_counter', 'n')
+      ->fields('n', array('nid'))
+      ->condition('n.nid', $this->test_node->nid)
+      ->execute()
+      ->fetchAssoc();
+    $this->assertEqual($result['nid'], $this->test_node->nid, 'Verifying that the node counter is incremented.');
+
+    node_delete($this->test_node->nid);
+
+    $result = db_select('node_counter', 'n')
+      ->fields('n', array('nid'))
+      ->condition('n.nid', $this->test_node->nid)
+      ->execute()
+      ->fetchAssoc();
+    $this->assertFalse($result, 'Verifying that the node counter is deleted.');
+  }
+
+  /**
+   * Tests that when a user is deleted, the accesslog does not contain the
+   * username of that user anymore.
+   */
+  function testDeleteUser() {
+    variable_set('statistics_enable_access_log', 1);
+
+    variable_set('user_cancel_method', 'user_cancel_delete');
+    $this->drupalLogout($this->privileged_user);
+    $account = $this->drupalCreateUser(array('access content', 'cancel account'));
+    $this->drupalLogin($account);
+    $this->drupalGet('node/' . $this->test_node->nid);
+
+    $account = user_load($account->uid, TRUE);
+
+    $this->drupalGet('user/' . $account->uid . '/edit');
+    $this->drupalPost(NULL, NULL, t('Cancel account'));
+
+    $timestamp = time();
+    $this->drupalPost(NULL, NULL, t('Cancel account'));
+    // Confirm account cancellation request.
+    $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
+    $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
+
+    $this->drupalGet('admin/reports/visitors');
+    $this->assertNoText($account->name, t('Did not find user in visitor statistics.'));
+  }
+
+  /**
+   * Tests that cron clears daycounts and expired accesslogs.
+   */
+  function testExpiredLogs() {
+    variable_set('statistics_enable_access_log', 1);
+    variable_set('statistics_count_content_views', 1);
+    variable_set('statistics_day_timestamp', 8640000);
+    variable_set('statistics_flush_accesslog_timer', 1);
+
+    $this->drupalGet('node/' . $this->test_node->nid);
+    $this->drupalGet('node/' . $this->test_node->nid);
+    $this->assertText('1 read', t('Node is read once.'));
+
+    $this->drupalGet('admin/reports/pages');
+    $this->assertText('node/1', t('Hit URL found.'));
+
+    // Wait two secs before running cron, so the access log timer will time 
+    // out.
+    sleep(2); 
+    $this->cronRun();
+
+    $this->drupalGet('admin/reports/pages');
+    $this->assertNoText('node/1', t('No hit URL found.'));
+
+    $result = db_select('node_counter', 'nc')
+      ->fields('nc', array('daycount'))
+      ->condition('nid', $this->test_node->nid, '=')
+      ->execute()
+      ->fetchField();
+    $this->assertFalse($result, t('Daycounter is zero.'));
+  }
+}
\ No newline at end of file