CWS-TOOLING: integrate CWS chart46

4 files changed, 57 insertions, 11 deletions

diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
index 0151f5021b3e..f2a6e24e45a2 100755..100644
--- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
+++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
@@ -239,10 +239,10 @@ testcase tDataSeriesWizardCalc
         call DialogTest ( TabChartTypeDataSeries )                    
         printlog "Check if the data series listbox is enabled and contains three entries"
         iDataSeries = DataSeries.GetItemCount
-        if iDataSeries = 3 then
-            printlog "    All 3 data series are available"
+        if iDataSeries = 4 then
+            printlog "    All 4 data series are available"
         else
-            warnlog "There are " & iDataSeries & " data series instead of 3"
+            warnlog "There are " & iDataSeries & " data series instead of 4"
         endif                
         printlog "Check if the ADD button is enabled and click the button"
         if AddButton.IsEnabled then
@@ -253,10 +253,10 @@ testcase tDataSeriesWizardCalc
         endif                    
         printlog "Check if there are now four entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
-        if iDataSeries = 4 then
+        if iDataSeries = 5 then
             printlog "    Adding a data series was successfull"
         else
-            warnlog "There are " & iDataSeries & " data series instead of 4"
+            warnlog "There are " & iDataSeries & " data series instead of 5"
         endif                
         printlog "Check if the second data series was added below the highlighted one"
         if DataSeries.GetSelIndex = 2 then
@@ -271,9 +271,9 @@ testcase tDataSeriesWizardCalc
         else
             warnlog "REMOVE button is not enabled"
         endif                
-        printlog "Check if there are now 3 entries in the data series listbox"
+        printlog "Check if there are now 4 entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
-        if iDataSeries = 3 then
+        if iDataSeries = 4 then
             printlog "    Removing a data series was successfull"
         else
             warnlog "There are " & iDataSeries & " data series instead of 3"
@@ -302,13 +302,14 @@ testcase tDataSeriesWizardCalc
         DataSeries.Select(1)
         if MoveDown.IsEnabled then
             printlog "    The MoveDown button is enabled"            
-            printlog "Click Move Down button twice"
+            printlog "Click Move Down button three times"
+            MoveDown.Click
             MoveDown.Click
             MoveDown.Click
         else
             warnlog "The MoveDown button is disabled"
         endif
-        if DataSeries.GetSelIndex = 3 then
+        if DataSeries.GetSelIndex = 4 then
             printlog "    Moving data series was successfull"
             if MoveDown.IsEnabled then
                 warnlog "MoveDown button is not disabled on first entry"
diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index e04d0ab2a70c..806f0f220ed2 100644
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -110,6 +110,7 @@ sub main
     Call tFormatAxisSecondaryXAxis
     Call tFormatAxisSecondaryYAxis
     Call tFormatAxisAllAxes
+    Call tFormatDateAxis
     Call tFormatXAxisMainGrid
     Call tFormatYAxisMainGrid
     Call tFormatZAxisMainGrid
diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc
index 42048cbbb7de..27575ca4324f 100755..100644
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -47,6 +47,7 @@
 ' #1 tFormatAxisSecondaryXAxis
 ' #1 tFormatAxisSecondaryYAxis
 ' #1 tFormatAxisAllAxes
+' #1 tFormatDateAxis
 '*
 '\************************************************************************
 
@@ -1404,4 +1405,40 @@ testcase tFormatAxisAllAxes
 
 
 endcase
+'
+'-------------------------------------------------------------
+'
+testcase tFormatDateAxis
 
+    printlog "Load simple chart document"
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif
+    printlog " Select chart using navigator"
+    call fSelectFirstOLE
+    printlog "Edit / Object / Edit"
+    EditObjectEdit
+    sleep(1)
+    printlog "Invoke Format::Axis::X Axis"
+    FormatAxisXAxis
+    printlog "Goto tab page Scale"
+    Kontext
+    Active.SetPage TabChartAxisScale
+    Kontext "TabChartAxisScale"
+    printlog " Switch axis type to Date"
+    AxisType.Select (3)
+    printlog " Verify that the date controls are available"
+    if MinorIntervalUnit.exists then
+        call DialogTest ( TabChartAxisScale,2 )
+        else
+            warnlog "Datecontrols are not available"
+    end if
+    printlog " Close dialog"
+    TabChartAxisScale.Cancel
+    printlog "Close document"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    Call hCloseDocument
+
+endcase
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 17cf61f910ca..e8fb0ac7b870 100644..100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -194,9 +194,16 @@ MajorIntervalAutomatic      sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN
 MinorIntervalCount          sym:chart2:MetricField:TP_SCALE:MT_STEPHELP    
 MinorIntervalCountAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP
 ReferenceValue              sym:chart2:SpinField:TP_SCALE:EDT_ORIGIN              
-RreferenceValueAutomatic    sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN
+ReferenceValueAutomatic     sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN
 LogarithmicScale            sym:chart2:CheckBox:TP_SCALE:CBX_LOGARITHM
-ReverseDirection            sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE
+ReverseDirectionDateAxis    sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE:MayBeDateAxis
+ReverseDirectionValueAxis   sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis
+AxisType                    sym:chart2:ListBox:TP_SCALE:LB_AXIS_TYPE
+Resolution                  sym:chart2:ListBox:TP_SCALE:LB_TIME_RESOLUTION
+AutoResolution              sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_TIME_RESOLUTION
+MajorIntervalMetric         sym:chart2:MetricField:TP_SCALE:MT_MAIN_DATE_STEP
+MajorIntervalUnit           sym:chart2:ListBox:TP_SCALE:LB_MAIN_TIME_UNIT
+MinorIntervalUnit           sym:chart2:ListBox:TP_SCALE:LB_HELP_TIME_UNIT
 
 *TabChartAxisPositioning    sym:chart2:TabPage:TP_AXIS_POSITIONS
 CrossOtherAxisAt            sym:chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT