CWS-TOOLING: integrate CWS chartmultiline

5 files changed, 26 insertions, 53 deletions

diff --git a/testautomation/chart2/required/includes/ch2_datadialogue.inc b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
index 85bb63a20..e0db84435 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 dcdb65ab7..10ba7eb01 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/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 48724c5ea..1540dbd87 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 de1b69ab4..505c35536 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 06a980c67..aced256e9 100755
--- a/testautomation/spreadsheet/optional/input/validity.ods
+++ b/testautomation/spreadsheet/optional/input/validity.ods