Modify pass/fail part

21 files changed, 231 insertions, 119 deletions

diff --git a/evolution/changecomponent.py b/evolution/changecomponent.py
index 56063eb..3f1a8a7 100644
--- a/evolution/changecomponent.py
+++ b/evolution/changecomponent.py
@@ -1,5 +1,20 @@
 from evoutils.mail import *
 
-if get_window ('Mail') == 0:
-	log ('Evolution not in Mailer component', 'error')
+# Read input from file
+data_object = LdtpDataFileParser (datafilename)
+view_component = data_object.gettagvalue ('view_component')
+
+try :
+	log ('Change Compoent', 'teststart')
+
+	if get_window (view_component[0]) == 0:
+		log ('Change Component', 'fail')
+	log ('Change Component', 'pass')
+        log ('Change Compoent','testend')
+
+except:
+         log('Unable to change component','error')
+         log('Change Compoent','testend')
+         raise LdtpExecutionError(0)
+
 
diff --git a/evolution/chk_file_new.py b/evolution/chk_file_new.py
index 793ba70..0a11d14 100644
--- a/evolution/chk_file_new.py
+++ b/evolution/chk_file_new.py
@@ -41,10 +41,12 @@ def chk_new_items():
 			if selectmenuitem('frmEvolution-*','mnuFile;mnuNew;mnu'+mnuitem) == 1:
 				time.sleep(3)
 			close_win(i,windowname)
+                log('Verify all items in the mnuNew', 'pass')
 	except:
 		print 'Must be problem with ' + new_items[i]
 		log('Must be problem with ' + new_items[i] , 'cause')
 		print 'Some windows failed to open in menu file;new'
+                log('Verify all items in the mnuNew','fail')
 		log('Verify all items in the mnuNew','testend')			
 		raise LdtpExecutionError (0)
 	log('Verify all items in the mnuNew','testend')			
@@ -198,7 +200,7 @@ def close_win(i,windowname):
 			log(new_items[i] + 'Not Working','info')
 			raise LdtpExecutionError (0)
 	elif new_items[i] == 'Calendar':
-		setcontext('Task List Properties','New Calendar')
+		#setcontext('New Calendar','New Calendar')
 		if waittillguiexist(windowname) == 1:
 			print new_items[i] + ' Working'
 			log(new_items[i] + ' Working','info')
@@ -207,9 +209,9 @@ def close_win(i,windowname):
 			print new_items[i] + ' Not Working'
 			log(new_items[i] + 'Not Working','info')
 			raise LdtpExecutionError (0)
-		releasecontext()
+		#releasecontext()
 	elif new_items[i] == 'Memo List':
-		setcontext('Task List Properties','New Memo List')
+		#setcontext('Task List Properties','New Memo List')
 		if waittillguiexist(windowname) == 1:
 			print new_items[i] + ' Working'
 			log(new_items[i] + ' Working','info')
@@ -218,7 +220,7 @@ def close_win(i,windowname):
 			print new_items[i] + ' Not Working'
 			log(new_items[i] + 'Not Working','info')
 			raise LdtpExecutionError (0)
-		releasecontext()
+		#releasecontext()
 	elif new_items[i] == 'Task List':
 		if waittillguiexist(windowname) == 1:
 			print new_items[i] + ' Working'
diff --git a/evolution/closecomposewindow.py b/evolution/closecomposewindow.py
index d4d563c..72a5b05 100644
--- a/evolution/closecomposewindow.py
+++ b/evolution/closecomposewindow.py
@@ -34,9 +34,9 @@ except:
     raise LdtpExecutionError (0)
 try:
     time.sleep (3)
-    selectmenuitem ('frmEvolution-Mail','mnuFile;mnuNew;mnuMailMessage')
-    waittillguiexist ('frmComposeamessage')
-    settextvalue ('frmComposeamessage','txt6','abc')
+    selectmenuitem ('frmEvolution-*','mnuFile;mnuNew;mnuMailMessage')
+    waittillguiexist ('frmComposeMessage')
+    settextvalue ('frmComposeMessage','txt6','abc')
     closecomposewindow (int(state[0]))
 except:
     log ('Close compose window failed','error')
diff --git a/evolution/contact.py b/evolution/contact.py
index 78e9785..93a75fe 100644
--- a/evolution/contact.py
+++ b/evolution/contact.py
@@ -98,9 +98,10 @@ def selectMailPane():
     try:
          print "b4 getcurinwdow"
          window_id=getcurwindow()
+         window_id = 'frmEvolution-*'
          print "after getcurinwdow"
          click (window_id,'tbtnMail')
-         waittillguiexist ('frmEvolution-Mail')
+         waittillguiexist ('frmEvolution-*')
     except:
         log ('error selecting Mail pane','error')
         log ('Open Evolution Mail Pane','testend')
