[geeklog-cvs] A_and_A/client/testscripts AAServiceInterfaceTest.class.php,1.2,1.3 AAUserTest.class.php,1.3,1.4

[tony at geeklog.net]

Update of /usr/cvs/geeklog/A_and_A/client/testscripts
In directory internal.geeklog.net:/tmp/cvs-serv11744

Modified Files:
	AAServiceInterfaceTest.class.php AAUserTest.class.php 
Log Message:
Tons of fixes.  Mostly working again

Index: AAServiceInterfaceTest.class.php
===================================================================
RCS file: /usr/cvs/geeklog/A_and_A/client/testscripts/AAServiceInterfaceTest.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AAServiceInterfaceTest.class.php	26 Nov 2002 00:24:51 -0000	1.2
--- AAServiceInterfaceTest.class.php	10 Jan 2003 05:55:12 -0000	1.3
***************
*** 87,91 ****
          $this->assertEquals($this->_aaPort, $user->_aaPort,'aaPort descrepancy');
          $this->assertEquals($this->_appId, $user->getAppId(),'appId descrepancy');
!         $this->assertEquals($this->_userId, $user->getUserId(),'userId descrepancy');
          $this->assertEquals($this->_password, $user->getPassword(),'password descrepancy');
      }
--- 87,91 ----
          $this->assertEquals($this->_aaPort, $user->_aaPort,'aaPort descrepancy');
          $this->assertEquals($this->_appId, $user->getAppId(),'appId descrepancy');
!         $this->assertEquals($this->_userId, $user->getUserName(),'userName descrepancy');
          $this->assertEquals($this->_password, $user->getPassword(),'password descrepancy');
      }

Index: AAUserTest.class.php
===================================================================
RCS file: /usr/cvs/geeklog/A_and_A/client/testscripts/AAUserTest.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AAUserTest.class.php	27 Nov 2002 00:22:03 -0000	1.3
--- AAUserTest.class.php	10 Jan 2003 05:55:12 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
      var $_appId = '';
      var $_userId = '';
+     var $_userName = '';
      var $_password = '';
  
***************
*** 49,53 ****
          $this->testUser->_aaPort = 80;
          $this->testUser->_appId = 'A_AND_A';
!         $this->testUser->_userId = 'root at localhost';
          $this->testUser->_password = 'foo';
          $privilege = new AAPrivilege();
--- 50,55 ----
          $this->testUser->_aaPort = 80;
          $this->testUser->_appId = 'A_AND_A';
!         $this->testUser->_userId = '1';
!         $this->testUser->_userName = 'root at localhost';
          $this->testUser->_password = 'foo';
          $privilege = new AAPrivilege();
***************
*** 110,122 ****
          $this->assertTrue($retval, 'Reset Password method failed');
      }
      
! #    function testGetUserPrivileges()
! #    {
! #        $privArray = $this->testUser->getUserPrivileges($this->testUser->_userId);
! #        $priv = current($privArray);
! #        $privCode = $priv->getPrivilegeCode();
! #        $this->assertEquals('AA_ADMIN',$privCode);
! #    }
! #
  #    function testSetUserPrivileges()
  #    {
--- 112,139 ----
          $this->assertTrue($retval, 'Reset Password method failed');
      }
+ 
+     function testGetUserPrivileges()
+     {
+         $privArray = $this->testUser->getUserPrivileges($this->testUser->_userName);
+         $priv = current($privArray);
+         $privCode = $priv->getPrivilegeCode();
+         $this->assertEquals('AA_ADMIN_PRIV',$privCode);
+     }
      
!     function testListAppPrivileges()
!     {
!         $privArray = $this->testUser->listAppPrivileges();
!         $priv = current($privArray);
!         $privCode = $priv->getPrivilegeCode();
!         $this->assertEquals('AA_ADMIN_PRIV',$privCode);
!     }
! /*
!     function testListAppGroups()
!     {
!         $groupArray = $this->testUser->listAppGroups();
!         $curGroup = current($groupArray);
!         $this->assertEquals('AA_ADMIN',$curGroup->getGroupLogicalName());
!     }
! */
  #    function testSetUserPrivileges()
  #    {