Index: openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl,v
diff -u -r1.1.4.2 -r1.1.4.3
--- openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl	24 Sep 2005 01:10:20 -0000	1.1.4.2
+++ openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl	14 Nov 2005 14:21:21 -0000	1.1.4.3
@@ -5,116 +5,181 @@
 
 }
 
-aa_register_case -cats {web smoke} -libraries tclwebtest  webtest_new_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest  tclwebtest_new_faq_portlet {
 
     Testing the creation a Faq from the portlet.
 
 } {
 	aa_run_with_teardown -test_code {
-		# Create new Faq
-		set faq_name [ad_generate_random_string]
-		set response [faq_portlet::twt::new $faq_name] 
- 		aa_display_result -response $response -explanation {Webtest for creating a New Faq from the portlet}
+		
+	    tclwebtest::cookies clear 
+	    # Login user
+	    array set user_info [twt::user::create -admin] 
+	    twt::user::login $user_info(email) $user_info(password) 
 
+	    # Create new Faq
+	    set faq_name [ad_generate_random_string]
+	    set response [faq_portlet::twt::new $faq_name] 
+	    aa_display_result -response $response -explanation {Webtest for creating a New Faq from the portlet}
+	    
+	    twt::user::logout 
        }
 }	
 
-aa_register_case -cats {web smoke} -libraries tclwebtest  webtest_delete_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest  tclwebtest_delete_faq_portlet {
 
     Testing the process of creating and deleteing a Faq from the portlet.
 
 } {
 	aa_run_with_teardown -test_code {
-		# Create new Faq
-		set faq_name [ad_generate_random_string]
-		faq_portlet::twt::new $faq_name
-                # Deleteing the faq 
-		set response [faq_portlet::twt::delete $faq_name]
-		aa_display_result -response $response -explanation {Webtest for deleting a Faq}
+	
+            tclwebtest::cookies clear  
+            # Login user 
+            array set user_info [twt::user::create -admin]  
+            twt::user::login $user_info(email) $user_info(password)  
+
+	    # Create a new Faq
+	    set faq_name [ad_generate_random_string]
+	    faq_portlet::twt::new $faq_name
+            
+	    # Delete the faq 
+	    set response [faq_portlet::twt::delete $faq_name]
+	    aa_display_result -response $response -explanation {Webtest for deleting a Faq}
 		
+	    twt::user::logout
         } 
 }
 
-aa_register_case -cats {web smoke} -libraries tclwebtest webtest_disable_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_disable_faq_portlet {
 
     Testing the process of creating and disableing a Faq. 
 
 } {
 	aa_run_with_teardown -test_code {
-		# Create new faq 
-		set faq_name [ad_generate_random_string]
-		faq_portlet::twt::new $faq_name
-                # Disable the Faq
-		set option "disable"		
-		set response [faq_portlet::twt::disable_enable $faq_name $option]
-		aa_display_result -response $response -explanation {Webtest for disabling a Faq}
-        }
+		
+            tclwebtest::cookies clear  
+            # Login user 
+            array set user_info [twt::user::create -admin]  
+            twt::user::login $user_info(email) $user_info(password)  
+
+	    # Create new faq 
+	    set faq_name [ad_generate_random_string]
+	    faq_portlet::twt::new $faq_name
+            
+	    # Disable the Faq
+	    set option "disable"		
+	    set response [faq_portlet::twt::disable_enable $faq_name $option]
+	    aa_display_result -response $response -explanation {Webtest for disabling a Faq}
+	    
+	    twt::user::logout
+	}
 }
 
-aa_register_case -cats {web smoke} -libraries tclwebtest webtest_enable_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_enable_faq_portlet {
 
     Testing the process of creating, desableing and enableing Faq. 
 
 } {
 	aa_run_with_teardown -test_code {
-		# Create the Faq 
-		set faq_name [ad_generate_random_string]
-		faq_portlet::twt::new $faq_name
-                # Disable the faq
-		set option "disable"		
-		faq_portlet::twt::disable_enable $faq_name $option
-                # Enable the faq
-		set option "enable"
-	        set response [faq_portlet::twt::disable_enable $faq_name $option]
-		aa_display_result -response $response -explanation {Webtest for enabling a Faq}
-	    }
+
+            tclwebtest::cookies clear
+            # Login user
+            array set user_info [twt::user::create -admin]
+            twt::user::login $user_info(email) $user_info(password)
+
+	    # Create the Faq 
+	    set faq_name [ad_generate_random_string]
+	    faq_portlet::twt::new $faq_name
+            
+	    # Disable the faq
+	    set option "disable"		
+	    faq_portlet::twt::disable_enable $faq_name $option
+                
+	    # Enable the faq
+	    set option "enable"
+	    set response [faq_portlet::twt::disable_enable $faq_name $option]
+            aa_display_result -response $response -explanation {Webtest for enabling a Faq}	    
+            
+	    twt::user::logout	
+	}
 }
 
-aa_register_case -cats {web smoke} -libraries tclwebtest webtest_edit_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_edit_faq_portlet {
 
     Testing the process of creating and editing a Faq. 
 
 } {
 	aa_run_with_teardown -test_code {
-		# Creating the new faq
-		set faq_name [ad_generate_random_string]
-		set new_faq_name [ad_generate_random_string]
-		faq_portlet::twt::new $faq_name 
-                # Edit the faq
-		set response [faq_portlet::twt::edit_faq $faq_name $new_faq_name]
-		aa_display_result -response $response -explanation {Webtest for editing a Faq}
-        } 
+	
+            tclwebtest::cookies clear  
+            # Login user 
+            array set user_info [twt::user::create -admin]  
+            twt::user::login $user_info(email) $user_info(password)  
+
+	    # Creat a new faq
+	    set faq_name [ad_generate_random_string]
+	    faq_portlet::twt::new $faq_name 
+            
+	    # Edit the faq
+	    set new_faq_name [ad_generate_random_string] 
+	    set response [faq_portlet::twt::edit_faq $faq_name $new_faq_name]
+	    aa_display_result -response $response -explanation {Webtest for editing a Faq}
+        
+            twt::user::logout	
+	} 
 }
 
-aa_register_case -cats {web smoke} -libraries tclwebtest webtest_new_Q_A_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_new_Q_A_faq_portlet {
 
     Testing the process of create a Faq and create a new Q&A. 
 
 } {
 	aa_run_with_teardown -test_code {  
-		set faq_name [ad_generate_random_string]
-		set question [ad_generate_random_string]
-		set answer [ad_generate_random_string]
 
-		faq_portlet::twt::new $faq_name
-	        set response [faq_portlet::twt::new_Q_A $faq_name $question $answer]
-	        aa_display_result -response $response -explanation {Webtest for creating a New Question in a dotLRN Faq}
-        }
+            tclwebtest::cookies clear   
+            # Login user  
+            array set user_info [twt::user::create -admin]   
+            twt::user::login $user_info(email) $user_info(password) 
+		
+	    # Creat a new faq
+	    set faq_name [ad_generate_random_string]
+	    faq_portlet::twt::new $faq_name
+	    
+	    # Create a new Question_Answer 
+	    set question [ad_generate_random_string]
+	    set answer [ad_generate_random_string]
+	    set response [faq_portlet::twt::new_Q_A $faq_name $question $answer]
+	    aa_display_result -response $response -explanation {Webtest for creating a New Question in a dotLRN Faq}
+            
+	    twt::user::logout        
+	}
 }
 
