INTEGRATION: CWS chart05 (1.15.2); FILE MERGED

2007/05/30 10:21:46 bm 1.15.2.1: adapted URL, disabled UserDefAttr and y-axis title

1 files changed, 27 insertions, 27 deletions

diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java
index d70086c126ef..26de0ba61e0b 100644
--- a/chart2/qa/TestCaseOldAPI.java
+++ b/chart2/qa/TestCaseOldAPI.java
@@ -55,7 +55,7 @@ public class TestCaseOldAPI extends ComplexTestCase {
     public String[] getTestMethodNames() {
         // For some tests a view needs to be created. Accessing the model via
         // this program and the view may lead to problems
-        boolean bAvoidViewCreation = true;
+        boolean bAvoidViewCreation = false;
 
         if( bAvoidViewCreation )
             return new String[] {
@@ -94,7 +94,7 @@ public class TestCaseOldAPI extends ComplexTestCase {
         mbCreateView = true;
 
         if( mbCreateView )
-            mxChartModel = createDocument( "chart" );
+            mxChartModel = createDocument( "schart" );
         else
             mxChartModel = createChartModel();
 
@@ -258,20 +258,20 @@ public class TestCaseOldAPI extends ComplexTestCase {
                     xProp.getPropertyValue( "HasYAxisDescription" ));
                 assure( "Removing description of first y-axis", bNewFirstYAxisText == bFirstYAxisText );
 
-                boolean bYAxisTitle = true;
-                xProp.setPropertyValue( "HasYAxisTitle", new Boolean( bYAxisTitle ));
-                boolean bNewYAxisTitle = AnyConverter.toBoolean(
-                    xProp.getPropertyValue( "HasYAxisTitle" ));
-                assure( "Adding y-axis title", bNewYAxisTitle == bYAxisTitle );
+//                 boolean bYAxisTitle = true;
+//                 xProp.setPropertyValue( "HasYAxisTitle", new Boolean( bYAxisTitle ));
+//                 boolean bNewYAxisTitle = AnyConverter.toBoolean(
+//                     xProp.getPropertyValue( "HasYAxisTitle" ));
+//                 assure( "Adding y-axis title", bNewYAxisTitle == bYAxisTitle );
 
                 // set title text
-                XAxisYSupplier xYAxisSuppl = (XAxisYSupplier) UnoRuntime.queryInterface(
-                    XAxisYSupplier.class, mxOldDoc.getDiagram() );
-                assure( "Diagram is no y-axis supplier", xYAxisSuppl != null );
-                XPropertySet xAxisTitleProp = (XPropertySet) UnoRuntime.queryInterface(
-                    XPropertySet.class, xYAxisSuppl.getYAxisTitle() );
-                assure( "Y-Axis Title is no XPropertySet", xAxisTitleProp != null );
-                xAxisTitleProp.setPropertyValue( "String", "New y axis title" );
+//                 XAxisYSupplier xYAxisSuppl = (XAxisYSupplier) UnoRuntime.queryInterface(
+//                     XAxisYSupplier.class, mxOldDoc.getDiagram() );
+//                 assure( "Diagram is no y-axis supplier", xYAxisSuppl != null );
+//                 XPropertySet xAxisTitleProp = (XPropertySet) UnoRuntime.queryInterface(
+//                     XPropertySet.class, xYAxisSuppl.getYAxisTitle() );
+//                 assure( "Y-Axis Title is no XPropertySet", xAxisTitleProp != null );
+//                 xAxisTitleProp.setPropertyValue( "String", "New y axis title" );
 
                 // second y-axis
                 boolean bSecondaryYAxis = true;
@@ -489,19 +489,19 @@ public class TestCaseOldAPI extends ComplexTestCase {
             int nColor = 0xf5fffa; // mint cream
             xArea.setPropertyValue( "FillColor", new Integer( nColor ) );
             xArea.setPropertyValue( "FillStyle", FillStyle.SOLID );
-            XPropertySetInfo xInfo = xArea.getPropertySetInfo();
-            assure( "Area does not support UserDefinedAttributes",
-                    xInfo.hasPropertyByName( "UserDefinedAttributes" ));
-
-            String aTestAttributeName = "test:foo";
-            String aTestAttributeValue = "content";
-            XNameContainer xUserDefAttributes = (XNameContainer) AnyConverter.toObject(
-                new Type( XNameContainer.class ), xArea.getPropertyValue( "UserDefinedAttributes" ));
-            xUserDefAttributes.insertByName( aTestAttributeName, aTestAttributeValue );
-
-            String aContent = AnyConverter.toString( xUserDefAttributes.getByName( aTestAttributeName ));
-            assure( "Wrong content in UserDefinedAttributes container",
-                    aContent.equals( aTestAttributeValue ));
+//             XPropertySetInfo xInfo = xArea.getPropertySetInfo();
+//             assure( "Area does not support ChartUserDefinedAttributes",
+//                     xInfo.hasPropertyByName( "ChartUserDefinedAttributes" ));
+
+//             String aTestAttributeName = "test:foo";
+//             String aTestAttributeValue = "content";
+//             XNameContainer xUserDefAttributes = (XNameContainer) AnyConverter.toObject(
+//                 new Type( XNameContainer.class ), xArea.getPropertyValue( "ChartUserDefinedAttributes" ));
+//             xUserDefAttributes.insertByName( aTestAttributeName, aTestAttributeValue );
+
+//             String aContent = AnyConverter.toString( xUserDefAttributes.getByName( aTestAttributeName ));
+//             assure( "Wrong content in UserDefinedAttributes container",
+//                     aContent.equals( aTestAttributeValue ));
 
             int nNewColor = AnyConverter.toInt( xArea.getPropertyValue( "FillColor" ) );
             assure( "Changing FillColor of Area failed", nNewColor == nColor );