@@ -165,6 +166,18 @@ def selectCalendarPane():
     
     log ('Open Evolution Calendars Pane','testend')
 
+def selectPanel(components='Mail'):
+    """Selects Pane in Evolution"""
+    try:
+         window_id = 'frmEvolution-*'
+         click (window_id, 'tbtn' + components)
+         if components != 'Mail':
+         	waittillguiexist ('frmEvolution-' + components)
+    except:
+        log ('error selecting pane','error')
+        raise LdtpExecutionError(0)
+
+
 
 def selectaddrbook (name):
      log ('Selecting a given Address book','teststart')
diff --git a/evolution/copymail.py b/evolution/copymail.py
index ec9112b..6d314ed 100644
--- a/evolution/copymail.py
+++ b/evolution/copymail.py
@@ -67,13 +67,16 @@ def copy_mail (from_fldr, to_fldr, mail_index):
 				time.sleep (2)
 				rowcount_after_copy = getrowcount('frmEvolution-*', 'ttblMessages')
 				if row_after == (row_before+1) and rowcount == rowcount_after_copy:
-					log ('Copying a mail passed successfully','pass') 
+					log ('Copying a mail passed successfully','info') 
+                                        return 1
 				else:
 					log ('Row count does not match after copying', 'cause')
-					log ('Copying a mail failed', 'fail')
+					log ('Copying a mail failed', 'info')
+                                        return 0
 		else:
 			log ('From folder empty!', 'Warning')
-			log ('Did not move any mails to other folder', 'Pass')
+			log ('Did not move any mails to other folder', 'info')
+                        return 0
 	except ldtp.error,msg:
 		log ('Copying mail between folders failed ' + str(msg), 'cause')
 		log ('Copying mail failed','fail')
@@ -86,14 +89,16 @@ to_fldr = data_object.gettagvalue ('to_fldr')
 mail_index = data_object.gettagvalue ('mail_index')
 
 # Call the function
-if from_fldr and to_fldr and mail_index:
-	copy_mail (from_fldr[0], to_fldr[0], int (mail_index[0]))
-else:
-	if not(from_fldr): 
-		log ('from_fldr is not provided in data xml file', 'error')
-	if not(to_fldr):	
-		log ('to_fldr is not provided in data xml file', 'error')
-	if not(mail_index):	
-		log ('mail_index is not provided in data xml file', 'error')
-	log ('Copy mail', 'fail')	
+try:
+	log ('Copy a message', 'teststart')
+        result = copy_mail (from_fldr[0], to_fldr[0], int (mail_index[0]))
+	if result == 1:
+		log ('Copy a message', 'pass') 
+	else:
+		log ('Copy a message', 'fail')
+	log ('Copy a message', 'testend')
 
+except:
+	log ('Copy a message', 'error')
+	log ('Copy a message', 'testend')
+        raise LdtpExecutionError(0)
diff --git a/evolution/create-folder.py b/evolution/create-folder.py
index bd7565d..464ea24 100644
--- a/evolution/create-folder.py
+++ b/evolution/create-folder.py
@@ -25,6 +25,7 @@
 #To create a folder.
 from menu_reorganization import *
 #from evoutils.menu_reorganization import *
+from contact import *
 
 def selectMailPane():
    """Selects the Mail Pane in Evolution"""
@@ -60,7 +61,8 @@ def selectMailPane():
 
 try:
 	log('creation of a folder','teststart')
-	selectMailPane()
+	#selectMailPane()
+        selectPanel('Mail')
 	data_object = LdtpDataFileParser (datafilename)
 
 	#Extracting imput data from xml file
@@ -70,11 +72,13 @@ try:
 	selectmenuitem('frmEvolution-*','mnuFile;mnuNew;mnuMailFolder')
 	if create_folder(Folder_name, location) == 1:
 		log('Folder created','info')
-		log('creation of a folder','testend')
+                #log('Folder created','pass')
+		#log('creation of a folder','testend')
 	else:
 		log('Folder not created','error')
-		log('creation of a folder','testend')
+                #log('Folder created','fail')
+		#log('creation of a folder','testend')
 except:
 	log('cannot create a folder','error')
-	log('creation of a folder','testend')
+	#log('creation of a folder','testend')
 	raise LdtpExecutionError(0)
diff --git a/evolution/createaddrbook.py b/evolution/createaddrbook.py
index 65e27c4..5071762 100644
--- a/evolution/createaddrbook.py
+++ b/evolution/createaddrbook.py
@@ -53,6 +53,7 @@ def newaddrbook(datafilename):
         raise LdtpExecutionError (0)
     log ('Create New Address Book','testend')
 
+selectPanel ('Contacts') 
 newaddrbook (datafilename)
 
     