-aa_register_case -cats {web smoke} -libraries tclwebtest webtest_delete_Q_A_faq_portlet {
+aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_delete_Q_A_faq_portlet {
 
     Testing the process of create a faq, create a Q&A and  then delete the Q&A.
 
-    } {
+} {
         aa_run_with_teardown -test_code {
-	    set faq_name [ad_generate_random_string]
-	    set question [ad_generate_random_string]
-	    set answer [ad_generate_random_string]
-
-            faq_portlet::twt::new $faq_name
+	    
+            tclwebtest::cookies clear    
+            # Login user   
+            array set user_info [twt::user::create -admin]    
+            twt::user::login $user_info(email) $user_info(password)  
+                 
+            # Creat a new faq 
+            set faq_name [ad_generate_random_string] 
+            faq_portlet::twt::new $faq_name 
+             
+            # Create a new Question_Answer  
+            set question [ad_generate_random_string] 
+            set answer [ad_generate_random_string] 
 	    faq_portlet::twt::new_Q_A $faq_name $question $answer
+	    
+	    # Delete the Question_Answer
 	    set response [faq_portlet::twt::delete_Q_A $faq_name $question]
 	    aa_display_result -response $response -explanation {Webtest for deleting a Question in a Faq}
-        }
-    }
+	    
+	    twt::user::logout        
+	}
+}
Index: openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl,v
diff -u -r1.1.4.2 -r1.1.4.3
--- openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl	24 Sep 2005 01:10:20 -0000	1.1.4.2
+++ openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl	14 Nov 2005 14:21:21 -0000	1.1.4.3
@@ -1,4 +1,4 @@
- 	ad_library {
+ad_library {
     Automated tests.
     @author Mounir Lallali
     @author Gerardo Morales
@@ -18,10 +18,6 @@
 ad_proc faq_portlet::twt::new { faq_name } {
 
         set response 0
-	tclwebtest::cookies clear
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
 	 
 	set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"	 
 	::twt::do_request $dotlrn_page_url
@@ -49,21 +45,17 @@
 	} else {
 		aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
 	}
-	twt::user::logout
+	
 	return $response
 }
 
 ad_proc faq_portlet::twt::delete { faq_name} {
 
         set response 0
-	tclwebtest::cookies clear
 
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
-
 	set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"	 
 	::twt::do_request $dotlrn_page_url
+	
 	tclwebtest::link follow "Classes"	
 
 	# Create a new FAQ		 
@@ -73,7 +65,7 @@
 	tclwebtest::link follow {View All FAQs} 
 
 	db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
-	::twt::do_request [export_vars -base "faq-delete" {faq_id}]"
+	::twt::do_request [export_vars -base "faq-delete" {faq_id}]
 
 	set response_url [tclwebtest::response url]	
 	
@@ -87,21 +79,14 @@
 	} else {
 		aa_error "faq_portlet::twt::delete failed, bad response url : $response_url"
 	}
-	twt::user::logout
+	
 	return $response
 }
 
-ad_proc faq_portlet::twt::disable_enable { faq_name option} {
+ad_proc faq_portlet::twt::disable_enable { faq_name option } {
 
         set response 0
-	# Option : disable or enable
 
-	tclwebtest::cookies clear
-
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
-
 	set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"	 
 	::twt::do_request $dotlrn_page_url
 
@@ -129,20 +114,15 @@
 	} else {
 		aa_error "faq_portlet::twt::$option failed. Bad  response url : $response_url "
 	}
-	twt::user::logout
+	
 	return $response
 }
 
 
 ad_proc faq_portlet::twt::edit_faq { faq_name faq_new_name } {
 
         set response 0
-	tclwebtest::cookies clear
 
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
-
 	db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
 	 
 	set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"	 
@@ -173,19 +153,14 @@
 	} else {
 		aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
 	}
-	twt::user::logout
+	
 	return $response
 }
 
 ad_proc faq_portlet::twt::new_Q_A { faq_name question answer} {
 
         set response 0
-	tclwebtest::cookies clear
 
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
-		
 	set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"	 
 	::twt::do_request $dotlrn_page_url
 	tclwebtest::link follow "Classes"
@@ -214,20 +189,14 @@
 	} else {
 		aa_error "dorlrn_faq::twt::new_Q_A failed. Bad  response url : $response_url"
 	}
-	twt::user::logout
+	
 	return $response
 }
 
-
 ad_proc faq_portlet::twt::delete_Q_A { faq_name question} {
 
         set response 0
-        tclwebtest::cookies clear
 
-        # Login user
-        array set user_info [twt::user::create -admin]
-        twt::user::login $user_info(email) $user_info(password)
-
         set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
         ::twt::do_request $dotlrn_page_url
         tclwebtest::link follow "Classes"
@@ -252,6 +221,6 @@
         } else {
                 aa_error "dorlrn_faq::twt::delete_Q_A failed. Bad  response url : $response_url"
         }
-        twt::user::logout
-        return $response
+        
+	return $response
     }