Commits

Frank Schoenheit [fs]  committed 83bd6c8 Merge

fs34c: merged latest changes from CWS fs34b

  • Participants
  • Parent commits 7869f1e, 225ed8f

Comments (0)

Files changed (3)

File testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc

     sleep(10)
 
     Kontext "DocumentWriter"
-    	DocumentWriter.TypeKeys "<MOD1 SHIFT I>" ,  true ' EDIT / SELECT TEXT
-    	DocumentWriter.TypeKeys "<DOWN>" ,  true
+    	DocumentWriter.TypeKeys "<MOD1 SHIFT I>" ,  true ' EDIT / SELECT TEXT    	
         DocumentWriter.TypeKeys "<SHIFT END>" , true
         DocumentWriter.TypeKeys "<MOD1 C>" , true
 
 
     ' select next line and check content
     Kontext "DocumentWriter"
-        DocumentWriter.TypeKeys "<DOWN>" ,  true
+        DocumentWriter.TypeKeys "<DOWN>", 2, true
         DocumentWriter.TypeKeys "<SHIFT HOME>" , true
         DocumentWriter.TypeKeys "<MOD1 C>" , true
 

File testautomation/dbaccess/optional/includes/xf_Submission.inc

     dim sLine as String
     
     Line Input #1, sLine
-    if sLine <> "<?xml version=""1.0""?>" then
-        warnlog "the first line in the xml document should <?xml version=""1.0""?> but it is " + sLine
+    if sLine <> "<?xml version=""1.0"" encoding=""UTF-8""?>" then
+        warnlog "the first line in the xml document should <?xml version=""1.0"" encoding=""UTF-8""?> but it is " + sLine
     endif
     Line Input #1, sLine
     if sLine <> "<instanceData><element1/></instanceData>" then

File testautomation/dbaccess/required/includes/ReportBuilder01.inc

 
  'edit menu        
         
-        '/// check if there are 11 items in the edit menu.
-        printlog "check if there are 11 items in the edit menu."
+        '/// check if there are 14 items in the edit menu.
+        printlog "check if there are 14 items in the edit menu."
         ReportDesign.UseMenu 
         hMenuSelectNr(2)        
         iCount = hMenuItemGetCount()
-        if (iCount <> 11) then
-            warnlog "There should 11 items in the edit menu but there are " + iCount + " items."
+        if (iCount <> 14) then
+            warnlog "There should 14 items in the edit menu but there are " + iCount + " items."
         end if
         call hMenuClose()
 
 
  'insert menu        
         
-        '/// check if there are 3 items in the insert menu.
-        printlog "check if there are 3 items in the insert menu."
+        '/// check if there are 5 items in the insert menu.
+        printlog "check if there are 5 items in the insert menu."
         ReportDesign.UseMenu 
         hMenuSelectNr(4)        
         iCount = hMenuItemGetCount()
-        if (iCount <> 3) then
-            warnlog "There should 3 items in the insert menu but there are " + iCount + " items."
+        if (iCount <> 5) then
+            warnlog "There should 5 items in the insert menu but there are " + iCount + " items."
         end if
         call hMenuClose()
 
     Kontext "ReportDesign"
         ReportDesign.UseMenu            
         hMenuSelectNr(2)
-        hMenuSelectNr(11)
+        hMenuSelectNr(14)
        
     sleep(10)