diff --git a/evolution/del-non-sys-folder.py b/evolution/del-non-sys-folder.py
index e3ee7cb..6a3aae2 100644
--- a/evolution/del-non-sys-folder.py
+++ b/evolution/del-non-sys-folder.py
@@ -29,8 +29,20 @@ data_object = LdtpDataFileParser (datafilename)
 #Extracting imput data from xml file
 
 fldr = data_object.gettagvalue ('folder_name')[0]
-if delete_nonsys_folder(fldr) == 1:
-	print fldr + ' has been Deleted'
-else:
-	print 'Unable to delete'
+
+try:
+	log('Delete a non-sys folder','teststart')
+	if delete_nonsys_folder(fldr) == 1:
+		print fldr + ' has been Deleted'
+                log('Delete a non-sys folder','pass')
+	else:
+		print 'Unable to delete'
+                log('Delete a non-sys folder','pass')
+        log ('Delete a non-sys folder','testend')
+
+except:
+        log('cannot delete a folder','error')
+        log('Delete a non-sys folder','testend')
+        raise LdtpExecutionError(0)
+
 
diff --git a/evolution/del_task.py b/evolution/del_task.py
index 2706c41..ea9099f 100644
--- a/evolution/del_task.py
+++ b/evolution/del_task.py
@@ -31,20 +31,20 @@ import string, sys, os, commands, time, filecmp
 
 def read_data ():
 
-	log('read user data','teststart')
+	#log('read user data','teststart')
 	try:
 		data_object = LdtpDataFileParser (datafilename)
 		summary = data_object.gettagvalue ('summary')
 		log('User data read successfull','info')
-		log('read user data','testend')
+		#log('read user data','testend')
 		return summary
 		
 	except:
 		log('Unable to read the user data or data file missing','error')
- 		log('read user data','testend')
+ 		#log('read user data','testend')
 		raise LdtpExecutionError(0)
 
-	log('read user data','testend')
+	#log('read user data','testend')
 
 # The takes the tsak summary as input and deletes that task. 
 # Note: This doesnt chk whether the selected task is assigned or not.
@@ -59,10 +59,10 @@ try:
 	no_rows_b4deleting = getrowcount ('frmEvolution-Tasks', 'tblTasks') 
         print summary[0]
         print summary
-	if selectrowpartialmatch ('frmEvolution-Tasks', 'tblTasks', summary[0]) == 1:
+	#if selectrowpartialmatch ('frmEvolution-Tasks', 'tblTasks', summary[0]) == 1:
         # selectrowpartialmatch doesn't work: 333090
 
-        #if selectrow ('frmEvolution-Tasks', 'tblTasks', summary[0]) == 1:
+        if selectrow ('frmEvolution-Tasks', 'tblTasks', summary[0]) == 1:
 		log('The specified task has been deleted','info')
 		click('frmEvolution-Tasks', 'btnDelete')
 		waittillguiexist('dlgEvolutionQuery')
@@ -77,9 +77,11 @@ try:
 			print 'The task has been deleted'
 			time.sleep(3)
 			log('the task has been deleted','info')	
+                        log('the task has been deleted','pass')
 		else:
 			print 'Deletion of task verify failed'
 			log('Deletion of task verify failed','error')
+                        log('the task has been deleted','fail')
 	else:
 		print 'Unable to select a task with the given summary'
 		log('unable to select the task','error')
diff --git a/evolution/deletemail.py b/evolution/deletemail.py
index 8d090be..b52f3a9 100644
--- a/evolution/deletemail.py
+++ b/evolution/deletemail.py
@@ -47,13 +47,16 @@ def delete_mail (source_fldr, mail_index):
 			time.sleep (2)
 			row_after = getrowcount('frmEvolution-*','ttblMessages')
 			if row_after == (rowcount-1):
-				log ('Deleting a mail passed successfully', 'pass') 
+				log ('Deleting a mail passed successfully', 'info') 
+				return 1
 			else:
 				log ('Row count does not match after delete mail', 'cause')
-				log ('Deleting a mail failed', 'fail')
+				log ('Deleting a mail failed', 'info')
+				return 0
 		else:
 			log ('From folder empty!', 'Warning')
-			log ('Did not Delete any mail from source folder', 'Pass')
+			log ('Did not Delete any mail from source folder', 'info')
+			return 0
 	except ldtp.error,msg:
 		log ('Deleting mail failed' + str(msg), 'cause')
 		log ('delete mail failed', 'fail')
@@ -65,12 +68,18 @@ source_fldr = data_object.gettagvalue ('source_fldr')
 mail_index = data_object.gettagvalue ('mail_index')
 
 # Call the function
-if source_fldr and mail_index:
-	delete_mail (source_fldr[0], int (mail_index[0]))
-else:
-	if not(source_fldr):
-		log ('source_fldr not provided in data xml file', 'error')
-        if not(mail_index):
-		log ('mail_index not provided in data xml file', 'error')
-        log ('Delete mail', 'fail')            
+try:
+	log ('Delete a message', 'teststart')
+	result = delete_mail (source_fldr[0], int (mail_index[0]))
+        if result == 1:
+                log ('Delete a message', 'pass')
+        else:
+                log ('Delete a message', 'fail')
+        log ('Delete a message', 'testend')
+
+except:
+        log ('Delete a message', 'error')
+        log ('Delete a message', 'testend')
+        raise LdtpExecutionError(0)
+
 
diff --git a/evolution/evoutils/mail.py b/evolution/evoutils/mail.py
index 760f235..fcf8187 100644
--- a/evolution/evoutils/mail.py
+++ b/evolution/evoutils/mail.py
@@ -41,10 +41,12 @@ def get_window (component=None):
             	window_id = 'frmEvolution-Contacts'
 	elif guiexist ('frmEvolution-Memos') == 1:
             	window_id = 'frmEvolution-Memos'
+
         window_id = 'frmEvolution-*'
 	if component:
 		if window_id:
-			selectmenuitem (window_id, 'mnuView;mnuWindow;mnu' + component)
+			#selectmenuitem (window_id, 'mnuView;mnuWindow;mnu' + component)
+                        click (window_id, str('tbtn'+ component))
 			time.sleep (3)
 			return 1
 		else:	
diff --git a/evolution/fltr_from_msg.py b/evolution/fltr_from_msg.py
index 8deaeb5..56f8482 100644
--- a/evolution/fltr_from_msg.py
+++ b/evolution/fltr_from_msg.py
@@ -28,7 +28,7 @@ from ldtputils import *
 
 def verify_filter(rule_name):
 	windowname = 'dlgFilters'
-	selectmenuitem('frmEvolution-Mail','mnuEdit;mnuMessageFilters')
+	selectmenuitem('frmEvolution-*','mnuEdit;mnuMessageFilters')
 	waittillguiexist(windowname)
 	if gettablerowindex (windowname,'tblFilterRules',rule_name) == -1:
 		print 'rule not found in the table filter rules'
@@ -43,7 +43,7 @@ def selectfolder(fldr,dest=''):
 	
 	windowname = 'dlgSelectfolder'
 	waittillguiexist(windowname)
-	remap('evolution',windowname)
+	#remap('evolution',windowname)
 	if gettreetablerowindex (windowname, 'ttblMailFolderTree', fldr) == -1:
 		click(windowname,'btnNew')
 		time.sleep(3)
@@ -81,12 +81,13 @@ def filter_from_msg(fldr,filter_on,details,then_actions,then_values):
 	try:
 		windowname = 'dlgAddFilterRule'
 		log('create a filter from the existing message','teststart')
-		selectrowpartialmatch('frmEvolution-Mail','ttblMailFolderTree',fldr)
+		selectrowpartialmatch('frmEvolution-*','ttblMailFolderTree',fldr)
 		time.sleep(2)
-		selectrow('frmEvolution-Mail','ttblMessageList',details)
-		selectmenuitem('frmEvolution-Mail','mnuMessage;mnuCreateRule;mnuFilteron'+filter_on)
+		selectrow('frmEvolution-*','ttblMessages',details)
+                print 'mnuMessage;mnuCreateRule;mnuFilteron'+filter_on+'*'
+		selectmenuitem('frmEvolution-*','mnuMessage;mnuCreateRule;mnuFilteron'+filter_on+'...')
 		waittillguiexist(windowname)
-		remap('evolution',windowname)
+		#remap('evolution',windowname)
 		
 		if verifyselect (windowname, 'cbo' + filter_on, filter_on) == 1 and gettextvalue (windowname,'txt1') == details:
 			log('the details has been correctly entered','info')
@@ -98,7 +99,7 @@ def filter_from_msg(fldr,filter_on,details,then_actions,then_values):
 			length_actions = len(then_actions)
 			for i in range(0,length_actions):
 				time.sleep(2)
-#				remap('evolution',windowname)	
+#				#remap('evolution',windowname)	
 				time.sleep(2)
 				comboselect(windowname,'cboMovetoFolder',then_actions[i])
 				if then_actions[i] == 'Move to Folder' or then_actions[i] == 'Copy to Folder':
@@ -115,7 +116,7 @@ def filter_from_msg(fldr,filter_on,details,then_actions,then_values):
 				time.sleep(2)
 				if i < length_actions-1:
 					click(windowname,'btnAdd1')
-#				undoremap('evolution',windowname)
+#				#undoremap('evolution',windowname)
 			rule_name = gettextvalue(windowname,'txtRulename')
 			click(windowname,'btnOK')
 			time.sleep(3)
diff --git a/evolution/mailtests.py b/evolution/mailtests.py
index 5e3519c..d2bf252 100644
--- a/evolution/mailtests.py
+++ b/evolution/mailtests.py
@@ -184,13 +184,13 @@ def closecomposewindow(state):
     try:
         selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
         time.sleep (2)
-        if guiexist ('dlgWarning')==1:
+        if guiexist ('dlgWarning*')==1:
             if state==0:
-                click ('dlgWarning','btnDiscardChanges')
+                click ('dlgWarning*','btnDiscardChanges')
             elif state==1:
-                click ('dlgWarning','btnCancel')
+                click ('dlgWarning*','btnCancel')
             elif state==2:
-                click ('dlgWarning','btnSaveMessage')
+                click ('dlgWarning*','btnSaveMessage')
             else:
                 log ('Invalid option to choose','cause')
                 raise LdtpExecutionError (0)
@@ -211,8 +211,8 @@ def closecomposewindow(state):
 def checkheaders(ref_image):
     log ('Check Compose window header boxes','teststart')
     try:
-        window_id=getcurwindow()
-        selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
+        #window_id=getcurwindow()
+        selectmenuitem ('frmEvolution-*','mnuFile;mnuNew;mnuMailMessage')
         waittillguiexist ('frmComposeMessage')
     except:
         log ('could not open Mail Editor','cause')
@@ -231,7 +231,7 @@ def checkheaders(ref_image):
         raise LdtpExecutionError (0)
 
     try:
-        imagecapture('Compose a message','IMAGES/cur_mail.png')
+        imagecapture('Compose Message','IMAGES/cur_mail.png')
     except:
         log ('Error while capturing image of window','cause')
         log ('Check Compose window header boxes','testend')
@@ -240,14 +240,16 @@ def checkheaders(ref_image):
     try:
         if imagecompare (ref_image,'IMAGES/cur_mail.png') < 1.0:
             log ('Header fields ','pass')
+            selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
         else:
             log ('Header fields ','fail')
+            selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
             raise LdtpExecutionError(0)
     except:
         log ('Header fields do not match','warning')
         log ('Check Compose window header boxes','testend')
         raise LdtpExecutionError (0)
-    selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
+    #selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
     log ('Check Compose window header boxes','testend')
 
 
@@ -677,10 +679,11 @@ def lists_test(to,ref_image):
         subject=['Compose editor List test']
         #selectMailPane()
         window_id='frmEvolution-*'
-        selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
+        #selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
         selectrowpartialmatch (window_id,'ttblMailFolderTree','Sent')
         #remap ('evolution',window_id)
         sent_mail_count=getrowcount (window_id,'ttblMessages')
+        selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
         waittillguiexist ('frmComposeMessage')
         check ('frmComposeMessage','mnuHTML')
         time.sleep (1)
diff --git a/evolution/mailtoadd.py b/evolution/mailtoadd.py
index 44c263c..f8fc7b6 100644
--- a/evolution/mailtoadd.py
+++ b/evolution/mailtoadd.py
@@ -36,19 +36,19 @@ def mailtoaddbook(datafilename):
         selectMailPane()
         time.sleep (2)
         try:
-            remap ('evolution','frmEvolution-Mail')
-            selectrowpartialmatch ('frmEvolution-Mail','ttblMailFolderTree','Inbox')
+            #remap ('evolution','frmEvolution-Mail')
+            selectrowpartialmatch ('frmEvolution-*','ttblMailFolderTree','Inbox')
             time.sleep (2)
-            selectrow ('frmEvolution-Mail','ttblMessageList',subject[0])
+            selectrow ('frmEvolution-*','ttblMessages',subject[0])
             time.sleep (1)
             row=getrowindex (subject[0])
-            name=getcellvalue ('frmEvolution-Mail','ttblMessageList',row,3)
+            name=getcellvalue ('frmEvolution-*','ttblMessages',row,3)
             name=name[:name.find('<')]
             name=name[:-1]
         except:
             log ('Row not found in list','error')
             raise LdtpExecutionError(0)
-        selectmenuitem ('frmEvolution-Mail','mnuMessage;mnuAddSendertoAddressBook')
+        selectmenuitem ('frmEvolution-*','mnuMessage;mnuAddSendertoAddressBook')
         print name
         time.sleep (5)
         print name.find(' ')
@@ -61,7 +61,7 @@ def mailtoaddbook(datafilename):
             click ('dlgContactQuick-Add','btnOK')
         elif guiexist ('dlgContactEditor')==1:
             click ('dlgContactEditor','btnCancel')
-        undoremap ('evolution','frmEvolution-Mail')
+        #undoremap ('evolution','frmEvolution-Mail')
     except:
         log ('Adding mail sender to Address Book failed','error')
         log ('Add Mail Sender to Address Book','testend')
diff --git a/evolution/menu_reorganization.py b/evolution/menu_reorganization.py
index eb6e46f..796e782 100644
--- a/evolution/menu_reorganization.py
+++ b/evolution/menu_reorganization.py
@@ -27,23 +27,24 @@ from ldtputils import *
 
 def select_mail(fldr,subject):
 	try:
-		log('select mail in a folder','teststart')
+		#log('select mail in a folder','teststart')
 		#remap('evolution','frmEvolution-Mail')
-		if selectrowpartialmatch('frmEvolution-*','ttblMailFolderTree',fldr) == 1:
+		#if selectrowpartialmatch('frmEvolution-*','ttblMailFolderTree',fldr) == 1:
+                if selectrow ('frmEvolution-*', 'ttblMailFolderTree', fldr) == 1:
 			log('Folder selected','info')
 			if selectrow('frmEvolution-*','ttblMessages',subject) == 1:
 				log('Mail selected','info')
 				#undoremap('evolution','frmEvolution-Mail')
-				log('select mail in a folder','testend')
+				#log('select mail in a folder','testend')
 				return 1
 			else:
 				log('Unable to select the mail','error')
 				#undoremap('evolution','frmEvolution-Mail')
-				log('select mail in a folder','testend')
+				#log('select mail in a folder','testend')
 				return 0
 	except:
 		log('Folder not found','cause')
-		log('select mail in a folder','testend')
+		#log('select mail in a folder','testend')
 		raise LdtpExecutionError (0)
 
 def selectfolder(windowname,fldr,dest=''):
@@ -82,16 +83,16 @@ def selectfolder(windowname,fldr,dest=''):
 def verify_folder_exist(Folder_name):
 
 	try:
-		log('Verify Folder Exists','teststart')
+		#log('Verify Folder Exists','teststart')
 		#remap('evolution','frmEvolution-Mail')
 		if selectrowpartialmatch ('frmEvolution-*','ttblMailFolderTree',Folder_name) == 1:
 			log('Verify succeeded')
 		#undoremap('evolution','frmEvolution-Mail')
-		log('Verify Folder Exists','testend')
+		#log('Verify Folder Exists','testend')
 		return 1
 	except:
 		log('verify Failed','error')
-		log('Verify Folder Exists','testend')
+		#log('Verify Folder Exists','testend')
 		raise LdtpExecutionError (0)
 
 def create_folder(Folder_name, location=''):
@@ -119,15 +120,18 @@ def create_folder(Folder_name, location=''):
 			if verify_folder_exist(Folder_name) != 1:
 				print 'Folder Creatation Verify failed'
 				log('Verification failed','error')
+                                log ('Create a new folder','fail')
 				log('Create a new folder','testend')
 				return 0
 			else:
 				print 'Folder Creation verified'
 				log('Folder Verified','info')
+                                log ('Create a new folder','pass')
 				log('Create a new folder','testend')
 				return 1
 	except :
 		log('Cannot create a folder','error')
+                log ('Create a new folder','fail')
 		log('Create a new folder','testend')
 		print 'Cannot create a folder'
 		raise LdtpExecutionError (0)
@@ -221,23 +225,23 @@ def move_to (from_fldr,to_fldr):
 def select_all (fldrname):	
 
 	try:
-		log('select all mails in a folder','teststart')
+		#log('select all mails in a folder','teststart')
 		#remap('evolution','frmEvolution-Mail')
 		if selectrowpartialmatch ('frmEvolution-*','ttblMailFolderTree',fldrname) == 1:
 			log('From folder selected','info')
 			time.sleep (3)
 			if selectmenuitem('frmEvolution-*','mnuFolder;mnuSelectAllMessages') == 1:
 				log('All items have been selected','info')	
-				log('select all mails in a folder','testend')
+				#log('select all mails in a folder','testend')
 				return 1
 			else:
 				print 'Unable to select all mails'
-				log('select all mails in a folder','testend')
+				#log('select all mails in a folder','testend')
 				return 0
 		else:
 			print 'Unable to find the folder'
 			log('Unable to find the folder','cause')
-			log('select all mails in a folder','testend')
+			#log('select all mails in a folder','testend')
 			return 0
 	except :
 		print 'Cannot select all items in the folder'
@@ -267,7 +271,7 @@ def mark_all_read(fldrname):
 def rename (old_name,new_name):
 
 	try:
-		log('Rename a folder','teststart')
+		#log('Rename a folder','teststart')
 		windowname = 'dlgRenameFolder'
 		#remap('evolution','frmEvolution-Mail')
 		if selectrowpartialmatch ('frmEvolution-*','ttblMailFolderTree',old_name) == 1:
@@ -293,17 +297,17 @@ def rename (old_name,new_name):
 			else:
 				print '\''+old_name+'\' has been renamed to \''+new_name
 				log('Rename sucessfull','info')
-				log('Rename a folder','testend')
+				#log('Rename a folder','testend')
 				return 1	
 		else:
 			print 'Unable to find the folder'
 			log('Unable to find the folder','cause')
-			log('Rename a folder','testend')
+			#log('Rename a folder','testend')
 			return 0
 	except :
 		print 'Unable to rename'
 		log('Cannot rename the folder','error')
-		log('Rename a folder','testend')
+		#log('Rename a folder','testend')
 		raise LdtpExecutionError (0)
 
 	log('Rename a folder','testend')
@@ -311,7 +315,7 @@ def rename (old_name,new_name):
 def delete_nonsys_folder (fldr):	
 
 	try:
-		log('delete a non system folder','teststart')
+		#log('delete a non system folder','teststart')
 		windowname = 'dlgDelete' 
 		defaultname = '\"Inbox/ashwin\"?'
 		sysfolder = ['Inbox','Drafts','Junk','Outbox','Sent','Trash']
@@ -342,12 +346,12 @@ def delete_nonsys_folder (fldr):
 				log('delete a non system folder','testend')
 				raise LdtpExecutionError (0)
 			#undoremap('evolution','frmEvolution-Mail')
-			log('delete a non system folder','testend')
+			#log('delete a non system folder','testend')
 			return 1
 	except :
 		print 'Cannot delete the folder'
 		log('Cannot delete the folder','error')
-		log('delete a non system folder','testend')
+		#log('delete a non system folder','testend')
 		raise LdtpExecutionError (0)
 
 def insert_followup_details (follow_up_flag, due_date, time, progress):
diff --git a/evolution/movemail.py b/evolution/movemail.py
index ea48621..fbbc546 100644
--- a/evolution/movemail.py
+++ b/evolution/movemail.py
@@ -65,13 +65,16 @@ def move_mail (from_fldr, to_fldr, mail_index):
 				time.sleep (2)
 				rowcount_after_move = getrowcount('frmEvolution-*', 'ttblMessages')
 				if row_after == (row_before+1) and rowcount == (rowcount_after_move+1):
-					log ('Moving a mail passed successfully', 'pass') 
+					log ('Moving a mail passed successfully', 'info') 
+					return 1
 				else:
 					log ('Row count does not match after moving', 'cause')
-					log ('Moving a mail failed', 'fail')
+					log ('Moving a mail failed', 'info')
+					return 0
 		else:
 			log ('From folder empty!', 'Warning')
-			log ('Did not move any mails to other folder', 'Pass')
+			log ('Did not move any mails to other folder', 'info')
+			return 0
 	except ldtp.error,msg:
 		log ('Moving mail between folders failed ' + str(msg), 'cause')
 		log ('Moving mail failed', 'fail')
@@ -84,14 +87,17 @@ to_fldr = data_object.gettagvalue ('to_fldr')
 mail_index = data_object.gettagvalue ('mail_index')
 		
 # Call the function
-if from_fldr and to_fldr and mail_index:
-	move_mail (from_fldr[0], to_fldr[0], int (mail_index[0]))
-else:
-	if not(from_fldr): 
-		log ('from_fldr is not provided in data xml file', 'error')
-	if not(to_fldr):	
-		log ('to_fldr is not provided in data xml file', 'error')
-	if not(mail_index):	
-		log ('mail_index is not provided in data xml file', 'error')
-	log ('Move mail', 'fail')	
-                                                                   
+try:
+        log ('Move a message', 'teststart')
+        result = move_mail (from_fldr[0], to_fldr[0], int (mail_index[0]))
+        if result == 1:
+                log ('Move a message', 'pass')
+        else:
+                log ('Move a message', 'fail')
+        log ('Move a message', 'testend')
+
+except:
+        log ('Move a message', 'error')
+        log ('Move a message', 'testend')
+        raise LdtpExecutionError(0)
+
diff --git a/evolution/new_task.py b/evolution/new_task.py
index ceee441..e2c2106 100644
--- a/evolution/new_task.py
+++ b/evolution/new_task.py
@@ -27,6 +27,7 @@
 from ldtp import *
 from ldtputils import *
 import string, sys, os, commands, time, filecmp
+from contact import *
 
 def selectTasksPane():
    """Selects the Tasks Pane in Evolution"""
