[Libreoffice-commits] .: 11 commits - testautomation/global testautomation/graphics
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue May 31 02:04:38 PDT 2011
testautomation/global/win/bars.win | 4
testautomation/graphics/optional/includes/global/g_mediaplayer.inc | 55 ++++------
2 files changed, 27 insertions(+), 32 deletions(-)
New commits:
commit 2b38f83ac93584f4150cae3b5f2ba367ed379c77
Merge: 387640f... 7af9ed5...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon May 30 13:12:16 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
commit 7af9ed55af52107da4328c2c63c64f18c8fc6f7e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:14 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit 4f83907d2020f22b89bbc7dc9e099bee7eb1c69b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu May 19 00:26:52 2011 +0200
fdo#37325: make toolkit.UnoScrollBarControl not fail headless
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index 640365f..6d9db8d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -76,7 +76,7 @@ public class UnoScrollBarControl extends TestCase {
XWindow xWin = xFrame.getContainerWindow();
Toolkit tk = Toolkit.getDefaultToolkit();
- Dimension dim = tk.getScreenSize();
+ Dimension dim = new Dimension(800, 600);
Rectangle newPosSize = xWin.getPosSize();
newPosSize.Width = new Double(dim.getWidth()).intValue();
commit 17adc313cd4a8dd656818ddf96f4137fcd4f3226
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:49 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 0ba8fbdc14802bb7cd6f76539498cc76e585daca
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:38 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit 831ec52edfbee9fbf97b892178a5548881143f33
Author: Yifan <Yifan at bang.bang>
Date: Mon May 9 17:32:36 2011 +0800
remove JMF dependency in test case
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
index f78cdf8..e3e824a 100644
--- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
+++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
@@ -39,13 +39,9 @@ testcase g_mediaplayer
dim timevalue2
dim timevalue3
dim timecounter, iWaitIndex, timefound as integer
-
+
if iSprache <> 39 then
Printlog "- MediaPlayer"
- if gPlatgroup = "unx" then
- QaErrorLog "Solaris / Linux: Soundcard + Java Media Framework (JMF) Media-Libraries is needed."
- goto endsub
- endif
Datei$ = ConvertPath (convertPath (gTesttoolPath + "graphics\required\input\29secsound.wav"))
printlog "Open New Document"
Call hNewDocument
@@ -53,12 +49,12 @@ testcase g_mediaplayer
printlog "Check if the Media Player already exists - if so - close it"
kontext "mPlayer"
printlog "Close the MediaPlayer if it is open already"
- if mPlayer.exists then
+ if mPlayer.exists then
warnlog "The MediaPlayer was visible since some earlier test."
ToolsMediaPlayer
printlog "Closed the Media Player"
endif
-
+
printlog "Tools - MediaPlayer"
ToolsMediaPlayer
sleep 2
@@ -76,11 +72,11 @@ testcase g_mediaplayer
kontext "OeffnenDlg"
Pfad.SetText Datei$
Oeffnen.Click
-
+
printlog "This test wont work correctly under Solaris and Linux,"
printlog "unless some optional Media-libraries are installed."
printlog "Therefore we warn the tester about it if we cannot open the file."
-
+
iWaitIndex = 0
do while OeffnenDlg.Exists AND iWaitIndex < 10
sleep (1)
@@ -93,15 +89,15 @@ testcase g_mediaplayer
kontext "Mplayer"
ToolsMediaPlayer
printlog "close document"
- Call hCloseDocument
+ Call hCloseDocument
goto endsub
else
kontext "Mplayer"
if Mplayer.exists then printlog "Media Player was opened."
endif
-
+
timevalue1 = mTimeedit.GetText
-
+
printlog "Stop"
sleep 2
mStop.Click
@@ -144,7 +140,7 @@ testcase g_mediaplayer
else
Printlog "the play-button seemed to work. Good."
endif
-
+
printlog "Pause"
mPlay.Click
sleep 10
@@ -159,10 +155,10 @@ testcase g_mediaplayer
else
Printlog "the pause-button seemed to work. Good."
endif
-
+
printlog "Time"
printlog " Click Stop to get to the beginning."
- mStop.Click
+ mStop.Click
sleep 1
printlog "And make sure it's really the beginning."
timevalue1 = mTimeedit.GetText
@@ -173,13 +169,13 @@ testcase g_mediaplayer
else
printlog "Sound stopped, time-value set to 00:00:00."
endif
-
+
printlog "We press 'Play'"
printlog "Click play to get it running"
- mPlay.Click
+ mPlay.Click
sleep 5
timefound = 0
-
+
for timecounter = 1 to 50000
timevalue1 = mTimeedit.GetText
if timevalue1 = "00:00:20 / 00:00:29" then
@@ -191,7 +187,7 @@ testcase g_mediaplayer
timefound = 2
endif
next timecounter
-
+
if timefound = 1 then
Printlog "the time-counter seemed to work. Good."
elseif timefound = 2 then
@@ -199,34 +195,34 @@ testcase g_mediaplayer
elseif timefound = 0 then
warnlog "Either the time didnt change, or the test-computer is too fast."
endif
-
+
printlog "Loop"
mLoop.Click
-
+
printlog "Volume"
-
+
printlog "Mute"
mMute.Click
sleep 1
mMute.Click
-
+
printlog "Time-slider"
' mTimeslider. 'Click
'-Position slider
'Moves to a different position in the file.
-
+
printlog "Scroll-whatever"
'mZoomlistbox.
'-Zoom
'Adjusts the size of the movie playback.
-
+
printlog "Apply"
mInsert.Click
sleep 10
-
+
printlog "Close the MediaPlayer via Tools - MediaPlayer"
ToolsMediaPlayer
-
+
printlog "Check if there is an object available."
if (gApplication = "IMPRESS") then
kontext "DocumentImpress"
@@ -236,7 +232,7 @@ testcase g_mediaplayer
hTypeKeys ("<escape><tab><tab><tab>")
hOpenContextMenu()
hMenuSelectNr(1)
-
+
Kontext "TabPositionAndSize"
Kontext
Active.SetPage TabPositionAndSize
@@ -250,8 +246,8 @@ testcase g_mediaplayer
endif
sleep 2
printlog "close document"
- Call hCloseDocument
+ Call hCloseDocument
else
qaerrorLog "#74350# - Different strings in g_mediaplayer under Italian."
endif
-endcase
\ No newline at end of file
+endcase
commit 32d1ddabf96ff2b8ec09a796f7e81425581b76ec
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:45 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit e33328aa32fc942e1b3ee3cbf60e5c826e44b195
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri May 6 16:44:18 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4-hotfixes1 (3.4.0-beta4-windows)
commit b6b8bb2f3afb6cec8043494a33c66380bddb26c1
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed May 4 13:40:12 2011 +0800
Click ellipse and rectangle icons using .uno.BasicShapes.
The .uno.Ellipse and .uno.Rect object in Toolbar
is not clickable now caused by the fix:
http://cgit.freedesktop.org/libreoffice/impress/commit/ \
?h=libreoffice-3-4&id=d31b6292b14546ac7b04b4f483b70f68b56412e6
Thanks Yifan Jiang <yfjiang at novell.com> for testing.
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 9bd0d25..850baef 100644
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1231,7 +1231,7 @@ DruckLayout .uno:PrintLayout
Effekt .uno:EffectWindow
Edit .uno:EditDoc
Einfuegen .uno:InsertCtrl
-Ellipsen .uno:Ellipse
+Ellipsen .uno:BasicShapes.ellipse
ExecuteBtn .uno:SbaExecuteSql
Feldbefehle .uno:InsertFieldCtrl
Filter .uno:DataFilterStandardFilter
@@ -1271,7 +1271,7 @@ OnlineLayout .uno:BrowseView
Paste .uno:Paste
Praesentation .uno:Presentation
PrintDefault .uno:PrintDefault
-Rechteck .uno:Rect
+Rechteck .uno:BasicShapes.rectangle
Rechtschreibung .uno:Spelling
RecSearch .uno:RecSearch
RecSave .uno:RecSave
commit a5cde20ee30bfeb4f66923fa535c5a6bbf8c5d0e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:38 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit f9a4c99b8c826d0d218eb15aae296ef5560ed041
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:17 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
More information about the Libreoffice-commits
mailing list