Merge lp:~canonical-isd-hackers/drupal-teams/unit-tests into lp:drupal-teams/6.x

[Stuart Metcalfe]

[Stuart Metcalfe (stuartmetcalfe)]

Big drop of retrospective unit tests. Coverage now at ~65%. No changes to functional code

[Łukasz Czyżykowski (lukasz-czyzykowski)]

It looks like everything is OK. Code coverage for drupal-teams is at 66.67%

review: Approve

=== modified file 'openid_teams.module'
--- openid_teams.module	2009-05-11 20:26:38 +0000
+++ openid_teams.module	2009-05-12 15:19:41 +0000
@@ -403,7 +403,7 @@
 function openid_teams_trusted_new_form_submit($form, &$form_state) {
   if ($form_state['values']['form_id'] == 'openid_teams_trusted_new_form') {
     db_query('INSERT INTO {openid_teams_trusted} (server) '.
-             "VALUES ('%s')");
+             "VALUES ('%s')", $form_state['values']['new_server']);
     $sid = db_last_insert_id('openid_teams_trusted', 'sid');
     drupal_set_message(t('Trusted server added'));
     $form_state['redirect'] = 'admin/settings/openid_teams/trusted';

=== added directory 'tests'
=== added file 'tests/module.test'
--- tests/module.test	1970-01-01 00:00:00 +0000
+++ tests/module.test	2009-05-12 11:08:39 +0000
@@ -0,0 +1,210 @@
+<?php
+
+class DrupalTeamsTestCase extends DrupalWebTestCase {
+  private $all_tids = array();
+  private $all_rids = array(1, 2, 1, 2);
+  private $all_sids = array();
+  private $all_teams = array('team1', 'team2', 'team2', 'team3');
+  private $all_servers = array(
+    null,
+    'http://localhost/test/',
+    'http://localhost/test/',
+    'http://*.example.com/'
+  );
+  private $rids_matched_by_servers = array(
+    array(
+      'server' => 'http://localhost/test/',
+      'assigned_team' => 'team2',
+      'fixture_rids' => array(1, 2),
+      'fixture_tids_index' => array(1, 2),
+    ),
+    array(
+      'server' => 'http://*.example.com/',
+      'assigned_team' => 'team3',
+      'fixture_rids' => array(2),
+      'fixture_tids_index' => array(2),
+    ),
+  );
+
+  function getInfo() {
+    return array(
+      'name' => t('Teams'),
+      'description' => t('Teams/openid unit tests'),
+      'group' => t('OpenID Teams'),
+    );
+  }
+
+  function testAddsFieldToUserAdminSettingsForm() {
+    $form = $form_state = array();
+    $form_id = 'user_admin_settings';
+    openid_teams_form_alter($form, $form_state, $form_id);
+    $this->assertTrue(is_array($form['openid']['openid_teams_limit_to_known']));
+  }
+
+  function testIgnoresNonUserAdminSettingsForm() {
+    $form = $form_state = array();
+    $form_id = 'some_other_form';
+    openid_teams_form_alter($form, $form_state, $form_id);
+    $this->assertTrue(sizeof(array_keys($form)) == 0);
+  }
+
+  function testHandlesUserAdminSettingsSubmit() {
+    variable_del('openid_teams_limit_to_known');
+    $form = array();
+    $form_values = array(
+      'values' => array(
+        'form_id' => 'user_admin_settings',
+        'openid_teams_limit_to_known' => true,
+      ),
+    );
+    openid_teams_form_submit($form, $form_values);
+    $this->assertTrue(variable_get('openid_teams_limit_to_known', false));
+  }
+
+  function testHandlesUserAdminSettingsSubmitNotSet() {
+    variable_del('openid_teams_limit_to_known');
+    $form = array();
+    $form_values = array(
+      'values' => array(
+        'form_id' => 'user_admin_settings',
+      ),
+    );
+    openid_teams_form_submit($form, $form_values);
+    $this->assertFalse(variable_get('openid_teams_limit_to_known', true));
+  }
+
+  function testGetCurrentTeams() {
+    $result = sort(get_current_teams());
+    $fixture = sort(array_unique($this->all_teams));
+    $this->assertEqual($result, $fixture);
+  }
+
+  function testGetRolesTeamsMap() {
+    $result = get_roles_teams_map();
+    $fixture = array_combine($this->all_tids, $this->all_rids);
+    $this->assertEqual($result, $fixture);
+  }
+
+  function testGetTeamsRolesMap() {
+    $result = get_teams_roles_map();
+    $fixture = array();
+    for ($i = 0; $i < sizeof($this->all_teams); $i++) {
+      $team = $this->all_teams[$i];
+      $rid = $this->all_rids[$i];
+      if (!array_key_exists($team, $fixture)) {
+        $fixture[$team] = array();
+      }
+      $fixture[$team][] = $rid;
+    }
+    $this->assertEqual($result, $fixture);
+  }
+
+  function testGetTeamRoleIds() {
+    foreach ($this->rids_matched_by_servers as $test_case) {
+      $team = $test_case['assigned_team'];
+      $server = $test_case['server'];
+      $result = sort(get_team_role_ids($team, $server));
+      $fixture = sort($test_case['fixture_rids']);
+      $this->assertEqual($result, $fixture);
+    }
+  }
+
+  function testGetApprovedTeamMappingsWithArray() {
+    foreach ($this->rids_matched_by_servers as $test_case) {
+      $teams = array('no-team1', $test_case['assigned_team'], 'no-team2');
+      $server = $test_case['server'];
+      $result = sort(get_approved_team_mappings($teams, $server));
+      $fixture = sort($this->getTidsWithIndexes($test_case['fixture_tids_index']));
+      $this->assertEqual($result, $fixture);
+    }
+  }
+
+  function testGetApprovedTeamMappingsWithString() {
+    foreach ($this->rids_matched_by_servers as $test_case) {
+      $teams = "no-team1,no-team2,{$test_case['assigned_team']}";
+      $server = $test_case['server'];
+      $result = get_approved_team_mappings($teams, $server);
+      $fixture = sort($this->getTidsWithIndexes($test_case['fixture_tids_index']));
+      $this->assertEqual($result, $fixture);
+    }
+  }
+
+  function testGetApprovedTeamMappingsWithStringSingleTeam() {
+    foreach ($this->rids_matched_by_servers as $test_case) {
+      $teams = $test_case['assigned_team'];
+      $server = $test_case['server'];
+      $result = get_approved_team_mappings($teams, $server);
+      $fixture = sort($this->getTidsWithIndexes($test_case['fixture_tids_index']));
+      $this->assertEqual($result, $fixture);
+    }
+  }
+
+  private function getTidsWithIndexes($all_indexes) {
+    $tids = array();
+    foreach ($all_indexes as $index) {
+      $tids[] = $this->all_tids[$index];
+    }
+    return $tids;
+  }
+
+  function testOpenidTeamsGetTrustedListWithoutAllServers() {
+    $result = openid_teams_get_trusted_list();
+    $fixture = $this->getUniqueTrustedServersCount();
+    $this->assertEqual(sizeof($result), $fixture, sprintf('Expected %d, got %d', $fixture, sizeof($result)));
+  }
+
+  function testOpenidTeamsGetTrustedListWithAllServers() {
+    $result = openid_teams_get_trusted_list(TRUE);
+    $fixture = $this->getUniqueTrustedServersCount()+1;
+    $this->assertEqual(sizeof($result), $fixture, sprintf('Expected %d, got %d', $fixture, sizeof($result)));
+  }
+
+  function getUniqueTrustedServersCount() {
+    $non_null_servers = array();
+    foreach ($this->all_servers as $server) {
+      if ($server) {
+        $non_null_servers[] = $server;
+      }
+    }
+    return sizeof(array_unique($non_null_servers));
+  }
+
+  function setUp() {
+    parent::setUp('openid', 'openid_launchpad', 'openid_teams');
+    $this->setupTrustedServersData();
+    $this->setupTeamsRolesData();
+  }
+
+  function setupTrustedServersData() {
+    $servers_added = array();
+    $sid = 1;
+    for ($i = 0; $i < sizeof($this->all_servers); $i++) {
+      $server = $this->all_servers[$i];
+      if ($server != null) {
+        if (!in_array($server, $servers_added)) {
+          db_query("INSERT INTO {openid_teams_trusted} (sid, server) VALUES (%d, '%s')", $sid++, $server);
+          $servers_added[] = $server;
+        }
+        $this->all_sids[] = $sid;
+      }
+    }
+  }
+
+  function setupTeamsRolesData() {
+    for ($i = 0; $i < sizeof($this->all_teams); $i++) {
+      $tid = $i+1;
+      $this->all_tids[$i] = $tid;
+      $rid = $this->all_rids[$i];
+      $sid = $this->all_sids[$i];
+      $team = $this->all_teams[$i];
+      db_query('INSERT INTO {openid_teams_roles} (tid, rid, sid, team) '.
+               "VALUES (%d, %d, %d, '%s')", $tid, $rid, $sid, $team);
+    }
+  }
+
+  function tearDown() {
+    parent::tearDown();
+    db_query('DELETE FROM {openid_teams_roles}');
+    variable_del('openid_teams_limit_to_known');
+  }
+}

=== added directory 'tests/openid_test'
=== added file 'tests/openid_test.info'
--- tests/openid_test.info	1970-01-01 00:00:00 +0000
+++ tests/openid_test.info	2009-05-12 11:08:39 +0000
@@ -0,0 +1,8 @@
+; $Id$
+name = "OpenID Test"
+description = "Support module for OpenID Teams tests"
+package = Testing
+version = VERSION
+core = 6.x
+files[] = openid_test.module
+hidden = TRUE
\ No newline at end of file

=== added file 'tests/openid_test.module'
--- tests/openid_test.module	1970-01-01 00:00:00 +0000
+++ tests/openid_test.module	2009-05-12 11:08:39 +0000
@@ -0,0 +1,21 @@
+<?php
+
+function openid_test_menu() {
+  return array(
+    'teams/test/login' => array(
+      'title' => 'Mock login',
+      'page callback' => 'openid_test_login_with_teams',
+      'access arguments' => array('access content'),
+    ),
+  );
+}
+
+function openid_test_login_with_teams($teams) {
+  $op = 'user_register';
+  $response = array(
+    'openid.op_endpoint' => 'http://localhost/',
+    'openid.lp.is_member' => $teams,
+  );
+  openid_teams_openid_response($op, $response);
+  return "Requested teams {$teams}";
+}

=== added file 'tests/openid_test/admin.test'
--- tests/openid_test/admin.test	1970-01-01 00:00:00 +0000
+++ tests/openid_test/admin.test	2009-05-12 15:17:29 +0000
@@ -0,0 +1,118 @@
+<?php
+
+class DrupalTeamsAdminTestCase extends DrupalWebTestCase {
+  function getInfo() {
+    return array(
+      'name' => t('Teams admin'),
+      'description' => t('Teams/openid admin functions unit tests'),
+      'group' => t('OpenID Teams'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('openid', 'openid_teams');
+  }
+
+  public function testOpenidTeamsTrustedNewFormReturnsNonEmptyArray() {
+    $form = openid_teams_trusted_new_form();
+    $result = is_array($form) && !empty($form);
+    $this->assertTrue($result, 'New trusted server form returns a non-empty array');
+  }
+
+  public function testOpenidTeamsTrustedNewFormSubmitSavesData() {
+    db_query('DELETE FROM {openid_teams_trusted}');
+    $fixture = 'http://localhost/';
+    $form = openid_teams_trusted_new_form();
+    $form_state = array(
+      'values' => array(
+        'form_id' => 'openid_teams_trusted_new_form',
+        'new_server' => $fixture,
+      ),
+    );
+    openid_teams_trusted_new_form_submit($form, $form_state);
+    $this->assertEqual($this->countTableRows('trusted'), 1, 'Trusted server added to database');
+    $query = db_query('SELECT * FROM {openid_teams_trusted}');
+    $result = db_fetch_object($query);
+    $this->assertEqual($result->server, $fixture, "Confirm server value. Expected {$fixture}. ".
+                       "Got {$result->server}");
+  }
+
+  public function testOpenidTeamsAdminTrustedDeleteSubmitDeletesRow() {
+    db_query('DELETE FROM {openid_teams_trusted}');
+    db_query("INSERT INTO {openid_teams_trusted} (server) VALUES ('test1')");
+    db_query("INSERT INTO {openid_teams_trusted} (server) VALUES ('test2')");
+    $sid = db_last_insert_id('openid_teams_trusted', 'sid');
+    if ($this->countTableRows('trusted') != 2) {
+      throw new Exception('Test data not added.  Cannot continue.');
+    }
+    $form = array();
+    $form_state = array(
+      'values' => array(
+        'sid' => $sid,
+      ),
+    );
+    openid_teams_admin_trusted_delete_submit($form, $form_state);
+    $result = $this->countTableRows('trusted');
+    $this->assertEqual($result, 1, "Trusted server removed. Expected 1 rows. Got {$result}");
+  }
+
+  public function testOpenidTeamsFormAlterChangesForm() {
+    $form = $fixture = $form_state = array();
+    openid_teams_form_alter($form, $form_state, 'user_admin_settings');
+    $this->assertNotEqual($fixture, $form);
+  }
+
+  public function testOpenidTeamsFormSubmitChangesVariableWhenSet() {
+    variable_set('openid_teams_limit_to_known', false);
+    $form = array();
+    $form_state = array(
+      'values' => array(
+        'form_id' => 'user_admin_settings',
+        'openid_teams_limit_to_known' => '1',
+      ),
+    );
+    openid_teams_form_submit($form, &$form_state);
+    $result = variable_get('openid_teams_limit_to_known', false);
+    $this->assertTrue($result, 'OpenID teams limit variable set');
+  }
+
+  public function testOpenidTeamsFormSubmitChangesVariableWhenNotSet() {
+    variable_set('openid_teams_limit_to_known', true);
+    $form = array();
+    $form_state = array(
+      'values' => array(
+        'form_id' => 'user_admin_settings',
+      ),
+    );
+    openid_teams_form_submit($form, &$form_state);
+    $result = variable_get('openid_teams_limit_to_known', true);
+    $this->assertFalse($result, 'OpenID teams limit variable set');
+  }
+
+  public function testOpenidTeamsAdminFormReturnsNonEmptyArray() {
+    db_query("INSERT INTO {openid_teams_roles} (rid, sid, team) VALUES (2, -1, 'team1')");
+    db_query("INSERT INTO {openid_teams_roles} (rid, sid, team) VALUES (2, -1, 'team2')");
+    $form = openid_teams_admin_form();
+    $result = is_array($form) && !empty($form);
+    $this->assertTrue($result, 'Main admin form returns a non-empty array');
+  }
+
+  public function testOpenidTeamsMenuReturnsNonEmptyArray() {
+    $form = openid_teams_menu();
+    $result = is_array($form) && !empty($form);
+    $this->assertTrue($result, 'Menu hook returns a non-empty array');
+  }
+
+  public function testOpenidTeamsTrustedPageReturnsNonEmptyString() {
+    $content = openid_teams_trusted_page();
+    $result = is_string($content) && !empty($content);
+    $this->assertTrue($result, 'Trusted server management page returns content');
+  }
+
+  private function countTableRows($tablename) {
+    $sql = sprintf('SELECT count(*) AS count FROM {openid_teams_%s}', $tablename);
+    $query = db_query($sql);
+    $result = db_fetch_object($query);
+    return $result->count;
+  }
+}

=== added file 'tests/request.test'
--- tests/request.test	1970-01-01 00:00:00 +0000
+++ tests/request.test	2009-05-12 11:08:39 +0000
@@ -0,0 +1,39 @@
+<?php
+
+class DrupalTeamsRequestTestCase extends DrupalWebTestCase {
+  function getInfo() {
+    return array(
+      'name' => t('Teams request'),
+      'description' => t('Teams/openid request unit tests'),
+      'group' => t('OpenID Teams'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('openid_teams');
+  }
+
+  function tearDown() {
+    parent::tearDown();
+  }
+
+  public function testExtensionReturned() {
+    $ext = module_invoke_all('openid', 'extension');
+    $result = array_search('lp', $ext);
+    $this->assertNotIdentical($result, false, 'lp extension returned');
+  }
+
+  public function testTeamsAddedToRequest() {
+    $all_teams = array('team1', 'team2', 'team3');
+    $tid = 1;
+    foreach ($all_teams as $team) {
+      $rid = $this->_drupalCreateRole(array('access content'));
+      db_query('INSERT INTO {openid_teams_roles} (tid, rid, sid, team) '.
+               "VALUES (%d, %d, -1, '%s')", $tid++, $rid, $team);
+    }
+    $request = module_invoke_all('openid', 'request');
+    $result = $request['openid.lp.query_membership'];
+    $fixture = join(',', $all_teams);
+    $this->assertEqual($result, $fixture, 'Teams added to request');
+  }
+}

=== added file 'tests/response.test'
--- tests/response.test	1970-01-01 00:00:00 +0000
+++ tests/response.test	2009-05-12 11:08:39 +0000
@@ -0,0 +1,56 @@
+<?php
+
+class DrupalTeamsResponseTestCase extends DrupalWebTestCase {
+  function getInfo() {
+    return array(
+      'name' => t('Teams response'),
+      'description' => t('Teams/openid response unit tests'),
+      'group' => t('OpenID Teams'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('openid_test', 'openid_teams');
+  }
+
+  function tearDown() {
+    $this->drupalGet('logout');
+    variable_del('openid_teams_limit_to_known');
+    parent::tearDown();
+  }
+
+  public function testOpenidResponseLogsOutUserNotInTeamWithVariableSet() {
+    $this->runResponseTestForVariableStateAndTeam(true, 'team2');
+    $this->assertResponse(403, 'User has been logged out by mock registration call (not in team, '.
+                          'variable set)');
+  }
+
+  public function testOpenidResponseAcceptsUserInTeamWithVariableSet() {
+    $this->runResponseTestForVariableStateAndTeam(true, 'team1');
+    $this->assertResponse(200, 'User is still logged in after mock registration call (in team, '.
+                          'variable set)');
+  }
+
+  public function testOpenidResponseAcceptsUserNotInTeamWithVariableNotSet() {
+    $this->runResponseTestForVariableStateAndTeam(false, 'team2');
+    $this->assertResponse(200, 'User is still logged in after mock registration call (not in '.
+                          'team, variable not set');
+  }
+
+  public function testOpenidResponseAcceptsUserInTeamWithVariableNotSet() {
+    $this->runResponseTestForVariableStateAndTeam(false, 'team1');
+    $this->assertResponse(200, 'User is still logged in after mock registration call (in team, '.
+                          'variable not set)');
+  }
+
+  private function runResponseTestForVariableStateAndTeam($limit_to_known, $team) {
+    db_query("INSERT INTO {openid_teams_roles} (tid, rid, sid, team) VALUES (1, 1, -1, 'team1')");
+    $this->drupalGet('logout');
+    $user = $this->drupalCreateUser(array('access content'));
+    $this->drupalLogin($user);
+    variable_set('openid_teams_limit_to_known', $limit_to_known);
+    $content = $this->drupalGet("teams/test/login/{$team}");
+    $this->drupalGet("user/{$user->uid}");
+    db_query('DELETE FROM {openid_teams_roles}');
+  }
+}

=== added file 'tests/roles.test'
--- tests/roles.test	1970-01-01 00:00:00 +0000
+++ tests/roles.test	2009-05-12 15:36:47 +0000
@@ -0,0 +1,55 @@
+<?php
+
+class DrupalTeamsRolesTestCase extends DrupalWebTestCase {
+  function getInfo() {
+    return array(
+      'name' => t('Teams role assignment'),
+      'description' => t('Teams/openid role assignment unit tests'),
+      'group' => t('OpenID Teams'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('openid_teams');
+  }
+
+  function tearDown() {
+    parent::tearDown();
+  }
+
+  function testClearTeamRoles() {
+    $user = $this->drupalCreateUser(array('access content'));
+    $roles_before = $this->getRoleIdsForUser($user);
+    $roles_assigned = array();
+    for ($assigned = 0; $assigned < 4; $assigned++) {
+      $roles_assigned[] = $this->addRoleForTeamAndUser($assigned, $user);
+    }
+    $roles_now = $this->getRoleIdsForUser($user);
+    if (sizeof($roles_now) - sizeof($roles_before) != $assigned) {
+      throw new Exception('Roles incorrectly assigned. Not running test');
+    } else {
+      variable_set("openid_assigned_roles_{$user->uid}", join(',', $roles_assigned));
+      clear_team_roles($user);
+      variable_del("openid_assigned_roles_{$user->uid}");
+      $roles_after = $this->getRoleIdsForUser($user);
+      $this->assertEqual($roles_before, $roles_after, 'Team roles removed from database');
+    }
+  }
+
+  private function getRoleIdsForUser($user) {
+    $query = db_query('SELECT rid FROM {users_roles} WHERE uid=%d ORDER BY rid', $user->uid);
+    $all_rids = array();
+    while ($row = db_fetch_object($query)) {
+      $all_rids[] = $row->rid;
+    }
+    return $all_rids;
+  }
+
+  private function addRoleForTeamAndUser($team_id, $user) {
+    $rid = $this->_drupalCreateRole(array('access content'));
+    db_query('INSERT INTO {openid_teams_roles} (rid, sid, team) '.
+             "VALUES (%d, -1, 'team%d')", $rid, $team_id);
+    db_query("INSERT INTO {users_roles} (uid, rid) VALUES (%d, '%s')", $user->uid, $rid);
+    return $rid;
+  }
+}