vitomation01: Branch merge with DEV300_m75

7 files changed, 67 insertions, 66 deletions

diff --git a/testautomation/chart2/required/includes/ch2_datadialogue.inc b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
index 85bb63a200f9..e0db844353c1 100644
--- a/testautomation/chart2/required/includes/ch2_datadialogue.inc
+++ b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
@@ -105,6 +105,12 @@ testcase tChartDataDialogueButtons
         else
             printlog "   DeleteColumn was correctly disabled."
         end if
+        printlog "Check if the 'Insert Text Column'-button is enabled."
+        if InsertTextColumn.isEnabled then
+            printlog "   Insert Text Column was correctly enabled."
+        else
+            warnlog "   Insert Text Column wasnt enabled, but should have been."
+        end if
         '/// Press 'TAB' to enter the Data-fields, followed by 'SHIFT TAB' end up in the first field.
         printlog "Press 'TAB' to enter the Data-fields, followed by 'SHIFT TAB' end up in the first field."
         Kontext "Diagramdata"
@@ -204,6 +210,8 @@ testcase tChartDataDialogueButtons
         else
             warnlog "   Error when Swapping a Row."
         end if
+        printlog "Insert a text column"
+        InsertTextColumn.Click
         '/// Close the dialogue
         printlog "   Close the dialogue."
         Diagramdata.Close
diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
index dcdb65ab7446..10ba7eb017e1 100644
--- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
+++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
@@ -544,53 +544,16 @@ testcase tCreateNewLineChart
     end if    
     printlog "Format / Data Ranges"   
     FormatDataRanges
-    Kontext
-    Active.SetPage TabChartTypeDataRange        
-    Kontext "TabChartTypeDataRange"
-    if TabChartTypeDataRange.Exists(2) then        
-        printlog "Check substrings '$A$2:$C$13', '$A$19', '$B$1:$C$13', '$E$1:$F$13' and '$B$17:$E$17' in Data Range"        
-        sControlString = DataRange.GetText
-        printlog "Data Range is: " & sControlString
-        if instr ( sControlString , "$A$2:$C$13" ) = 0 Then
-            warnlog "Data range wasn't correctly preserved after save and reload: $A$2:$C$13"
-        endif
-        if instr ( sControlString , "$A$19" ) = 0 Then
-            warnlog "Data range wasn't correctly preserved after save and reload: $A$19"
-        endif
-        if instr ( sControlString , "$B$1:$C$13" ) = 0 Then
-           QAErrorlog "#i100780#Data range wasn't correctly preserved after save and reload: $B$1:$C$13"
-        endif
-        if instr ( sControlString , "$E$1:$F$13" ) = 0 Then
-            warnlog "Data range wasn't correctly preserved after save and reload: $E$1:$F$13"
-        endif
-        if instr ( sControlString , "$B$17:$E$17" ) = 0 Then
-            warnlog "Data range wasn't correctly preserved after save and reload: $B$17:$E$17"
-        endif        
-        printlog "Check if Radio Button ROWS is checked"
-        if Rows.IsChecked then
-            warnlog "Radio Button ROWS (disabled) wasn't preserved after save and reload."
-        endif        
-        printlog "Check if Radio Button COLUMNS is unchecked"
-        if NOT Columns.IsChecked then
-            warnlog "Radio Button COLUMNS (enabled) wasn't preserved after save and reload."
-        endif        
-        printlog "Check if 'First row as label' box is unchecked"
-        if NOT FirstRowAsLabel.IsChecked then
-            warnlog "Check box 'First row as label' (enabled) wasn't preserved after save and reload."
-        endif        
-        printlog "Check if 'First column as label' box is checked"
-        if NOT FirstColumnAsLabel.IsChecked then
-            warnlog "Check box 'First column as label' (enabled) wasn't preserved after save and reload."
-        endif
-    else
-        warnlog "Tab page Data Range was not up!"
-        FormatDataRanges        
-    end if    
     printlog "Switch to tab page Data Series"
     Kontext
