From 3a7564b99e9404febd4be5a87ac64882aad29627 Mon Sep 17 00:00:00 2001
From: Marco Villegas <marvil07@gmail.com>
Date: Tue, 7 Dec 2010 21:36:46 -0500
Subject: [PATCH] minor things

- add second parameter to db_select() calls at
  VersioncontrolAuthHandlerMappedAccounts class.
- save auth account data to DB and compare it to the inserted dummy data
  with two asserts.
---
 ...rsioncontrolAuthHandlerMappedAccounts.class.php |    6 ++--
 tests/VersioncontrolAccountAuthPlugin.test         |   27 +++++++++----------
 tests/VersioncontrolTestCase.test                  |    5 +--
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git includes/plugins/vcs_auth/VersioncontrolAuthHandlerMappedAccounts.class.php includes/plugins/vcs_auth/VersioncontrolAuthHandlerMappedAccounts.class.php
index 519e2b0..3e1ad52 100644
--- includes/plugins/vcs_auth/VersioncontrolAuthHandlerMappedAccounts.class.php
+++ includes/plugins/vcs_auth/VersioncontrolAuthHandlerMappedAccounts.class.php
@@ -62,7 +62,7 @@ class VersioncontrolAuthHandlerMappedAccounts implements VersioncontrolAuthHandl
     }
 
     // Retrieve the base auth data
-    $this->userData = db_select('versioncontrol_auth_account')
+    $this->userData = db_select('versioncontrol_auth_account', 'base')
       ->fields('base')
       ->condition('repo_id', $this->repository->repo_id)
       ->execute()
@@ -73,7 +73,7 @@ class VersioncontrolAuthHandlerMappedAccounts implements VersioncontrolAuthHandl
     }
 
     // Retrieve the extended per-label auth data
-    $label_data = db_select('versioncontrol_auth_account_label')
+    $label_data = db_select('versioncontrol_auth_account_label', 'base')
       ->fields('base')
       ->condition('repo_id', $this->repository->repo_id)
       ->execute();
@@ -259,4 +259,4 @@ class VersioncontrolAuthHandlerMappedAccounts implements VersioncontrolAuthHandl
     }
     $insert->execute();
   }
-}
\ No newline at end of file
+}
diff --git tests/VersioncontrolAccountAuthPlugin.test tests/VersioncontrolAccountAuthPlugin.test
index 8e10218..952e2b8 100644
--- tests/VersioncontrolAccountAuthPlugin.test
+++ tests/VersioncontrolAccountAuthPlugin.test
@@ -10,13 +10,13 @@ require_once drupal_get_path('module', 'versioncontrol') . '/tests/Versioncontro
 class VersioncontrolAccountAuthPlugin extends VersioncontrolTestCase {
 
   protected $repos = array();
-  
+
   /**
    * Implementation of getInfo().
    */
   public static function getInfo() {
     return array(
-      'name' => t('Versioncontrol account plugin testing'),
+      'name' => t('Versioncontrol account authentication plugin testing'),
       'description' => t("Test the base 'account' auth plugin's CRUD and authorization logic."),
       'group' => t('Version Control'),
     );
@@ -33,24 +33,20 @@ class VersioncontrolAccountAuthPlugin extends VersioncontrolTestCase {
     $admin_user = $this->drupalCreateUser(array('administer version control systems'));
     $this->drupalLogin($admin_user);
 
-    $repo_data = array(
-      'plugins' => array(
-        'auth_handler' => 'account'
-      ),
-    );
-
     foreach ($this->backends as $type => $backend) {
       $this->repos[$type] = $this->versioncontrolCreateRepository($type);
     }
   }
 
   public function testAuthPluginCrud() {
+    //FIXME do this for each repo?
     $repo = reset($this->repos);
     // Manually instantiate the plugin for the create portion
     $class_name = ctools_plugin_load_class('versioncontrol', 'vcs_auth', 'account', 'handler');
     $authplug = new $class_name();
     $authplug->setRepository($repo);
 
+    // Add one auth account row
     $super_user = $this->drupalCreateUser();
     $super_user_data = array(
       'access' => VersioncontrolAuthHandlerMappedAccounts::ALL,
@@ -62,15 +58,18 @@ class VersioncontrolAccountAuthPlugin extends VersioncontrolTestCase {
       'tag_delete' => VersioncontrolAuthHandlerMappedAccounts::GRANT,
       'per-label-auth' => array(),
     );
-
     $authplug->setUserData($super_user->uid, $super_user_data);
+    $authplug->save();
 
     // Now load the plugin using the provided method and retrieve the user data,
     // ensure it's what we sent in
-    $authplug = $repo->getAuthHandler();
-    $data = $authplug->getUserData($super_user->uid);
-    
-  }
+    $db_authplug = $repo->getAuthHandler();
+    $db_data = $db_authplug->getUserData($super_user->uid);
+    $at_input = array_diff($super_user_data, $db_data);
+    $this->assertTrue(empty($at_input), 'Authentication account database data is included on provided data');
+    $at_db = array_diff($db_data, $super_user_data);
+    $this->assertTrue(empty($at_db), 'Authentication account provided data is included on database data');
+ }
 
   public function testAuthLogic() {
     foreach ($this->repos as $repo) {
@@ -81,5 +80,5 @@ class VersioncontrolAccountAuthPlugin extends VersioncontrolTestCase {
   public function doAuthLogicTest(VersioncontrolRepository $repo) {
     $authplug = $repo->getAuthHandler();
   }
-  
+
 }
diff --git tests/VersioncontrolTestCase.test tests/VersioncontrolTestCase.test
index c204051..51e77ae 100644
--- tests/VersioncontrolTestCase.test
+++ tests/VersioncontrolTestCase.test
@@ -132,9 +132,9 @@ abstract class VersioncontrolTestCase extends DrupalWebTestCase {
    * @param string $backend
    */
   public function versioncontrolCreateRepository($backend = 'test', $data = array()) {
-    static $i = 1;
+    static $i = 0;
     $default_data = array(
-      'name' => 'test_repo_' . $i,
+      'name' => 'test_repo_' . ++$i,
       'vcs' => $backend,
       'root' => '/fake/path/to/repo',
       'update_method' => 0,
@@ -145,7 +145,6 @@ abstract class VersioncontrolTestCase extends DrupalWebTestCase {
         'auth_handler' => 'ffa',
       ),
     );
-    $i++;
 
     $data = array_merge_recursive($default_data, $data);
     $backend = $this->backends[$backend];
-- 
1.7.2.3