Index: openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl	25 Jul 2018 13:42:48 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl	10 Aug 2018 09:26:07 -0000	1.7
@@ -1,7 +1,7 @@
 ad_library {
-    
+
     Test for Permission Procedures
-    
+
     @author Cesar Hernandez (cesarhj@galileo.edu)
     @creation-date 2006-07-14
     @cvs-id $Id$
@@ -24,69 +24,69 @@
         # We get an user_id as party_id.
         set user_id [db_nextval acs_object_id_seq]
 
-	# Create the user
-	set user_info [acs::test::user::create -user_id $user_id]
-        
-	# Create and mount new subsite to test the permissions on this
-	# instance.
-	set site_name [ad_generate_random_string]
-	set new_package_id [site_node::instantiate_and_mount \
-				-node_name $site_name \
-				-package_key acs-subsite]
-	# Grant privileges of admin,read,write and create, after check
-	# this ones, after revoke this ones.
-	
-	# Grant admin privilege
- 	permission::grant -party_id $user_id -object_id $new_package_id -privilege "admin"  
- 	# Verifying the admin privilege on the user
+        # Create the user
+        set user_info [acs::test::user::create -user_id $user_id]
+
+        # Create and mount new subsite to test the permissions on this
+        # instance.
+        set site_name [ad_generate_random_string]
+        set new_package_id [site_node::instantiate_and_mount \
+                                -node_name $site_name \
+                                -package_key acs-subsite]
+        # Grant privileges of admin,read,write and create, after check
+        # this ones, after revoke this ones.
+
+        # Grant admin privilege
+        permission::grant -party_id $user_id -object_id $new_package_id -privilege "admin"
+        # Verifying the admin privilege on the user
         aa_true "testing admin privilege" \
- 	    {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 1}
- 	# Revoking admin privilege
- 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "admin"
- 	aa_true "testing if admin privilege was revoked" \
- 	    {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 0}
+            {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 1}
+        # Revoking admin privilege
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "admin"
+        aa_true "testing if admin privilege was revoked" \
+            {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 0}
 
-	# Grant read privilege
-	permission::grant -party_id $user_id -object_id $new_package_id -privilege "read"
- 	# Verifying  the read privilege on the user
+        # Grant read privilege
+        permission::grant -party_id $user_id -object_id $new_package_id -privilege "read"
+        # Verifying  the read privilege on the user
         aa_true "testing read permissions" \
             {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "read" ] == 1}
         # Revoking read privilege
         permission::revoke -party_id $user_id -object_id $new_package_id -privilege "read"
-	# We tested with a query because we have problems with inherit
-	aa_true "testing if read privilege was revoked" \
-	    {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] ==  0}
+        # We tested with a query because we have problems with inherit
+        aa_true "testing if read privilege was revoked" \
+            {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] ==  0}
 
         # Grant write privilege
-  	permission::grant -party_id $user_id -object_id $new_package_id -privilege "write"
-  	# Verifying the write privilege  on the user
-  	aa_true "testing write permissions" \
+        permission::grant -party_id $user_id -object_id $new_package_id -privilege "write"
+        # Verifying the write privilege  on the user
+        aa_true "testing write permissions" \
               {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}
- 	# Revoking write privilege
- 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "write"
- 	aa_true "testing if write permissions was revoked" \
- 	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 0}
+        # Revoking write privilege
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "write"
+        aa_true "testing if write permissions was revoked" \
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 0}
 
-  	# Grant create privilege
-  	permission::grant -party_id $user_id -object_id $new_package_id -privilege "create"
-  	# Verifying the create privilege  on the user
-  	aa_true "testing create permissions" \
+        # Grant create privilege
+        permission::grant -party_id $user_id -object_id $new_package_id -privilege "create"
+        # Verifying the create privilege  on the user
+        aa_true "testing create permissions" \
             {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}
- 	# Revoking create privilege
+        # Revoking create privilege
         permission::revoke -party_id $user_id -object_id $new_package_id -privilege "create"
         aa_true "testing if create privileges was revoked" \
             {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 0}
 
- 	# Grant delete privilege
- 	permission::grant -party_id $user_id -object_id $new_package_id -privilege "delete"
- 	# Verifying the delete privilege on the user
- 	aa_true "testing delete permissions" \
+        # Grant delete privilege
+        permission::grant -party_id $user_id -object_id $new_package_id -privilege "delete"
+        # Verifying the delete privilege on the user
+        aa_true "testing delete permissions" \
              {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}
- 	# Revoking delete privilege
- 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "delete"
+        # Revoking delete privilege
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "delete"
          aa_true "testing if delete permissions was revoked" \
              {[permission::permission_p -party_id $user_id  -object_id  $new_package_id -privilege "delete" ]  == 0}
-    } 
+    }
 }
 
 aa_register_case \
@@ -106,40 +106,41 @@
         # We get an user_id as party_id.
         set user_id [db_nextval acs_object_id_seq]
 
-	# Create the user
-	set user_info [twt::user::create -user_id $user_id]
-        
-	# Create and mount new subsite to test the permissions on this
-	# instance
-	set site_name [ad_generate_random_string]
-	set new_package_id [site_node::instantiate_and_mount \
-				-node_name $site_name \
-				-package_key acs-subsite]
-	#Grant permissions for this user in this object
-	permission::grant -party_id $user_id -object_id $new_package_id -privilege "delete"
-	aa_true "testing admin permissions" \
-	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}
-	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "delete"
+        # Create the user
+        set user_info [acs::test::user::create -user_id $user_id]
 
+        # Create and mount new subsite to test the permissions on this
+        # instance
+        set site_name [ad_generate_random_string]
+        set new_package_id [site_node::instantiate_and_mount \
+                                -node_name $site_name \
+                                -package_key acs-subsite]
+        #Grant permissions for this user in this object
+        permission::grant -party_id $user_id -object_id $new_package_id -privilege "delete"
+        aa_true "testing admin permissions" \
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "delete"
+
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "create"
-	aa_true "testing create permissions" \
-	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}
-	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "create"
+        aa_true "testing create permissions" \
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "create"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "write"
-	aa_true "testing write permissions" \
-	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}
+        aa_true "testing write permissions" \
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}
         permission::revoke -party_id $user_id -object_id $new_package_id -privilege "write"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "read"
-	aa_true "testing read permissions" \
-	    {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] == 1}
-	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "read"
+        aa_true "testing read permissions" \
+            {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] == 1}
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "read"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "admin"
-	aa_true "testing delete permissions" \
-	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "admin" ] == 1}
-	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "admin"
+        aa_true "testing delete permissions" \
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "admin" ] == 1}
+        permission::revoke -party_id $user_id -object_id $new_package_id -privilege "admin"
+
     }
 }
 # Local variables: