Commits

Anonymous committed 0b26377

CWS-TOOLING: integrate CWS automation310b_DEV300
2009-03-10 08:27:48 +0100 jsk r269238 : #i100045#
2009-03-10 08:26:52 +0100 jsk r269237 : #i100045#
2009-03-09 15:33:46 +0100 hde r269196 : #100053
2009-03-09 14:40:36 +0100 jsk r269189 : #i100045#
2009-03-09 10:39:26 +0100 jsk r269066 : #i100039#

Comments (0)

Files changed (5)

testautomation/extensions/required/e_update.bas

 sub main
 
     use "extensions\required\includes\e_update.inc"
-    use "extensions\required\includes\e_update_oooimprovement.inc"
 
     call hStatusIn( "extensions" , "e_update.bas" )
     call tExtensionManagerResources()
-    call tUpdtOOoImprovement()
     call hStatusOut()
 
 end sub

testautomation/extensions/required/includes/e_update_oooimprovement.inc

-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: e_update.inc,v $
-'*
-'* $Revision: 1.1.2.3 $
-'*
-'* last change: $Author: jsk $ $Date: 2008/10/08 09:05:51 $
-'*
-'* This file is part of OpenOffice.org.
-'*
-'* OpenOffice.org is free software: you can redistribute it and/or modify
-'* it under the terms of the GNU Lesser General Public License version 3
-'* only, as published by the Free Software Foundation.
-'*
-'* OpenOffice.org is distributed in the hope that it will be useful,
-'* but WITHOUT ANY WARRANTY; without even the implied warranty of
-'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'* GNU Lesser General Public License version 3 for more details
-'* (a copy is included in the LICENSE file that accompanied this code).
-'*
-'* You should have received a copy of the GNU Lesser General Public License
-'* version 3 along with OpenOffice.org.  If not, see
-'* <http://www.openoffice.org/license.html>
-'* for a copy of the LGPLv3 License.
-'*
-'/******************************************************************************
-'*
-'*  owner : joerg.skottke@sun.com
-'*
-'*  short description : Extension Update Test
-'*
-'\******************************************************************************
-
-testcase tUpdtOOoImprovement
-
-    printlog( "Update test for the tools/options dialog of the OOo Improvement extension" )
-    if ( not gExtensionOOoImprovementIsInstalled ) then
-	qaerrorlog( "The extension is not installed." )  
-        goto endsub
-    endif
-
-    dim cLogFile as string
-        cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
-        cLogFile = convertpath( cLogFile )
-
-    if ( hDeleteFile( cLogFile ) ) then
-        printlog( "Test environment is clean, no logfile present (anymore)" )
-    endif
-
-    ToolsOptions
-    hToolsOptions( "StarOffice", "Improvement" )
-    printlog( "Improvement Program tabpage" )
-
-    call DialogTest( TabOOoImprovement )
-
-    ParticipateNo.check()
-    ParticipateYes.check()
-  
-    if ( ShowData.isEnabled() ) then 
-
-        ShowData.click()
-
-        Kontext "TextImport"
-        if ( TextImport.exists( 1 ) ) then
-            printlog( "Text import dialog" )
-                
-            call DialogTest( TextImport )
-            TextImport.cancel()
-        else
-            warnlog( "#i97340# Show Data button enabled but no logged data found" )
-        endif
-
-        Kontext "Active"
-        if ( Active.exists( 1 ) ) then
-            printlog( "Messagebox: " & Active.getText() )
-            Active.ok()
-        else
-            warnlog( "No warning for missing file: " & cLogFile )
-        endif
-
-        Kontext "Active"
-        if ( Active.exists( 1 ) ) then
-            warnlog( "#97342# Second message for missing " & cLogFile )
-            Active.ok()
-        endif
-    else
-        printlog( "Show data is disabled" )
-    endif
-
-    Kontext "OptionenDlg"
-    OptionenDlg.cancel()
-
-endcase
-

testautomation/framework/optional/includes/configuration.inc

     dim i87952 as string
     dim i92080 as string
     dim i96322 as string
+    dim i100037 as string
     
     i60617 = ".uno:ContinueNumbering"
     i43969 = ".uno:MacroOrganizer"
 	i87952 = ".uno:InsertApplet"
 	i92080 = ".uno:SaveGraphic"
 	i96322 = ".uno:ActivateStyleApply"
+	i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage"
     
     '/// open application ///'
     Call hNewDocument
                             qaErrorLog "#i96322# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
                             bErrorFound = true
                         endif
+                        
+                        if (inStr(i100037,sTemp2)>0) then
+                            qaErrorLog "#i100037# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
+                            bErrorFound = true
+                        endif
                         if ( not bErrorFound ) then
                              warnlog "("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
                         endif

testautomation/global/tools/includes/optional/t_listfuncs.inc

 
     const CFN = "hCountMatchesInList::"
     printlog( CFN & "Enter" )
-    dim brc as boolean 'a multi purpose boolean returnvalue
     
     dim iHitCount as integer
     dim iItemCount as integer
     iItemCount = ListCount( acItemList() )
     
     '///+<li>Walk through the list and count the hits</li>
+    printlog( CFN & "Begin with term: " & cSearchTerm )
     for iCurrentItem = 1 to iItemCount
     
-        if ( cSearchTerm = acItemList( iCurrentItem ) ) then
+        printlog( acItemList( iCurrentItem ) )
+    
+        if ( instr( acItemList( iCurrentItem ), cSearchTerm ) > 0 ) then
             iHitCount = iHitCount + 1
         endif
         
     next iCurrentItem
+    printlog( CFN & "End" )
    '///</ul>
 
     printlog( CFN & "Exit with result: " & iHitCount )

testautomation/writer/required/includes/w_001a_.inc

 
         if gPlatGroup = "unx" then
             if NOT Eigenschaften.IsEnabled AND gPlatform = "osx" then
-                warnlog "#i81545#-macport File -> Print|Printer Settings: Properties button disabled"
+                QAErrorlog "#i81545#-macport File -> Print|Printer Settings: Properties button disabled"
                 Kontext "DruckenDlg"
                 DruckenDlg.Cancel
                 Call hCloseDocument