+    Active.SetPage TabFormatDataRangesDataRange 'Due to bug #i77237# the tabpage has to be switched once before 'OK' or 'Cancel' can be used
     Active.SetPage TabFormatDataRangesDataSeries 
     Kontext "TabChartTypeDataSeries"
-    if TabChartTypeDataSeries.Exists(2) then        
+    if TabChartTypeDataSeries.Exists(2) then
+        printlog "Verify that there are 4 data series"
+        if DataSeries.GetItemCount <> 4 then
+            warnlog "There should be 4 dataseries, but there are " & DataSeries.GetItemCount
+        end if
         printlog "Select 4th entry in Data Series"
         if fSetListBoxByItem ( DataSeries , 4 ) > 0 then
             warnlog "Selecting 4th item in Data Series failed. EXITING!"
diff --git a/testautomation/framework/optional/includes/basic_issues.inc b/testautomation/framework/optional/includes/basic_issues.inc
index d07326226ed8..0c38e743fb93 100755
--- a/testautomation/framework/optional/includes/basic_issues.inc
+++ b/testautomation/framework/optional/includes/basic_issues.inc
@@ -52,6 +52,13 @@ function hTestActive( cString as string , iMethod as integer , bExact as boolean
     ' -3 = content of messagebox not relevant
     ' -4 = Messagebox not displayed / Macro not executed
     ' 1 - 4 = Number of buttons on the dialog
+
+    ' internal states, if state = 0 we return the buttoncount instead
+    const STATE_SUCCESS                = 0
+    const STATE_FUZZY_MATCH            = -1
+    const STATE_NO_MATCH               = -2
+    const STATE_IGNORE_MSGBOX          = -3
+    const STATE_MACRO_EXECUTION_FAILED = -4
     
     const CFN = "hTestActive()::"
 
@@ -65,30 +72,26 @@ function hTestActive( cString as string , iMethod as integer , bExact as boolean
         cMsg = Active.getText()
     
         if ( cString <> "" ) then
-            if ( instr( active.getText(), cString ) <> 0 ) then
+            if ( instr( active.getText(), cString ) ) then
                 if ( active.getText() = cString ) then
-                    'printlog( CFN & "Correct message found (exact match): " & cMsg )
-                    rc = 0
+                    rc = STATE_SUCCESS
                 else
                     if ( bExact ) then
                         warnlog( CFN & "Message is no exact match: " & cMsg )
-                        rc = -1
+                        rc = STATE_FUZZY_MATCH
                     else
-                        'printlog( CFN & "Correct message found (fuzzy match): " & cMsg )
-                        rc = 0
+                        rc = STATE_SUCCESS
                     endif
                 endif
             else
                 warnlog( CFN & "Messagebox has wrong content: " & cMsg )
-                rc = -4
+                rc = STATE_NO_MATCH
             endif
         else
-            'printlog( CFN & "Messagebox: " & cMsg )
-            rc = -3
+            rc = STATE_IGNORE_MSGBOX
         endif
         
         buttons = Active.getButtonCount()
-        'printlog( CFN & "Number of buttons: " & buttons )
         select case( iMethod )
         case 1 : Active.OK()
         case 2 : Active.Cancel()
@@ -97,9 +100,10 @@ function hTestActive( cString as string , iMethod as integer , bExact as boolean
         end select
     else
         warnlog( CFN & "Messagebox is missing" )
+        rc = STATE_MACRO_EXECUTION_FAILED
     endif
     
-    if ( rc = 0 ) then hTestActive() = buttons
+    if ( rc = STATE_SUCCESS ) then hTestActive() = buttons
     
 end function
        
@@ -176,7 +180,7 @@ testcase t_macros()
     hIDERunMacro()
     hTestActive( "1900" , 1 , FALSE )
     hTestActive( "2"    , 1 , FALSE )
-'---------    
+  
     printlog( "" )
     printlog( " ---------- i103691 ------------ " )
     hInsertMacroFromFile( "i103691" )
@@ -197,7 +201,14 @@ testcase t_macros()
     hTestActive( "43" , 1 , FALSE )
     hTestActive( "Pi" , 1 , FALSE )
 
-'-------
+    printlog( "" )
+    printlog( " ---------- i107070 ------------ " )
+    hInsertMacroFromFile( "i107070" )
+    hIDERunMacro()
+    hTestActive( "Dbg_Methods" , 1 , FALSE )
+    hTestActive( "Dbg_Methods" , 1 , FALSE )
+    hTestActive( "." , 1 , FALSE )
+
     printlog( "" )
     printlog( " ---------- MessageBoxes ------------ " )
     hInsertMacroFromFile( "MessageBoxes" )
diff --git a/testautomation/global/input/macros.txt b/testautomation/global/input/macros.txt
index 32d22d503d44..278765674855 100755
--- a/testautomation/global/input/macros.txt
+++ b/testautomation/global/input/macros.txt
@@ -262,3 +262,20 @@ Sub Main
         msgbox( "Error" )
     endif
 end sub
+
+# ---------------------------------------------------------------------------- #
+
+[i107070]
+Sub Main
+    oSingleton = com.sun.star.logging.LoggerPool
+
+    oInstance1 = oSingleton.get()
+    msgbox oInstance1.dbg_properties
+
+    oCtx = GetDefaultContext()
+    oInstance2 = oSingleton.get( oCtx )
+    msgbox oInstance2.dbg_properties
+
+    ' Uncommenting this should result in an error "Invalid procedure call"
+    oInstanceErr1 = oSingleton.get( 42 )
+End Sub
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 48724c5eaa27..1540dbd8743f 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -83,16 +83,6 @@ Art sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE
 *DatenquelleLiteraturdatenbank HID_DLG_DBCHANGE
 Auswahl HID_SELECTION_TLB
 
-*Diagramdata SID_DIAGRAM_DATA
-Toolbox2 HID_SCH_TBX_DATA
-InsertRow HID_SCH_TBI_DATA_INSERT_ROW
-InsertColumn HID_SCH_TBI_DATA_INSERT_COL
-DeleteRow HID_SCH_TBI_DATA_DELETE_ROW
-DeleteColumn HID_SCH_TBI_DATA_DELETE_COL
-SwapColumns HID_SCH_TBI_DATA_SWAP_COL
-SwapRows HID_SCH_TBI_DATA_SWAP_ROW
-Tables HID_SCH_CTL_DATA
-DataSeriesLabel HID_SCH_DATA_SERIES_LABEL
 
 *Dokumenteigenschaften SID_DOCINFO
 
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index de1b69ab4429..505c35536025 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -58,6 +58,18 @@ DatabaseFile SID_OPENURL
 Browse cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE
 RegisteredName cui:Edit:DLG_DOCUMENTLINK:ET_NAME
 
+*Diagramdata SID_DIAGRAM_DATA
+Toolbox2 HID_SCH_TBX_DATA
+InsertRow HID_SCH_TBI_DATA_INSERT_ROW
+InsertColumn HID_SCH_TBI_DATA_INSERT_COL
+InsertTextColumn HID_SCH_TBI_DATA_INSERT_TEXT_COL
+DeleteRow HID_SCH_TBI_DATA_DELETE_ROW
+DeleteColumn HID_SCH_TBI_DATA_DELETE_COL
+SwapColumns HID_SCH_TBI_DATA_SWAP_COL
+SwapRows HID_SCH_TBI_DATA_SWAP_ROW
+Tables HID_SCH_CTL_DATA
+DataSeriesLabel HID_SCH_DATA_SERIES_LABEL
+
 *DigitalSignature HID_XMLSEC_DLG_DIGSIG
 ViewCertificate xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT
 CertificateList HID_XMLSEC_CTRL_SIGNATURESDLG
diff --git a/testautomation/spreadsheet/optional/input/validity.ods b/testautomation/spreadsheet/optional/input/validity.ods
index 06a980c67478..aced256e948b 100755
--- a/testautomation/spreadsheet/optional/input/validity.ods
+++ b/testautomation/spreadsheet/optional/input/validity.ods