summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-05 10:56:31 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-05 10:56:31 +0000
commit9ba74b83a8937633a8363d7b392dd83b30532eeb (patch)
tree1adeea076da710da960249b7f33863f2edec8876
parent362db4ed2105dd5b77023a6655bbb50c091ae282 (diff)
CWS-TOOLING: integrate CWS hde02_DEV300
2009-02-18 13:58:24 +0100 hde r268218 : i99361 2009-02-18 13:58:06 +0100 hde r268217 : i99361 2009-02-18 13:57:01 +0100 hde r268216 : i99361 2009-02-18 13:48:46 +0100 hde r268215 : i99190 2009-02-17 17:47:53 +0100 tbo r268184 : #158701# changed owner of files. 2009-02-17 15:48:29 +0100 tbo r268176 : #158701# error will not get fixed anymore
Diffstat
-rwxr-xr-xtestautomation/framework/required/f_first.bas2
-rwxr-xr-xtestautomation/framework/required/f_topten.bas2
-rwxr-xr-xtestautomation/framework/required/includes/first.inc2
-rwxr-xr-xtestautomation/framework/required/includes/graphics_import.inc4
-rwxr-xr-xtestautomation/framework/required/includes/smoketest.inc2
-rwxr-xr-xtestautomation/framework/required/includes/topten.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc2.inc26
-rwxr-xr-xtestautomation/writer/optional/includes/navigator/w_navigator.inc4
-rwxr-xr-xtestautomation/writer/optional/includes/undo/w_undo_history_3.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_001_.inc30
-rw-r--r--testautomation/writer/required/includes/w_001a_.inc3
-rwxr-xr-xtestautomation/writer/required/includes/w_002_.inc4
-rwxr-xr-xtestautomation/writer/required/includes/w_007_.inc4
13 files changed, 45 insertions, 42 deletions
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index 0cb3da90ee8a..a996c2b0d064 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -31,7 +31,7 @@
'*
'/******************************************************************************
'*
-'* owner : thorsten.bosbach@sun.com
+'* owner : joerg.skottke@sun.com
'*
'* short description : first test, to check global functionality
'*
diff --git a/testautomation/framework/required/f_topten.bas b/testautomation/framework/required/f_topten.bas
index 4b2ea205bedb..60b2ae765f96 100755
--- a/testautomation/framework/required/f_topten.bas
+++ b/testautomation/framework/required/f_topten.bas
@@ -31,7 +31,7 @@
'*
'/******************************************************************************
'*
-'* owner : thorsten.bosbach@sun.com
+'* owner : joerg.skottke@sun.com
'*
'* short description : smoke test for each application
'*
diff --git a/testautomation/framework/required/includes/first.inc b/testautomation/framework/required/includes/first.inc
index ace61f72e5cf..146238feb073 100755
--- a/testautomation/framework/required/includes/first.inc
+++ b/testautomation/framework/required/includes/first.inc
@@ -31,7 +31,7 @@
'*
'/************************************************************************
'*
-'* owner : thorsten.bosbach@sun.com
+'* owner : joerg.skottke@sun.com
'*
'* short description : First test of basic functionality
'*
diff --git a/testautomation/framework/required/includes/graphics_import.inc b/testautomation/framework/required/includes/graphics_import.inc
index 7582d43ab331..c7d716b4bd7d 100755
--- a/testautomation/framework/required/includes/graphics_import.inc
+++ b/testautomation/framework/required/includes/graphics_import.inc
@@ -61,11 +61,11 @@ testcase tQuickInsertGraphNotAsLink
' endif
' Note: Can be locale dependent!
if (iCurrentFile = 5) then
- warnlog("#158701# crash on loading airshw.met going to next format")
+ qaerrorlog("#158701# crash on loading airshw.met going to next format")
goto skipformat
endif
if (iCurrentFile = 4) AND (gPlatform="osx") then
- warnlog("#158701# crash on MacOS X on loading ball.eps")
+ qaerrorlog("#158701# crash on MacOS X on loading ball.eps")
goto skipformat
endif
diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc
index 78de3e49a535..ae6b992bb9f2 100755
--- a/testautomation/framework/required/includes/smoketest.inc
+++ b/testautomation/framework/required/includes/smoketest.inc
@@ -31,7 +31,7 @@
'*
'/************************************************************************
'*
-'* owner : thorsten.bosbach@sun.com
+'* owner : joerg.skottke@sun.com
'*
'* short description : "10ner/Smoke Test" from release engineering
'*
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index 3afb660e7084..291864d42245 100755
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -31,7 +31,7 @@
'*
'/************************************************************************
'*
-'* owner : thorsten.bosbach@sun.com
+'* owner : joerg.skottke@sun.com
'*
'* short description : Smoke test (load/save/clipboard)
'*
diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc
index 23db3f016d1a..ea3a25de354b 100755
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -179,14 +179,14 @@ function fSelectFirstOLE() as integer
else
try
'Invoke Navigator if not visible
- EditNavigator
+ ViewNavigator
catch
'If inside chart or elsewhere the call
'will fail. Again trying the slot after
'switching to the document.
Kontext "DocumentCalc"
DocumentCalc.TypeKeys "<Escape>"
- EditNavigator
+ ViewNavigator
endcatch
end if
Kontext "NavigatorCalc"
@@ -194,13 +194,17 @@ function fSelectFirstOLE() as integer
'Select first OLE in list
Liste.TypeKeys "<HOME>"
for iIndex = 1 to 8
- Liste.TypeKeys "-<DOWN>"
+ Liste.TypeKeys "-"
+ wait 500
+ Liste.TypeKeys "<DOWN>"
+ wait 500
next iIndex
Liste.select(6)
- Liste.TypeKeys "+<DOWN><RETURN>"
+ Liste.TypeKeys "+"
+ Liste.TypeKeys "<DOWN><RETURN>"
fSelectFirstOLE = 0
else
- QAErrorLog "Navigator did not occoured!"
+ QAErrorLog "Navigator couldn't be opened!"
end if
case "draw" , "impress" : Kontext "NavigatorDraw"
if NavigatorDraw.Exists(10) then
@@ -208,14 +212,14 @@ function fSelectFirstOLE() as integer
else
try
'Invoke Navigator if not visible
- EditNavigator
+ ViewNavigator
catch
'If inside chart or elsewhere the call
'will fail. Again trying the slot after
'switching to the document.
Kontext "DocumentDraw"
DocumentDraw.TypeKeys "<Escape>"
- EditNavigator
+ ViewNavigator
endcatch
Kontext "NavigatorDraw"
if NavigatorDraw.exists(10) then
@@ -235,7 +239,7 @@ function fSelectFirstOLE() as integer
if NavigatorGlobalDoc.Exists(10) then
bNavigatorWasVisible = TRUE
else
- EditNavigator
+ ViewNavigator
end if
wait 500
Kontext "NavigatorGlobalDoc"
@@ -250,7 +254,7 @@ function fSelectFirstOLE() as integer
else
try
'Invoke Navigator if not visible
- EditNavigator
+ ViewNavigator
catch
'If inside chart or elsewhere the call
'will fail. Again trying the slot after
@@ -258,7 +262,7 @@ function fSelectFirstOLE() as integer
Kontext "DocumentWriter"
call gMouseclick (99,99)
call gMouseclick (50,50)
- EditNavigator
+ ViewNavigator
endcatch
end if
end select
@@ -283,7 +287,7 @@ function fSelectFirstOLE() as integer
printlog "Leaving navigator open as initially found"
else
if fSelectFirstOLE = 0 then
- EditNavigator
+ ViewNavigator
printlog "Closing navigator as initially found"
else
printlog "Closing navigator not needed. It was not possible to open it."
diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc
index f760a65e874e..35703cf7431d 100755
--- a/testautomation/writer/optional/includes/navigator/w_navigator.inc
+++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc
@@ -217,7 +217,7 @@ endcase
' **********************************************************************
testcase tViewNavigator3
- QaErrorLog "#i94614# - tEditNavigator3 outcommented"
+ QaErrorLog "#i94614# - tViewNavigator3 outcommented"
goto endsub
Dim NavigationTearOff as boolean
@@ -426,7 +426,7 @@ endcase
' **********************************************************************
testcase tViewNavigator5
- QaErrorLog "#i94614# - tEditNavigator5 outcommented"
+ QaErrorLog "#i94614# - tViewNavigator5 outcommented"
goto endsub
if gApplication <> "WRITER" then
diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
index b8c8ebd90fae..134001c74bf8 100755
--- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
+++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
@@ -306,7 +306,7 @@ testcase tUndoNote
kontext "Navigator"
Navigator.TypeKeys "<DELETE>"
'/// Close the Navigator
- EditNavigator
+ ViewNavigator
'/// string in Undo-list has to be: "Delete: 'This is a note'")
Call CheckUndoStringInUndoList ( 10, "DeleteNote" )
diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc
index 6e63d0df02f9..c0c0f70a8d55 100755
--- a/testautomation/writer/required/includes/w_001_.inc
+++ b/testautomation/writer/required/includes/w_001_.inc
@@ -1303,13 +1303,13 @@ testcase tMasterDocFileSaveWithPassword
Sleep 1
PrintLog "Password dialog has to come up"
- Kontext "Passwort"
- if Passwort.Exists then
+ Kontext "PasswordFileSave"
+ if PasswordFileSave.Exists then
PrintLog "Enter your password"
- PasswortName.SetText "12345"
+ Password.SetText "12345"
PrintLog "Re-Enter a wrong passwort"
- PasswortBestaetigen.Settext "54321"
- Passwort.OK
+ PasswordConfirm.Settext "54321"
+ PasswordFileSave.OK
Sleep 2
else
Warnlog "- Password-Dialog not up !"
@@ -1324,12 +1324,12 @@ testcase tMasterDocFileSaveWithPassword
Warnlog "Able to save document with wrong password"
end if
- Kontext "Passwort"
- if Passwort.Exists then
+ Kontext "PasswordFileSave"
+ if PasswordFileSave.Exists then
PrintLog "Enter new password, and re-enter the same password"
- PasswortName.SetText "12345"
- PasswortBestaetigen.SetText "12345"
- Passwort.OK
+ Password.SetText "12345"
+ PasswordConfirm.SetText "12345"
+ PasswordFileSave.OK
else
Warnlog "- Password-Dialog not up !"
end if
@@ -1397,13 +1397,13 @@ testcase tMasterDocFileSaveWithPassword
Kontext "Active"
if Active.Exists(2) then Active.Yes
PrintLog "Click on 'Save' in file open dialog"
- Kontext "Passwort"
- if Not Passwort.Exists(1) then
+ Kontext "PasswordFileSave"
+ if Not PasswordFileSave.Exists(1) then
Warnlog "Passworddialog is not coming up on saving document"
else
- PasswortName.SetText "54321"
- PasswortBestaetigen.SetText "54321"
- Passwort.OK
+ Password.SetText "54321"
+ PasswordConfirm.SetText "54321"
+ PasswordFileSave.OK
PrintLog "The password dialog should come up"
Sleep 1
FileClose
diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc
index 9b5d0bd16c01..bc1e16fb7146 100644
--- a/testautomation/writer/required/includes/w_001a_.inc
+++ b/testautomation/writer/required/includes/w_001a_.inc
@@ -88,8 +88,7 @@ testcase tFileProperties
Kontext "TabDokumentinfo"
Call DialogTest (TabDokumentinfo)
-
-WarnLog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."
+ QAErrorLog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."
' printlog " Switch to Tabpage 'User defined'"
' Kontext
' active.SetPage TabBenutzer
diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc
index f7e0970b0159..a641027644de 100755
--- a/testautomation/writer/required/includes/w_002_.inc
+++ b/testautomation/writer/required/includes/w_002_.inc
@@ -1463,7 +1463,7 @@ endcase
'----------------------------------------------------------------
testcase tMasterDocEditNavigator
- printlog "- Edit/Navigator"
+ printlog "- View/Navigator"
Dim ToolboxOk as boolean
gApplication = "MASTERDOC"
@@ -1471,7 +1471,7 @@ testcase tMasterDocEditNavigator
PrintLog "Open new document"
Kontext "NavigatorGlobalDoc"
- if Not NavigatorGlobalDoc.Exists then EditNavigator
+ if Not NavigatorGlobalDoc.Exists then ViewNavigator
Kontext "NavigatorGlobalDoc"
Call DialogTest ( NavigatorGlobalDoc )
diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc
index 7ea68e4f5ad3..35ddaf5854cd 100755
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -955,7 +955,7 @@ endcase
testcase tToolsHangulHanjaConversion
- WarnLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability."
+ QAErrorLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability."
goto endsub
Dim bAsianLanguage as Boolean
@@ -1105,7 +1105,7 @@ endcase
' -------------------------------------------
testcase tHtmlDocToolsHangulHanjaConversion
- WarnLog "#96838# - tToolsHangulHanjaConversion outcommented due to unreability."
+ QAErrorLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability."
goto endsub
Dim bAsianLanguage as Boolean
generated by cgit (git 2.34.1) at 2024-07-14 17:40:25 +0000