@@ -90,15 +91,17 @@ def create_task(Group, Summary, Desc, Start_date, Start_time, End_date, End_time
 	        raise LdtpExecutionError(0)
 	
 	try:
-		click('frmTask-Nosummary','btnSave')
+		click('frmTask-*','btnSave')
 		time.sleep(3)
 		no_rows_aftercreat = getrowcount ('frmEvolution-Tasks', 'tblTasks') 
 		if no_rows_aftercreat == no_rows_b4creat + 1:
 			if selectrow('frmEvolution-Tasks','tblTasks',Summary[0]) == 1:
 				log('Task Creation Completed and verified','info')
 				print 'Task Creation completed and verified.'
+                                log('Task Creation Completed and verified','pass') 
 		else:
 			raise LdtpExecutionError(0)	
+                        log('Task Creation Completed and verified','fail')
 	except:
 		print 'Unable to verify the task :'+Summary[0]
 		log('Unable to save the task')
@@ -126,6 +129,7 @@ Categories = data_object.gettagvalue ('Categories')
 
 # Call the function
 
-selectTasksPane()
+#selectTasksPane()
+selectPanel('Tasks')
 create_task(Group, Summary, Desc, Start_date, Start_time, End_date, End_time, Time_zone, Categories)
 
diff --git a/evolution/print.py b/evolution/print.py
index 6ce80f6..5e135b7 100755
--- a/evolution/print.py
+++ b/evolution/print.py
@@ -25,6 +25,8 @@
 # To print a message. 
 # Note Actually it clicks the cancel btn instead of print button.
 
+from ldtp import *
+from ldtputils import *
 from menu_reorganization import *
 	
 def print_msg(fldr, subject, printer):
@@ -34,7 +36,8 @@ def print_msg(fldr, subject, printer):
 		windowname = 'dlgPrintMessage'
 		if select_mail (fldr,subject) == 1:
 			#remap('evolution','frmEvolution-Mail')
-			selectmenuitem('frmEvolution-*','mnuFile;mnuPrint')
+			selectmenuitem('frmEvolution-*','mnuFile;mnuPrint...')
+                        #typekey ('<ctrl>p')
 			if waittillguiexist(windowname)	== 1:
 				time.sleep(3)
 				if selectrow(windowname,'tbl0',printer): 
diff --git a/evolution/print_preview.py b/evolution/print_preview.py
index c2409dc..99dbdd5 100644
--- a/evolution/print_preview.py
+++ b/evolution/print_preview.py
@@ -41,8 +41,10 @@ def print_preview(fldr, subject):
 				#remap('evolution',windowname)
 				click(windowname,'btnclose')
 				#undoremap('evolution',windowname)
+                                log ('Print preview', 'pass')
 			else:
 				log('Unable to find the print preview window','cause')
+                                log ('Print preview', 'fail')
 				log('Print preview','testend')		
 				#undoremap('evolution','frmEvolution-Mail')
 		else:
@@ -70,4 +72,4 @@ else:
 		log ('fldr not provided in data xml file', 'error')
 	if not (subject):
 		log ('subject not provided in data xml file', 'error')
-	log ('print preview', 'fail')
+	#log ('print preview', 'fail')
diff --git a/evolution/rename_folder.py b/evolution/rename_folder.py
index 7140a0a..088c59a 100644
--- a/evolution/rename_folder.py
+++ b/evolution/rename_folder.py
@@ -31,8 +31,21 @@ data_object = LdtpDataFileParser (datafilename)
 
 old_name = data_object.gettagvalue ('old_name')[0]
 new_name = data_object.gettagvalue ('new_name')[0]
-if rename(old_name,new_name) == 1:
-	print old_name + ' has been renamed as '+new_name
-	log('Fldr has been renamed','info')	
-else:
-	log('probs in renaming the fldr','info')		
+
+try:
+	log('Rename a folder','teststart')
+	if rename(old_name,new_name) == 1:
+		print old_name + ' has been renamed as '+new_name
+		log('Fldr has been renamed','info')	
+        	log('Fldr has been renamed','pass')
+	else:
+		log('probs in renaming the fldr','info')		
+        	log('Fldr has been renamed','fail')
+
+        log('Rename a folder','testend')
+
+except:
+        log('cannot rename a folder','error')
+        log('Rename a folder','testend')
+        raise LdtpExecutionError(0)
+
diff --git a/evolution/select_all.py b/evolution/select_all.py
index 7056556..fa56f79 100644
--- a/evolution/select_all.py
+++ b/evolution/select_all.py
@@ -31,9 +31,20 @@ data_object = LdtpDataFileParser (datafilename)
 #Extracting imput data from xml file
 fldr = data_object.gettagvalue ('fldr')[0]
 
-if select_all(fldr) == 1:
-	print 'All Mails in '+fldr+' has been selected'
-	log('All mails selected','info')
-else:
-	log('Unable to select','error')
+try:
+	log ('Select all message','teststart')
+	if select_all(fldr) == 1:
+		print 'All Mails in '+fldr+' has been selected'
+		log('All mails selected','info')
+                log ('Select all message', 'pass')
+	else:
+		log('Unable to select','error')
+		log ('Select all message', 'fail')
+
+	log ('Select all message', 'testend')
+
+except:
+	log ('Select all message', 'error')
+	log ('Select all message', 'testend') 
+        raise LdtpExecutionError(0)