[ooo-build-commit] Branch 'ooo/OOO320' - testautomation/framework

[Jan Holesovsky]

 testautomation/framework/optional/includes/basic_package_export.inc |   32 ++++------
 1 file changed, 15 insertions(+), 17 deletions(-)

New commits:
commit 747cfec5e272600db891de21cce8ea9ed96e608c
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Dec 9 08:32:23 2009 +0000

    CWS-TOOLING: integrate CWS fwk129
    2009-12-07 14:19:39 +0100 mba  r277741 : #i106367#: typo again
    2009-12-02 10:32:30 +0100 jsk  r277700 : fwk129: #i105719 - Fixed file size, wording and timing
    2009-11-25 13:25:48 +0100 mav  r277632 : #i107047# let the temporary stream be flushed in time
    2009-11-25 13:17:36 +0100 mav  r277631 : #i105719# switch to temporary file ealier to allow storing to the same location
    2009-11-23 14:47:02 +0100 mav  r277596 : #i105343# no outdated info in the buffer
    2009-11-23 14:09:49 +0100 os  r277595 : #i107064# copy styles in SwDoc::CreateCopy()
    2009-11-23 10:38:29 +0100 mba  r277592 : #i104338#: fix build without Java
    2009-11-20 10:22:11 +0100 cd  r277572 : #i107003# Make toolbar invisible before calling doLazyDelete. This prevents possible crashes in scenarios where a modal dialog is visible.
    2009-11-19 18:30:33 +0100 mav  r277569 : #i107035# let the temporary file be removed after the stream has been closed
    2009-11-19 18:06:21 +0100 mba  r277565 : #i106390#: crash caused by optimization
    2009-11-19 17:58:34 +0100 mba  r277564 : #i106367#: typo prevents correct asian language fallback
    2009-11-19 17:57:16 +0100 mba  r277563 : #i106390#: crash caused by optimization
    2009-11-19 16:35:41 +0100 nn  r277561 : #i106854# get source stream directly from document's storage instead of a temporary SfxMedium
    2009-11-19 12:36:38 +0100 mav  r277558 : #i106854# check the date of the original file

diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc
index 19784c2..7126ca5 100755
--- a/testautomation/framework/optional/includes/basic_package_export.inc
+++ b/testautomation/framework/optional/includes/basic_package_export.inc
@@ -45,7 +45,7 @@ testcase tBasicPackageExport
     const PACKAGE_NAME = "tBasicExport.oxt"
     const LIBRARY_NAME = "tBasicExport"
     const DOCUMENT_POSITION = 4
-    const PACKAGE_SIZE = 2000
+    const PACKAGE_SIZE = 1325
     
     dim cDocumentName as string
     dim cLibraryName as string
@@ -162,16 +162,17 @@ testcase tBasicPackageExport
             Export.click()
             
             kontext "ExportBasicLibraryDlg"
-            if ( ExportBasicLibraryDlg.exists( 1 ) ) then
-                printlog( "Select to export as package" )
+            if ( ExportBasicLibraryDlg.exists( 3 ) ) then
+                printlog( "Select to export as extension" )
                 ExportAsPackage.check()
                 ExportBasicLibraryDlg.ok()
                 
                 kontext "SpeichernDlg"
-                if ( SpeichernDlg.exists( 1 ) ) then
-                    printlog( "Save the file, automatic filename extension must be checked" )
-                    DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
+                if ( SpeichernDlg.exists( 3 ) ) then
+                    printlog( "Save the file, suffix will be added automatically." )
+                    DateiName.setText( hGetWorkPath() & LIBRARY_NAME )
                     Speichern.click()
+                    Speichern.notExists( 1 )
                 else
                     warnlog( "Dialog <File Save> did not open" )
                 endif
@@ -182,6 +183,7 @@ testcase tBasicPackageExport
             kontext "TabBibliotheken"
             printlog( "Close libraires tabpage" )
             TabBibliotheken.cancel()
+            TabBibliotheken.notExists( 1 )
         else
             warnlog( "Dialog <TabBibliotheken> is not available" )
         endif
@@ -189,6 +191,7 @@ testcase tBasicPackageExport
         kontext "Makro"
         printlog( "Close BASIC organizer" )
         Makro.cancel()
+        Makro.notExists( 1 )
     else
         warnlog( "Dialog <Makro> did not open" )
     endif
@@ -197,6 +200,7 @@ testcase tBasicPackageExport
     hFileCloseAll()   
     
     printlog( "Verify automatic filename extension (dialog should append .oxt)" )
+    printlog( "Checking for file: " & cFile )
     if ( FileExists( cFile ) ) then
         printlog( "The test-package was saved with .oxt extension, good." )
         cPackageFileName = cFile
@@ -211,17 +215,11 @@ testcase tBasicPackageExport
     endif
     
     printlog( "Verify file size" )
-'    if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
-'        warnlog( "#i105719# - The exported test-package has an incorrect file size." )
-        if ( FileLen( cPackageFileName ) = 0 ) then
-            printlog( "File has zero bytes, it is empty." )
-        else
-            printlog( "Size is.: " & FileLen( cPackageFileName ) )
-            printlog( "Expected: " & PACKAGE_SIZE )
-        endif
-'    else
-'        printlog( "File has correct size" )
-'    endif
+    if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
+        warnlog( "#i105719# - The exported test-package has an incorrect file size." )
+    else
+        printlog( "File has correct size." )
+    endif
     
 endcase