Comments remap, undoremap, setcontext ...

3 files changed, 25 insertions, 23 deletions

diff --git a/evolution/cr_task_list.py b/evolution/cr_task_list.py
index f352178..ab8c6bc 100644
--- a/evolution/cr_task_list.py
+++ b/evolution/cr_task_list.py
@@ -39,7 +39,7 @@ def create_tasklist(Type, Name, Color, Default):
 
 	try:
 		log('create a task list','teststart')
-		remap('evolution','frmEvolution-Tasks')
+		#remap('evolution','frmEvolution-Tasks')
 		selectmenuitem('frmEvolution-Tasks','mnuFile;mnuNew;mnuTasklist')
 		time.sleep(3)
 		waittillguiexist('dlgTaskListProperties')
@@ -52,7 +52,7 @@ def create_tasklist(Type, Name, Color, Default):
 		log('The window has been modified','info')
 	except:	
 		log('Unable to see the window','error')
-		undoremap('evolution','frmEvolution-Tasks')
+		#undoremap('evolution','frmEvolution-Tasks')
 		log('create a task list','testend')
 		raise LdtpExecutionError(0)
 
@@ -67,7 +67,7 @@ def create_tasklist(Type, Name, Color, Default):
 		log('The requested color has been set','info')
 	except:
 		log('Unable to set the requested color','error')
-		undoremap('evolution','frmEvolution-Tasks')
+		#undoremap('evolution','frmEvolution-Tasks')
 		log('create a task list','testend')
 		raise LdtpExecutionError(0)
 
@@ -82,11 +82,11 @@ def create_tasklist(Type, Name, Color, Default):
 			log('The required task list cannot be created','error')			
 	except:
 		log('Unable to create the required task list','error')
-		undoremap('evolution','frmEvolution-Tasks')
+		#undoremap('evolution','frmEvolution-Tasks')
 		log('create a task list','testend')
 		raise LdtpExecutionError(0)
 
-	undoremap('evolution','frmEvolution-Tasks')
+	#undoremap('evolution','frmEvolution-Tasks')
 	log('create a task list','testend')
 	
 Type, Name, Color, Default = read_data()	
diff --git a/evolution/create-appointment.py b/evolution/create-appointment.py
index 62b226c..bbbde86 100644
--- a/evolution/create-appointment.py
+++ b/evolution/create-appointment.py
@@ -49,20 +49,21 @@ categories = data_object.gettagvalue ('categories')[0]
 log ('Appointment Creation', 'teststart')
 
 try:
-    windowname = 'dlgAppointment-Nosummary'
+    windowname = 'frmAppointment-Nosummary'
     ptlistname = 'ptl0'
     flag = 0
-    selectmenuitem ('frmEvolution-Calendars', 'mnuView;mnuWindow;mnuCalendars')
-    time.sleep (2)
+    #selectmenuitem ('frmEvolution-Calendars', 'mnuView;mnuWindow;mnuCalendars')
     selectmenuitem ('frmEvolution-Calendars', 'mnuFile;mnuFile;mnuAppointment')
-    time.sleep (2)
+    time.sleep(2)
+    #click ('frmEvolution-Calendars', 'btnNew')
+    waittillguiexist (windowname) 
     if guiexist (windowname) == 0:
         log ('Failed to open new appointment window', 'cause')
         raise LdtpExecutionError (0)
     else:
         log ('Insertion of Appointment values', 'teststart')
-        i = insert_appointment (windowname, ptlistname, summary, location, description, from_date,
-                            from_time, to_date, to_time, calendar, classification, categories)
+        #i = insert_appointment (windowname, ptlistname, summary, location, description, from_date,from_time, to_date, to_time, calendar, classification, categories) 
+        i = insert_appointment (windowname, summary, location, description, from_date, from_time, to_date, to_time, calendar, 'No') 
         if i == 1:
             flag = 1
         log ('Insertion of Appointment values', 'testend')
@@ -85,18 +86,18 @@ try:
             log ('Failed to close appointment dialog' ,'cause')
             raise LdtpExecutionError (0)
         time.sleep (2)
-        releasecontext ()
+        #releasecontext ()
         if flag == 1:
             log ('Appointment creation succeeded', 'fail')
         else:
             log ('Appointment creation succeeded', 'pass')
 except LdtpExecutionError:
-    releasecontext ()
+    #releasecontext ()
     print 'Creation of appointment failed' + str(msg)
     log ('Creation of appointment failed', 'error')
     log ('Appointment Creation', 'testend')
 except error, msg:
-    releasecontext ()
+    #releasecontext ()
     print 'Creation of appointment failed' + str(msg)
     log ('Creation of appointment failed', 'error')
     log ('Appointment Creation', 'testend')
diff --git a/evolution/verify_readonly_tasklist.py b/evolution/verify_readonly_tasklist.py
index 6080580..613effd 100644
--- a/evolution/verify_readonly_tasklist.py
+++ b/evolution/verify_readonly_tasklist.py
@@ -39,14 +39,15 @@ def verify_readonly():
 	try:
 		log('Verify readonly','teststart')
 		summary = read_data()
-		windowname = 'frmTask-Nosummary'
-	        remap('evolution','frmEvolution-Tasks')
+		windowname = 'frmTask-*'
+	        #remap('evolution','frmEvolution-Tasks')
 		selectmenuitem('frmEvolution-Tasks','mnuFile;mnuWorkOffline')
 
-		selectrowpartialmatch ('frmEvolution-Tasks', 'tblTaskTable', summary)
+		#selectrowpartialmatch ('frmEvolution-Tasks', 'tblTasks', summary)
+                selectrow ('frmEvolution-Tasks', 'tblTasks', summary)
 		selectmenuitem('frmEvolution-Tasks','mnuFile;mnuOpenTask')
 		time.sleep(3)
-		setcontext('Task - No summary','Task - ' + summary)
+		#setcontext('Task - No summary','Task - ' + summary)
 		waittillguiexist(windowname)		
 	        time.sleep(3)
                 print 'here'
@@ -57,16 +58,16 @@ def verify_readonly():
 			print 'Verify failed'
 			log('Verify Failed','error')
 		click(windowname,'btnClose')
-		undoremap('evolution','frmEvolution-Tasks')
-	        remap('evolution','frmEvolution-Tasks')
+		#undoremap('evolution','frmEvolution-Tasks')
+	        #remap('evolution','frmEvolution-Tasks')
 		selectmenuitem('frmEvolution-Tasks','mnuFile;mnuWorkOnline')
-		undoremap('evolution','frmEvolution-Tasks')
+		#undoremap('evolution','frmEvolution-Tasks')
 		time.sleep(3)
 	except:
 		print 'Unable to verify'
 		log('Unable to verify','error')
-		undoremap('evolution','frmEvolution-Tasks')
-	        remap('evolution','frmEvolution-Tasks')
+		#undoremap('evolution','frmEvolution-Tasks')
+	        #remap('evolution','frmEvolution-Tasks')
 		selectmenuitem('frmEvolution-Tasks','mnuFile;mnuWorkOnline')
 		log('verify readonly','testend')
 		raise LdtpExecutionError (0)