diff options
author | Kurt Zenker <kz@openoffice.org> | 2011-04-14 15:29:52 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2011-04-14 15:29:52 +0200 |
commit | 04cc9b6d72c5ee775e6320274dfdac36a46f7d37 (patch) | |
tree | 25e0b78c671b608143bd82d270cc0dc676a5d3a2 | |
parent | 3558158c596814e9b0d7406defa5208b1be3ffec (diff) | |
parent | 4c9189670ea0b94ea1e77f1c0fbe7b462b69cfb1 (diff) |
CWS-TOOLING: integrate CWS fs34b_OOO340
3 files changed, 13 insertions, 14 deletions
diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc index 8743feae997b..4620d90150d4 100644 --- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc @@ -86,8 +86,7 @@ testcase tNewReport 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 @@ -102,7 +101,7 @@ testcase tNewReport ' 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 diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc index 05f0da768cdf..a928d660b093 100644 --- a/testautomation/dbaccess/optional/includes/xf_Submission.inc +++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc @@ -172,8 +172,8 @@ testcase tDataNavigatorSubmission 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 diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc index d1cce59d4d3f..91faba007d11 100644 --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc @@ -116,13 +116,13 @@ testcase tMainMenuBar '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() @@ -140,13 +140,13 @@ testcase tMainMenuBar '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() @@ -336,7 +336,7 @@ testcase tExecuteReport Kontext "ReportDesign" ReportDesign.UseMenu hMenuSelectNr(2) - hMenuSelectNr(11) + hMenuSelectNr(14) sleep(10) |