summaryrefslogtreecommitdiff
path: root/testautomation/writer/optional/includes/fields
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-07-15 12:25:42 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-07-15 12:25:42 +0000
commitf2f8267adc71f7bf6d7e344d7b4bab51ce44a833 (patch)
treefbfc1ec0d5d4fbe1b2714d943e5baf8d982767d5 /testautomation/writer/optional/includes/fields
parent2058523d7c448abfe7d0237e9c8f8747622c6236 (diff)
CWS-TOOLING: integrate CWS fhawfixes2
2009-07-08 14:58:06 +0200 oc r273832 : #i103413# 2009-07-01 22:02:46 +0200 fredrikh r273615 : i103249 2009-07-01 17:12:45 +0200 fredrikh r273605 : i103249 2009-07-01 16:55:27 +0200 fredrikh r273603 : i102752 2009-07-01 16:51:30 +0200 fredrikh r273602 : i102752 2009-07-01 15:49:58 +0200 fredrikh r273597 : i102752 2009-07-01 15:32:34 +0200 fredrikh r273596 : i103216 2009-07-01 15:10:05 +0200 fredrikh r273590 : i102752 2009-07-01 14:41:23 +0200 fredrikh r273587 : i102752 2009-07-01 14:40:11 +0200 fredrikh r273585 : i102752 2009-07-01 13:14:31 +0200 fredrikh r273572 : i102752 2009-07-01 13:02:47 +0200 fredrikh r273570 : i102752 2009-07-01 12:54:54 +0200 fredrikh r273569 : i102752 2009-07-01 12:24:23 +0200 fredrikh r273567 : i102752 2009-07-01 12:23:10 +0200 fredrikh r273566 : i102752 2009-07-01 12:22:06 +0200 fredrikh r273565 : i102752 2009-07-01 12:13:26 +0200 fredrikh r273563 : i102752 2009-06-30 18:00:13 +0200 fredrikh r273530 : i103220 2009-06-30 17:52:06 +0200 fredrikh r273528 : i102845 2009-06-30 17:36:50 +0200 fredrikh r273526 : CWS-TOOLING: rebase CWS fhawfixes2 to trunk@273468 (milestone: DEV300:m51) 2009-06-30 11:36:55 +0200 fredrikh r273499 : CWS-TOOLING: rebase CWS fhawfixes2 to trunk@272827 (milestone: DEV300:m50) 2009-06-29 14:12:15 +0200 fredrikh r273473 : i94734 2009-06-24 18:59:13 +0200 fredrikh r273362 : i102846 2009-06-24 16:01:32 +0200 fredrikh r273352 : i102999 2009-06-24 14:33:37 +0200 fredrikh r273347 : i103063 & i102999 2009-06-24 14:32:18 +0200 fredrikh r273346 : i103063 2009-06-24 14:17:42 +0200 fredrikh r273345 : i103063 2009-06-24 13:38:39 +0200 fredrikh r273341 : i103063 2009-06-24 13:38:15 +0200 fredrikh r273340 : i103063 2009-06-24 13:37:32 +0200 fredrikh r273339 : i103063 2009-06-24 13:36:43 +0200 fredrikh r273338 : i103063 2009-06-24 13:36:26 +0200 fredrikh r273337 : i103063 2009-06-24 13:36:08 +0200 fredrikh r273336 : i103063 2009-06-24 13:32:08 +0200 fredrikh r273335 : i103063 2009-06-24 02:01:29 +0200 fredrikh r273305 : i102999 2009-06-23 17:07:02 +0200 fredrikh r273298 : i103042 2009-06-23 17:06:17 +0200 fredrikh r273297 : i103042 2009-06-23 16:27:47 +0200 fredrikh r273295 : i102999 2009-06-23 16:26:46 +0200 fredrikh r273294 : i102999 2009-06-23 16:26:20 +0200 fredrikh r273293 : i102999 2009-06-23 16:25:37 +0200 fredrikh r273291 : i102999 2009-06-23 16:24:52 +0200 fredrikh r273290 : i102999 2009-06-23 16:24:05 +0200 fredrikh r273288 : i102999 2009-06-23 16:23:49 +0200 fredrikh r273287 : i102999 2009-06-23 14:46:08 +0200 fredrikh r273282 : i102999 2009-06-23 13:18:56 +0200 fredrikh r273279 : i102999 2009-06-22 18:17:33 +0200 fredrikh r273250 : i102999 2009-06-22 18:17:10 +0200 fredrikh r273249 : i102999 2009-06-22 18:16:48 +0200 fredrikh r273248 : i102999 2009-06-22 18:16:33 +0200 fredrikh r273247 : i102999 2009-06-22 18:16:07 +0200 fredrikh r273246 : i102999 2009-06-22 18:15:32 +0200 fredrikh r273245 : i102999 2009-06-22 16:14:00 +0200 fredrikh r273237 : i102792 2009-06-22 13:35:09 +0200 fredrikh r273228 : i102648 2009-06-22 12:19:41 +0200 fredrikh r273211 : i102800 2009-06-18 17:57:17 +0200 fredrikh r273127 : i102800 2009-06-17 19:01:42 +0200 fredrikh r273092 : i102800 2009-06-17 14:28:32 +0200 fredrikh r273073 : i102800 2009-06-17 13:16:26 +0200 fredrikh r273061 : i102800 2009-06-17 13:14:19 +0200 fredrikh r273060 : i102800 2009-06-17 12:20:47 +0200 fredrikh r273058 : i102800 2009-06-16 23:56:39 +0200 fredrikh r273043 : i102800 2009-06-16 19:01:53 +0200 fredrikh r273036 : i102800 2009-06-15 17:53:18 +0200 fredrikh r273005 : i102800 2009-06-15 17:19:25 +0200 fredrikh r273003 : i102800 2009-06-15 15:57:40 +0200 fredrikh r272993 : i102799 2009-06-15 15:11:05 +0200 fredrikh r272990 : i102648 2009-06-15 15:09:56 +0200 fredrikh r272989 : i102648 2009-06-15 14:48:42 +0200 fredrikh r272988 : i102648 2009-06-15 12:41:32 +0200 fredrikh r272977 : i102648 2009-06-15 12:27:09 +0200 fredrikh r272975 : i102648 2009-06-10 17:31:22 +0200 fredrikh r272831 : i102648 2009-06-10 15:47:16 +0200 fredrikh r272823 : i102647 2009-06-10 13:21:24 +0200 fredrikh r272805 : i102639 + i96954
Diffstat (limited to 'testautomation/writer/optional/includes/fields')
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields1.inc67
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields2.inc65
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields3.inc87
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields4.inc98
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields5.inc66
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields6.inc145
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields7.inc4
7 files changed, 289 insertions, 243 deletions
diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc
index 2da1bd844161..dc68e7fc0a8c 100755
--- a/testautomation/writer/optional/includes/fields/w_fields1.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields1.inc
@@ -49,55 +49,63 @@ sub w_fields1
end sub
+'-----------------------------------------------------------------
+
testcase tFields_1
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sDate , sDate1 , sDate2 as String
-
+ Dim sDate as String
sDate = Date
- sDate1 = Left (sDate , 6)
- sDate2 = Right(sDate , 2)
-
+
printlog "Insert / Fields / Date"
'/// <b> Default should be mm/dd/yy </b>
-
+
Call hNewDocument
-
+
'/// Insert / Fields / Date , the 1st date is fixed
InsertFieldsDate
-
+
'/// Return
Call wTypeKeys "<Return>"
-
+
'/// Insert / Fields / Date
InsertFieldsDate
-
+
Call wTypeKeys "<Home>"
-
+
'/// Set 2nd date only to be date , not fixed
'/// In 2nd date , Edit / Fields , select date in 'select'
+ '/// Select second format in 'Format'
EditFields
Kontext "FeldbefehlBearbeitenDokument"
Auswahl.Select 2
- Sleep 2
+ Zahlenformat.Select 2 'Should be the same as the value we get with 'Time'.
+ '/// Close the dialog
FeldbefehlBearbeitenDokument.OK
-
+
+ '/// Set first date to the right format, but leave as unfixed
+ '/// In 1nd date , Edit / Fields , select second format in 'Format'
+ Call wTypeKeys "<MOD1 Home>"
+
+ EditFields
+ Kontext "FeldbefehlBearbeitenDokument"
+ Zahlenformat.Select 2 'Should be the same as the value we get with 'Time'.
+ FeldbefehlBearbeitenDokument.OK
+
'/// Check if the date is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
- if GetClipboard <> sDate1 then
+ if GetClipboard <> sDate then
Warnlog "Fixed date is wrong ! Hope you don't run this case in the midnight"
end if
-
+
Call wTypeKeys "<Down><Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
- if GetClipboard <> sDate2 then
+ if GetClipboard <> sDate then
Warnlog "Date is wrong ! Hope you don't run this case in the midnight"
end if
-
+
Call hCloseDocument
endcase
@@ -105,19 +113,17 @@ endcase
'-----------------------------------------------------------------
testcase tFields_2
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sTime() , sTime1 , sTime2 as String
- Dim sTemp as String
+ Dim sTime as String
+ Dim sTime1 as String
+ Dim sTime2 as String
+ Dim sTemp as String
printlog "Insert / Fields / Time"
- '/// <b> Default should be hh/mm/ss pm </b>
+ '/// <b> Default could be hh/mm/ss pm or simply hh/mm/ss , depending on the system the test is running on.</b>
Call hNewDocument
-
sTime = Time
- sTemp = Right(sTime , 2) 'It should get am or pm
'/// Insert / Fields / Time , the 1st time is fixed
InsertFieldsTime
@@ -135,7 +141,6 @@ goto endsub
EditFields
Kontext "FeldbefehlBearbeitenDokument"
Auswahl.Select 2
- Sleep 2
FeldbefehlBearbeitenDokument.OK
'/// Check if the time is correct
@@ -143,19 +148,17 @@ goto endsub
Call wTypeKeys "<Shift Right>"
EditCopy
sTime1 = GetClipboard
- if Len(sTime1) < 11 then Warnlog "Fixed time is wrong !"
- if Right(sTime1 , 2) <> sTemp then Warnlog "Fixed time is wrong ! , Hope you don't run this case in the midnight"
+ if NOT Len(sTime1) > 7 then Warnlog "Fixed time-format is wrong !"
Call wTypeKeys "<Down><Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
sTime2 = GetClipboard
- if Len(sTime2) <> 11 then Warnlog "Time is wrong !"
- if Right(sTime2 , 2) <> sTemp then Warnlog "Time is wrong ! , Hope you don't run this case in the midnight"
+ if NOT Len(sTime2) > 7 then Warnlog "Time-format is wrong !"
printlog "Stop for a while ..."
'/// Stop for a while , check if the time is still correct
- Sleep 5
+ Sleep 2
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc
index 6ab38e5187cb..5340b6ceec8c 100755
--- a/testautomation/writer/optional/includes/fields/w_fields2.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields2.inc
@@ -54,6 +54,8 @@ sub w_fields2
end sub
+'-----------------------------------------------------------------
+
testcase tFieldsOther_0
Dim sTest as String
@@ -94,10 +96,14 @@ testcase tFieldsOther_1_1
exit sub
end if
- Dim sFirstName , sLastName as String
- Dim sFirstName1 , sLastName1 as String
- Dim sFirstName2 , sLastName2 as String
- Dim sInitial1 , sInitial2 as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
+ Dim sFirstName2 as String
+ Dim sLastName2 as String
+ Dim sInitial1 as String
+ Dim sInitial2 as String
sFirstName1 = "ABC" : sLastName1 = "DEF"
sFirstName2 = "XYZ" : sLastName2 = "OPQ"
@@ -196,10 +202,13 @@ testcase tFieldsOther_1_2
exit sub
end if
- Dim sFirstName , sLastName as String
- Dim sFirstName1 , sLastName1 as String
- Dim sFirstName2 , sLastName2 as String
- Dim sInitial1 as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
+ Dim sFirstName2 as String
+ Dim sLastName2 as String
+ Dim sInitial1 as String
sFirstName1 = "ABC" : sLastName1 = "DEF"
sFirstName2 = "XYZ" : sLastName2 = "OPQ"
@@ -297,9 +306,9 @@ endcase
testcase tFieldsOther_2
- Dim sTestFile as String
- Dim sChapter() as String
- Dim i as Integer
+ Dim sTestFile as String
+ Dim sChapter() as String
+ Dim i as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\chapterTest.sxw")
@@ -445,9 +454,9 @@ testcase tFieldsOther_5
qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
goto endsub
- Dim sTestFile as String
- Dim sPage() as String
- Dim i as Integer
+ Dim sTestFile as String
+ Dim sPage() as String
+ Dim i as Integer
sPage = Array( _
"2" , _
@@ -506,7 +515,9 @@ testcase tFieldsOther_6_1
exit sub
end if
- Dim aUserData(14) , aUserData1() , aUserData2() as String
+ Dim aUserData(14) as String
+ Dim aUserData1() as String
+ Dim aUserData2() as String
Dim i as Integer
@@ -682,8 +693,8 @@ testcase tFieldsOther_6_2
end if
Dim aUserData(16) as String
- Dim aUserData1() as String
- Dim aUserData2() as String
+ Dim aUserData1() as String
+ Dim aUserData2() as String
Dim i as Integer
@@ -859,9 +870,9 @@ testcase tFieldsOther_7
qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
goto endsub
- Dim sTestFile as String
- Dim sStatistics() as String
- Dim i as Integer
+ Dim sTestFile as String
+ Dim sStatistics() as String
+ Dim i as Integer
sStatistics = Array( _
"2" , _
@@ -924,19 +935,19 @@ goto endsub
Dim sTestFile as String
Dim sDirectory as String
+ Dim oDirectory as String
Dim sLanguage as String
Dim sFormat() as String
Dim sResult(6) as String
Dim i as Integer
sLanguage = fGetDirLanguage()
- sDirectory = "..\..\OpenOffice.org\Basis 3.0\share\template\" & sLanguage & "\educate"
- sTestFile = Convertpath ( gNetzOfficePath + sDirectory + "\diploma.ott")
+ sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\diploma.ott")
sResult(0) = fGetCateGory()
sResult(1) = "diploma.ott"
sResult(2) = "diploma"
- sResult(3) = Convertpath ( gNetzOfficePath + sDirectory )
+ sResult(3) = Convertpath (gTesttoolpath + "writer\optional\input\fields\")
sResult(4) = sTestFile
sResult(5) = fGetStyle()
@@ -981,16 +992,17 @@ goto endsub
Kontext "TabDokumentFeldbefehle"
TabDokumentFeldbefehle.Close
+ Do Until GetDocumentCount = 0
Call hCloseDocument
- Call hCloseDocument
-
+ Loop
endcase
'-----------------------------------------------------------------
testcase tFieldsOther_9
- Dim sTime1 , sTime2 as String
+ Dim sTime1 as String
+ Dim sTime2 as String
printlog "Insert/Fields/Other/Document / Time"
'/// <b> Insert/Fields/Other/Document / Time </b>
@@ -1050,4 +1062,3 @@ testcase tFieldsOther_9
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc
index d002e66b4ac7..cc54ad7ad7bf 100755
--- a/testautomation/writer/optional/includes/fields/w_fields3.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields3.inc
@@ -59,6 +59,8 @@ sub w_fields3
end sub
+'-----------------------------------------------------------------
+
testcase tFieldsReferences
printlog "Insert/Cross-reference"
@@ -86,8 +88,8 @@ endcase
testcase tSetReferences_1
- Dim sReference as String
- Dim sTestFile as String
+ Dim sReference as String
+ Dim sTestFile as String
sReference = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw")
@@ -133,7 +135,7 @@ endcase
testcase tSetReferences_2
- Dim sReference as String
+ Dim sReference as String
sReference = "myTest"
@@ -174,8 +176,8 @@ endcase
testcase tInsertReference_1
- Dim sReference as String
- Dim sTestFile as String
+ Dim sReference as String
+ Dim sTestFile as String
sReference = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw")
@@ -234,8 +236,8 @@ endcase
testcase tInsertReference_2
- Dim sReference as String
- Dim sTestFile as String
+ Dim sReference as String
+ Dim sTestFile as String
sReference = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\chapterTest.sxw")
@@ -294,8 +296,8 @@ endcase
testcase tInsertReference_3
- Dim sReference as String
- Dim sReferenceName as String
+ Dim sReference as String
+ Dim sReferenceName as String
sReference = "est !"
sReferenceName = "myTest"
@@ -354,14 +356,20 @@ endcase
'-----------------------------------------------------------------
testcase tInsertReference_4
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sReference as String
- Dim sAbove , sBelow as String
+ Dim sReference as String
+ Dim sAbove as String
+ Dim sBelow as String
- sReference = "myTest"
- sAbove = "above" : sBelow = "below"
+ sReference = "myTest"
+ Select Case iSystemSprache
+ Case 01 : sAbove = "above" : sBelow = "below"
+ Case 35 : sAbove = "sur" : sBelow = "sous"
+ Case 39 : sAbove = "sopra" : sBelow = "sotto"
+ Case 49 : sAbove = "oben" : sBelow = "unten"
+ Case 46 : sAbove = "ovan" : sBelow = "under"
+ Case 55 : sAbove = "arriba" : sBelow = "abajo"
+ End Select
printlog "Insert Reference - Above/Below"
'/// <b> Insert Reference - Above/Below</b>
@@ -440,8 +448,8 @@ endcase
testcase tInsertReference_5
- Dim sReference as String
- Dim sTestSytle as String
+ Dim sReference as String
+ Dim sTestSytle as String
sReference = "myTest"
sTestSytle = "A"
@@ -503,7 +511,7 @@ endcase
testcase tInsertReference_6
- Dim sFootnote as String
+ Dim sFootnote as String
sFootnote = "Test"
@@ -537,7 +545,7 @@ endcase
testcase tInsertReference_7
- Dim sEndnote as String
+ Dim sEndnote as String
sEndnote = "Test"
@@ -571,7 +579,9 @@ endcase
testcase tInsertReference_8_1
- Dim sCategory , sCaption , sSeparator as String
+ Dim sCategory as String
+ Dim sCaption as String
+ Dim sSeparator as String
sCategory = "A" : sCaption = "B" : sSeparator = "*"
@@ -619,7 +629,9 @@ endcase
testcase tInsertReference_8_2
- Dim sCategory , sCaption , sSeparator as String
+ Dim sCategory as String
+ Dim sCaption as String
+ Dim sSeparator as String
sCategory = "A" : sCaption = "B" : sSeparator = "*"
@@ -667,8 +679,8 @@ endcase
testcase tInsertBookmark_1
- Dim sBookmark as String
- Dim sTestFile as String
+ Dim sBookmark as String
+ Dim sTestFile as String
sBookmark = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw")
@@ -725,8 +737,8 @@ endcase
testcase tInsertBookmark_2
- Dim sBookmark as String
- Dim sTestFile as String
+ Dim sBookmark as String
+ Dim sTestFile as String
sBookmark = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\chapterTest.sxw")
@@ -782,8 +794,8 @@ endcase
testcase tInsertBookmark_3
- Dim sReference as String
- Dim sBookmark as String
+ Dim sReference as String
+ Dim sBookmark as String
sReference = "est !"
sBookmark = "myTest"
@@ -839,14 +851,20 @@ endcase
'-----------------------------------------------------------------
testcase tInsertBookmark_4
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sBookmark as String
- Dim sAbove , sBelow as String
+ Dim sBookmark as String
+ Dim sAbove as String
+ Dim sBelow as String
sBookmark = "myTest"
- sAbove = "above" : sBelow = "below"
+ Select Case iSystemSprache
+ Case 01 : sAbove = "above" : sBelow = "below"
+ Case 35 : sAbove = "sur" : sBelow = "sous"
+ Case 39 : sAbove = "sopra" : sBelow = "sotto"
+ Case 49 : sAbove = "oben" : sBelow = "unten"
+ Case 46 : sAbove = "ovan" : sBelow = "under"
+ Case 55 : sAbove = "arriba" : sBelow = "abajo"
+ End Select
printlog "Insert Bookmark - Above/Below"
'/// <b> Insert Bookmark - Above/Below</b>
@@ -922,8 +940,8 @@ endcase
testcase tInsertBookmark_5
- Dim sBookmark as String
- Dim sTestSytle as String
+ Dim sBookmark as String
+ Dim sTestSytle as String
sBookmark = "myTest"
sTestSytle = "A"
@@ -979,4 +997,3 @@ testcase tInsertBookmark_5
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc
index cb801f3a2344..7933e99de803 100755
--- a/testautomation/writer/optional/includes/fields/w_fields4.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields4.inc
@@ -53,10 +53,12 @@ sub w_fields4
end sub
+'-----------------------------------------------------------------
+
testcase tDocInformation_1
- Dim sTitle as String
- Dim sTestFile as String
+ Dim sTitle as String
+ Dim sTestFile as String
Dim sVarResult as String
Dim sFixResult as String
@@ -107,8 +109,8 @@ endcase
testcase tDocInformation_2
- Dim sSubject as String
- Dim sTestFile as String
+ Dim sSubject as String
+ Dim sTestFile as String
Dim sVarResult as String
Dim sFixResult as String
@@ -159,9 +161,10 @@ endcase
testcase tDocInformation_3
- Dim sKeywords as String
- Dim sTestFile as String
- Dim sVarResult , sFixResult as String
+ Dim sKeywords as String
+ Dim sTestFile as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sKeywords = "Keywords Test"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -211,9 +214,9 @@ endcase
testcase tDocInformation_4
Dim sDescription as String
- Dim sTestFile as String
- Dim sVarResult as String
- Dim sFixResult as String
+ Dim sTestFile as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sDescription = "Description Test"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -300,7 +303,7 @@ goto endsub
'/// File / Properties / Description , input some
'/// + text in Description
- Call fFileProperties("TabBenutzer")
+ Call fFileProperties("TabDokument")
Info0.Settext sVarResult(0)
Info1.Settext sVarResult(1)
Info2.Settext sVarResult(2)
@@ -339,11 +342,11 @@ endcase
testcase tDocInformation_6
- Dim sTestFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ Dim sTestFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
Dim i as Integer
@@ -443,15 +446,15 @@ endcase
testcase tDocInformation_7_1
- Dim sTestFile as String
- Dim sSaveasFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ Dim sTestFile as String
+ Dim sSaveasFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
- Dim i as Integer
+ Dim i as Integer
sFirstName1 = "Test1" : sLastName1 = "Test2"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -569,16 +572,18 @@ endcase
'-----------------------------------------------------------------
testcase tDocInformation_7_2
-
- Dim sTestFile as String
- Dim sSaveasFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ QaErrorLog "#i102792# - tDocInformation_7_2 outcommented due to issue."
+ goto endsub
+
+ Dim sTestFile as String
+ Dim sSaveasFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
- Dim i as Integer
+ Dim i as Integer
sFirstName1 = "Test1" : sLastName1 = "Test2"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -682,14 +687,14 @@ endcase
testcase tDocInformation_8
- Dim sTestFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ Dim sTestFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
- Dim i as Integer
+ Dim i as Integer
sFirstName1 = "Test1" : sLastName1 = "Test2"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -800,14 +805,14 @@ endcase
testcase tDocInformation_9
- Dim sTestFile as String
+ Dim sTestFile as String
Dim sSaveasFile as String
- Dim sFirstName as String
- Dim sLastName as String
+ Dim sFirstName as String
+ Dim sLastName as String
Dim sFirstName1 as String
- Dim sLastName1 as String
- Dim sVarResult as String
- Dim sFixResult as String
+ Dim sLastName1 as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sFirstName1 = "Test1" : sLastName1 = "Test2"
sVarResult = "17" : sFixResult = "4"
@@ -896,10 +901,10 @@ endcase
testcase tDocInformation_10
- Dim sTestFile as String
+ Dim sTestFile as String
Dim sSaveasFile as String
- Dim sVarResult as String
- Dim sFixResult as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sFixResult = "00:29:05"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -973,4 +978,3 @@ testcase tDocInformation_10
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc
index 8a739bb4736d..abb75ea21982 100755
--- a/testautomation/writer/optional/includes/fields/w_fields5.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields5.inc
@@ -53,6 +53,8 @@ sub w_fields5
end sub
+'-----------------------------------------------------------------
+
testcase tVariables_1
if bAsianLan = true then
QaErrorLog "No testing with Asian language. Aborting."
@@ -62,8 +64,8 @@ testcase tVariables_1
Dim sName() as String
Dim sValue as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sValue = "This is a test!"
@@ -134,8 +136,8 @@ testcase tVariables_2
Dim sName() as String
Dim sValue as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sValue = "1234,567"
@@ -205,8 +207,9 @@ testcase tVariables_3
Dim sValue as String
Dim iFormat() as Integer
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
+ Dim mUnit as String
sName = "myTest"
sValue = "1234.567"
@@ -271,8 +274,8 @@ testcase tVariables_4
Dim sName() as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = Array( _
"myTest1" , _
@@ -350,8 +353,8 @@ testcase tVariables_5
Dim sName as String
Dim sValue as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sResult = Array( _
"100" , _
@@ -429,8 +432,8 @@ testcase tVariables_6
Dim sName() as String
Dim sValue() as String
Dim sResult as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = Array( _
"myTest1" , _
@@ -482,8 +485,8 @@ endcase
testcase tVariables_7
Dim sResult() as String
- Dim i as Integer
- Dim x as Integer
+ Dim i as Integer
+ Dim x as Integer
printlog "Number range"
'/// <b> Number range </b>
@@ -540,9 +543,9 @@ endcase
testcase tVariables_8
- Dim sName as String
- Dim sValue as String
- Dim sReference as String
+ Dim sName as String
+ Dim sValue as String
+ Dim sReference as String
Dim sFieldContent as String
sName = "myTest" : sValue = "100"
@@ -613,12 +616,12 @@ endcase
testcase tVariables_9
- Dim sName() as String
- Dim sValue() as String
+ Dim sName() as String
+ Dim sValue() as String
Dim sResult1() as String
Dim sResult2() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = Array("U1" , "UserField" , "U2")
sValue = Array("UserField - 10" , "100" , "UserField + 10")
@@ -673,11 +676,11 @@ testcase tVariables_10
qaerrorlog "#i93906# - tVariables_10 outcommented due to a problem with copying field-contents outside the office."
goto endsub
- Dim sDDEFile as String
- Dim sContent as String
- Dim sName as String
- Dim sDDEStatement as String
- Dim sSectionName as String
+ Dim sDDEFile as String
+ Dim sContent as String
+ Dim sName as String
+ Dim sDDEStatement as String
+ Dim sSectionName as String
sDDEFile = Convertpath ( gNetzOfficePath + "dde_test.oxt")
sContent = "DDE"
@@ -763,14 +766,14 @@ endcase
'-----------------------------------------------------------------
testcase tVariables_11
- qaerrorlog "#i93906# - tVariables_10 outcommented due to a problem with copying field-contents outside the office."
+ qaerrorlog "#i102792# - tVariables_11 outcommented. Fields not updated."
goto endsub
- Dim sDDEFile as String
- Dim sContent as String
- Dim sName as String
+ Dim sDDEFile as String
+ Dim sContent as String
+ Dim sName as String
Dim sDDEStatement as String
- Dim sSectionName as String
+ Dim sSectionName as String
sDDEFile = Convertpath ( gNetzOfficePath + "dde_test.oxt")
sContent = "DDE"
@@ -840,4 +843,3 @@ testcase tVariables_11
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields6.inc b/testautomation/writer/optional/includes/fields/w_fields6.inc
index af44b1e02e71..d19de7ba951e 100755
--- a/testautomation/writer/optional/includes/fields/w_fields6.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields6.inc
@@ -55,17 +55,19 @@ sub w_fields6
end sub
+'-----------------------------------------------------------------
+
testcase tFunctions_1
- Dim sName as String
- Dim sValue() as String
+ Dim sName as String
+ Dim sValue() as String
Dim sCondition as String
- Dim sElse as String
- Dim sThen as String
- Dim sResult() as String
- Dim iType as Integer
- Dim i as Integer
- Dim j as Integer
+ Dim sElse as String
+ Dim sThen as String
+ Dim sResult() as String
+ Dim iType as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = "X"
SCondition = "X==" + Chr(34) + "Sun" + Chr(34)
@@ -134,14 +136,14 @@ endcase
testcase tFunctions_2
- Dim sName as String
- Dim sValue() as String
- Dim sCondition as String
- Dim sHiddenText as String
- Dim sResult() as String
- Dim bHiddenText as Boolean
- Dim i as Integer
- Dim j as Integer
+ Dim sName as String
+ Dim sValue() as String
+ Dim sCondition as String
+ Dim sHiddenText as String
+ Dim sResult() as String
+ Dim bHiddenText as Boolean
+ Dim i as Integer
+ Dim j as Integer
sName = "X"
SCondition = "X==" + Chr(34) + "ABC" + Chr(34)
@@ -219,13 +221,14 @@ endcase
testcase tFunctions_3
- Dim sName as String
- Dim sValue() as String
- Dim sCondition as String
- Dim sHiddenText as String
- Dim sResult() as String
- Dim bHiddenText as Boolean
- Dim i , j as Integer
+ Dim sName as String
+ Dim sValue() as String
+ Dim sCondition as String
+ Dim sHiddenText as String
+ Dim sResult() as String
+ Dim bHiddenText as Boolean
+ Dim i as Integer
+ Dim j as Integer
sName = "X"
SCondition = "X==" + Chr(34) + "ABC" + Chr(34)
@@ -306,7 +309,8 @@ endcase
testcase tFunctions_4
- Dim sReference , sFieldContent as String
+ Dim sReference as String
+ Dim sFieldContent as String
sReference = "NewTest"
sFieldContent = "10000"
@@ -348,7 +352,7 @@ endcase
testcase tFunctions_5
- Dim sPlaceHolder as String
+ Dim sPlaceHolder as String
sPlaceHolder = "Text"
@@ -381,12 +385,12 @@ endcase
'-----------------------------------------------------------------
testcase tFunctions_6
-
+
printlog "Placeholder - Table"
'/// <b> Placeholder - Table </b>
-
+
Call hNewDocument
-
+
Call fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -406,7 +410,7 @@ testcase tFunctions_6
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select Table
Call fInsertFieldsOther("TabFunktionen")
@@ -416,29 +420,29 @@ testcase tFunctions_6
Platzhalter.SetText "TableTableTableTableTable"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<TableTableTableTableTable>" )then
Warnlog "Should get <TableTableTableTableTable> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
-
+
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
Kontext "TabelleEinfuegenWriter"
if TabelleEinfuegenWriter.Exists then
TabelleEinfuegenWriter.Cancel
else
Warnlog "Insert table dialog isn't up !"
end if
-
+
Call hCloseDocument
endcase
@@ -449,9 +453,9 @@ testcase tFunctions_7
printlog "Placeholder - Frame"
'/// <b> Placeholder - Frame </b>
-
+
Call hNewDocument
-
+
fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -470,7 +474,7 @@ testcase tFunctions_7
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select Frame
Call fInsertFieldsOther("TabFunktionen")
@@ -480,21 +484,21 @@ testcase tFunctions_7
Platzhalter.SetText "FrameFrameFrameFrameFrameFrame"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<FrameFrameFrameFrameFrameFrame>" )then
Warnlog "Should get <FrameFrameFrameFrameFrameFrame> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
try
Kontext
Active.SetPage TabType
@@ -504,7 +508,7 @@ testcase tFunctions_7
catch
Warnlog "Format/Frame dialog isn't up !"
endcatch
-
+
Call hCloseDocument
endcase
@@ -515,9 +519,9 @@ testcase tFunctions_8
printlog "Placeholder - Graphics"
'/// <b> Placeholder - Graphics </b>
-
+
Call hNewDocument
-
+
fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -525,7 +529,7 @@ testcase tFunctions_8
Rechts.SetText "0"
Oben.SetText "0"
Unten.SetText "0"
-
+
TabSeite.OK
Kontext "Active"
if Active.Exists then
@@ -537,7 +541,7 @@ testcase tFunctions_8
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select Graphics
Call fInsertFieldsOther("TabFunktionen")
@@ -547,21 +551,21 @@ testcase tFunctions_8
Platzhalter.SetText "GraphicsGraphicsGraphicsGraphicsGraphics"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<GraphicsGraphicsGraphicsGraphicsGraphics>" )then
Warnlog "Should get <GraphicsGraphicsGraphicsGraphicsGraphics> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
try
Kontext "GrafikEinfuegenDlg"
Oeffnen.Click
@@ -569,7 +573,7 @@ testcase tFunctions_8
catch
Warnlog "Insert picture dialog isn't up !"
endcatch
-
+
Call hCloseDocument
endcase
@@ -580,9 +584,9 @@ testcase tFunctions_9
printlog "Placeholder - Object"
'/// <b> Placeholder - Object </b>
-
+
Call hNewDocument
-
+
fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -601,7 +605,7 @@ testcase tFunctions_9
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select object
Call fInsertFieldsOther("TabFunktionen")
@@ -611,21 +615,21 @@ testcase tFunctions_9
Platzhalter.SetText "ObjectObjectObjectObjectObjectObject"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<ObjectObjectObjectObjectObjectObject>" )then
Warnlog "Should get <ObjectObjectObjectObjectObjectObject> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
try
Kontext "OLEObjektEinfuegen"
NeuErstellen.Check
@@ -633,7 +637,7 @@ testcase tFunctions_9
catch
Warnlog "Insert OLE Object dialog isn't up !"
endcatch
-
+
Call hCloseDocument
endcase
@@ -642,7 +646,8 @@ endcase
testcase tFunctions_10
- Dim sItem1 , sItem2 as String
+ Dim sItem1 as String
+ Dim sItem2 as String
sItem1 = "First" : sItem2 = "Second"
@@ -689,7 +694,8 @@ endcase
testcase tFunctions_11
- Dim sItem1 , sItem2 as String
+ Dim sItem1 as String
+ Dim sItem2 as String
sItem1 = "First" : sItem2 = "Second"
@@ -735,7 +741,8 @@ endcase
testcase tFunctions_12
- Dim sItem1 , sItem2 as String
+ Dim sItem1 as String
+ Dim sItem2 as String
sItem1 = "First" : sItem2 = "Second"
@@ -781,25 +788,26 @@ endcase
'-----------------------------------------------------------------
testcase tFunctions_13
+Warnlog "#i102752# - tFunctions_13 outcommented due to bug."
+goto endsub
Dim sCombineCharacter as String
- Dim sTestFile as String
-
+ Dim sTestFile as String
+
sCombineCharacter = "ABC"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\CombineTest.sxw")
-
+
printlog "Combine Character"
'/// <b> Combine Character </b>
-
+
Call hNewDocument
-
+
'/// Open test file pageTest.sxw
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Right>"
-
'/// Insert/Fields/Other/Functions / Select "Combine characters"
Call fInsertFieldsOther("TabFunktionen")
Feldtyp.Select 6 'Combine characters
@@ -807,13 +815,13 @@ testcase tFunctions_13
Namefeld.SetText sCombineCharacter
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<Shift Left>"
if fGetFieldContent() <> sCombineCharacter then
Warnlog "Should get " & sCombineCharacter & " but get " & fGetFieldContent()
end if
-
+
Call wTypeKeys ( "<Shift F4>" )
FormatAnchorToPage
Sleep 1
@@ -822,10 +830,9 @@ testcase tFunctions_13
Warnlog "Something wrong in combine character"
end if
TabPositionAndSizeWriter.Cancel
-
+
Call hCloseDocument
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc
index d7f7bdafa9d4..e1236290ebe1 100755
--- a/testautomation/writer/optional/includes/fields/w_fields7.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields7.inc
@@ -45,6 +45,8 @@ sub w_fields7
end sub
+'-----------------------------------------------------------------
+
testcase tL10N_1
if iSprache <> 1 then
@@ -163,7 +165,7 @@ testcase tL10N_1
if sAsiancbChecked = true then Aktivieren.IsChecked
end if
- if sCTLcb = true then
+ if sCTLcb = true then
if sCTLcbChecked = true then ComplexScriptEnabled.IsChecked
end if