mib19: rebase to DEV300m95

1 files changed, 136 insertions, 62 deletions

diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java
index d013daa24e1f..b042f259072e 100644
--- a/sc/qa/complex/dataPilot/CheckDataPilot.java
+++ b/sc/qa/complex/dataPilot/CheckDataPilot.java
@@ -31,12 +31,12 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sheet.TableFilterField;
+// import com.sun.star.sheet.TableFilterField;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTable;
 import com.sun.star.sheet.XDataPilotTables;
 import com.sun.star.sheet.XDataPilotTablesSupplier;
-import com.sun.star.sheet.XSheetFilterDescriptor;
+// import com.sun.star.sheet.XSheetFilterDescriptor;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
@@ -46,29 +46,47 @@ import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import complex.dataPilot.interfaceTests.beans._XPropertySet;
-import complex.dataPilot.interfaceTests.container._XNamed;
-import complex.dataPilot.interfaceTests.sheet._XDataPilotDescriptor;
-import complex.dataPilot.interfaceTests.sheet._XDataPilotTable;
-import complexlib.ComplexTestCase;
+import com.sun.star.util.XCloseable;
+import complex.dataPilot._XPropertySet;
+import complex.dataPilot._XNamed;
+import complex.dataPilot._XDataPilotDescriptor;
+import complex.dataPilot._XDataPilotTable;
+// import complexlib.ComplexTestCase;
 import lib.StatusException;
+import lib.TestParameters;
 import util.SOfficeFactory;
 
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+
 /**
  * check the DataPilot of Calc.
  */
-public class CheckDataPilot extends ComplexTestCase {
+public class CheckDataPilot {
     /** The data pilot field object **/
     private XInterface mDataPilotFieldObject = null;
     /** The data pilot table object **/
     private XInterface mDataPilotTableObject = null;
 
+
+    private XSpreadsheetDocument xSheetDoc = null;
+
     /**
      * A field is filled some values. This integer determines the size of the
      * field in x and y direction.
      */
     private int mMaxFieldIndex = 6;
 
+    /**
+     * The test parameters
+     */
+    private static TestParameters param = null;
 
     /**
      * Get all test methods
@@ -83,27 +101,27 @@ public class CheckDataPilot extends ComplexTestCase {
      * Test the data pilot field object:
      * simply execute the interface tests in a row
      */
-    public void testDataPilotFieldObject() {
-        log.println("Starting 'testDataPilotFieldObject'");
+    @Test public void testDataPilotFieldObject() {
+        System.out.println("Starting 'testDataPilotFieldObject'");
         // _XNamed
-        XNamed xNamed = (XNamed)UnoRuntime.queryInterface(
+        XNamed xNamed = UnoRuntime.queryInterface(
                                     XNamed.class, mDataPilotFieldObject);
 
-        _XNamed _xNamed = new _XNamed(xNamed, log, param);
-        assure("_getName failed.",_xNamed._getName());
-        assure("_setName failed.",_xNamed._setName());
+        _XNamed _xNamed = new _XNamed(xNamed/*, log*/, param);
+        assertTrue("_getName failed.",_xNamed._getName());
+        assertTrue("_setName failed.",_xNamed._setName());
 
         // _XPropertySet
-        XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(
+        XPropertySet xProp = UnoRuntime.queryInterface(
                                     XPropertySet.class, mDataPilotFieldObject);
-        _XPropertySet _xProp = new _XPropertySet(xProp, log, param);
-        assure("_getPropertySetInfo failed.",_xProp._getPropertySetInfo());
-        assure("_addPropertyChangeListener failed.",_xProp._addPropertyChangeListener());
-        assure("_addVetoableChangeListener failed.",_xProp._addVetoableChangeListener());
-        assure("_setPropertyValue failed.",_xProp._setPropertyValue());
-        assure("_getPropertyValue failed.",_xProp._getPropertyValue());
-        assure("_removePropertyChangeListener failed.",_xProp._removePropertyChangeListener());
-        assure("_removeVetoableChangeListener failed.",_xProp._removeVetoableChangeListener());
+        _XPropertySet _xProp = new _XPropertySet(xProp/*, log*/, param);
+        assertTrue("_getPropertySetInfo failed.",_xProp._getPropertySetInfo());
+        assertTrue("_addPropertyChangeListener failed.",_xProp._addPropertyChangeListener());
+        assertTrue("_addVetoableChangeListener failed.",_xProp._addVetoableChangeListener());
+        assertTrue("_setPropertyValue failed.",_xProp._setPropertyValue());
+        assertTrue("_getPropertyValue failed.",_xProp._getPropertyValue());
+        assertTrue("_removePropertyChangeListener failed.",_xProp._removePropertyChangeListener());
+        assertTrue("_removeVetoableChangeListener failed.",_xProp._removeVetoableChangeListener());
 
     }
 
@@ -111,53 +129,57 @@ public class CheckDataPilot extends ComplexTestCase {
      * Test the data pilot table object:
      * simply execute the interface tests in a row
      */
-    public void testDataPilotTableObject() {
-        log.println("Starting 'testDataPilotTableObject'");
+    @Test public void testDataPilotTableObject() {
+        System.out.println("Starting 'testDataPilotTableObject'");
         // _XNamed
-        XNamed xNamed = (XNamed)UnoRuntime.queryInterface(
+        XNamed xNamed = UnoRuntime.queryInterface(
                                     XNamed.class, mDataPilotTableObject);
-        _XNamed _xNamed = new _XNamed(xNamed, log, param);
-        assure("_getName failed.",_xNamed._getName());
-        assure("_setName failed.",_xNamed._setName());
+        _XNamed _xNamed = new _XNamed(xNamed/*, log*/, param);
+        assertTrue("_getName failed.",_xNamed._getName());
+        assertTrue("_setName failed.",_xNamed._setName());
 
         // _XDataPilotTable
-        XDataPilotTable xDataPilotTable = (XDataPilotTable)
+        XDataPilotTable xDataPilotTable =
                     UnoRuntime.queryInterface(XDataPilotTable.class,
                     mDataPilotTableObject);
         _XDataPilotTable _xDataPilotTable =
-                    new _XDataPilotTable(xDataPilotTable, log, param);
-        assure("before failed.", _xDataPilotTable.before());
-        assure("_getOutputRange failed.", _xDataPilotTable._getOutputRange()) ;
-        assure("_refresh failed.", _xDataPilotTable._refresh()) ;
+                    new _XDataPilotTable(xDataPilotTable/*, log*/, param);
+        assertTrue("before failed.", _xDataPilotTable.before());
+        assertTrue("_getOutputRange failed.", _xDataPilotTable._getOutputRange()) ;
+//        assertTrue("_refresh failed.", _xDataPilotTable._refresh()) ;
 
         // _XDataPilotDescriptor
-        XDataPilotDescriptor xDataPilotDescriptor = (XDataPilotDescriptor)
+        XDataPilotDescriptor xDataPilotDescriptor =
                     UnoRuntime.queryInterface(XDataPilotDescriptor.class,
                     mDataPilotTableObject);
         _XDataPilotDescriptor _xDataPilotDescriptor =
-                    new _XDataPilotDescriptor(xDataPilotDescriptor, log, param);
-        assure("before failed.", _xDataPilotDescriptor.before());
-        assure("_setTag failed.", _xDataPilotDescriptor._setTag()) ;
-        assure("_getTag failed.", _xDataPilotDescriptor._getTag()) ;
-        assure("_getFilterDescriptor failed.", _xDataPilotDescriptor._getFilterDescriptor()) ;
-        assure("_getDataPilotFields failed.", _xDataPilotDescriptor._getDataPilotFields()) ;
-        assure("_getColumnFields failed.", _xDataPilotDescriptor._getColumnFields()) ;
-        assure("_getRowFields failed.", _xDataPilotDescriptor._getRowFields()) ;
-        assure("_getDataFields failed.", _xDataPilotDescriptor._getDataFields()) ;
-        assure("_getHiddenFields failed.", _xDataPilotDescriptor._getHiddenFields()) ;
-        assure("_getPageFields failed.", _xDataPilotDescriptor._getPageFields()) ;
-        assure("_setSourceRange failed.", _xDataPilotDescriptor._setSourceRange()) ;
-        assure("_getSourceRange failed.", _xDataPilotDescriptor._getSourceRange()) ;
+                    new _XDataPilotDescriptor(xDataPilotDescriptor/*, log*/, param);
+        assertTrue("before failed.", _xDataPilotDescriptor.before());
+        assertTrue("_setTag failed.", _xDataPilotDescriptor._setTag()) ;
+        assertTrue("_getTag failed.", _xDataPilotDescriptor._getTag()) ;
+        assertTrue("_getFilterDescriptor failed.", _xDataPilotDescriptor._getFilterDescriptor()) ;
+        assertTrue("_getDataPilotFields failed.", _xDataPilotDescriptor._getDataPilotFields()) ;
+        assertTrue("_getColumnFields failed.", _xDataPilotDescriptor._getColumnFields()) ;
+        assertTrue("_getRowFields failed.", _xDataPilotDescriptor._getRowFields()) ;
+        assertTrue("_getDataFields failed.", _xDataPilotDescriptor._getDataFields()) ;
+        assertTrue("_getHiddenFields failed.", _xDataPilotDescriptor._getHiddenFields()) ;
+        assertTrue("_getPageFields failed.", _xDataPilotDescriptor._getPageFields()) ;
+        assertTrue("_setSourceRange failed.", _xDataPilotDescriptor._setSourceRange()) ;
+        assertTrue("_getSourceRange failed.", _xDataPilotDescriptor._getSourceRange()) ;
     }
 
     /**
      * create an environment for the test
      */
-    public void before() {
-        Object oInterface = null;
-        XSpreadsheetDocument xSheetDoc = null;
+    @Before public void before() {
+//        Object oInterface = null;
+
+        // SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)param.getMSF() );
+        final XMultiServiceFactory xMsf = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf);
 
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)param.getMSF() );
+        param = new TestParameters();
+        param.put("ServiceFactory", xMsf);
 
         // the cell range
         CellRangeAddress sCellRangeAdress = new CellRangeAddress();
@@ -174,7 +196,7 @@ public class CheckDataPilot extends ComplexTestCase {
         sCellAdress.Row = 8;
 
         try {
-            log.println( "Creating a Spreadsheet document" );
+            System.out.println( "Creating a Spreadsheet document" );
             xSheetDoc = SOF.createCalcDoc(null);
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occures.FAILED
@@ -182,11 +204,11 @@ public class CheckDataPilot extends ComplexTestCase {
             throw new StatusException( "Couldn't create document", e );
         }
 
-        log.println("Getting a sheet");
-        XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets();
+        System.out.println("Getting a sheet");
+        XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
         XSpreadsheet oSheet = null;
         XSpreadsheet oSheet2 = null;
-        XIndexAccess oIndexAccess = (XIndexAccess)
+        XIndexAccess oIndexAccess =
             UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
 
         try {
@@ -206,7 +228,7 @@ public class CheckDataPilot extends ComplexTestCase {
         }
 
         try {
-            log.println("Filling a table");
+            System.out.println("Filling a table");
             for (int i = 1; i < mMaxFieldIndex; i++) {
                 oSheet.getCellByPosition(i, 0).setFormula("Col" + i);
                 oSheet.getCellByPosition(0, i).setFormula("Row" + i);
@@ -215,10 +237,13 @@ public class CheckDataPilot extends ComplexTestCase {
             }
 
             for (int i = 1; i < mMaxFieldIndex; i++)
-                for (int j = 1; j < mMaxFieldIndex; j++) {
+            {
+                for (int j = 1; j < mMaxFieldIndex; j++)
+                {
                     oSheet.getCellByPosition(i, j).setValue(i * (j + 1));
                     oSheet2.getCellByPosition(i, j).setValue(i * (j + 2));
                 }
+            }
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             e.printStackTrace();
             throw new StatusException("Couldn't fill some cells", e);
@@ -244,8 +269,8 @@ public class CheckDataPilot extends ComplexTestCase {
 
 
         // create the test objects
-        log.println("Getting test objects") ;
-        XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier)
+        System.out.println("Getting test objects") ;
+        XDataPilotTablesSupplier DPTS =
             UnoRuntime.queryInterface(XDataPilotTablesSupplier.class, oSheet);
         XDataPilotTables DPT = DPTS.getDataPilotTables();
         XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
@@ -254,7 +279,7 @@ public class CheckDataPilot extends ComplexTestCase {
         XPropertySet fieldPropSet = null;
         try {
             Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0);
-            fieldPropSet = (XPropertySet)
+            fieldPropSet =
                 UnoRuntime.queryInterface(XPropertySet.class, oDataPilotField);
         } catch (com.sun.star.lang.WrappedTargetException e) {
             e.printStackTrace();
@@ -283,7 +308,7 @@ public class CheckDataPilot extends ComplexTestCase {
             throw new StatusException("Couldn't create a test environment", e);
         }
 
-        log.println("Insert the DataPilotTable");
+        System.out.println("Insert the DataPilotTable");
         if (DPT.hasByName("DataPilotTable")) {
             DPT.removeByName("DataPilotTable");
         }
@@ -326,4 +351,53 @@ public class CheckDataPilot extends ComplexTestCase {
 
     }
 
+        /*
+     * this method closes a calc document and resets the corresponding class variable xSheetDoc
+     */
+    protected boolean closeSpreadsheetDocument() {
+        boolean worked = true;
+
+        System.out.println("    disposing xSheetDoc ");
+
+        try {
+            XCloseable oCloser =  UnoRuntime.queryInterface(
+                                         XCloseable.class, xSheetDoc);
+            oCloser.close(true);
+        } catch (com.sun.star.util.CloseVetoException e) {
+            worked = false;
+            System.out.println("Couldn't close document");
+        } catch (com.sun.star.lang.DisposedException e) {
+            worked = false;
+            System.out.println("Document already disposed");
+        } catch (java.lang.NullPointerException e) {
+            worked = false;
+            System.out.println("Couldn't get XCloseable");
+        }
+
+        xSheetDoc = null;
+
+        return worked;
+    }
+
+    @After public void after()
+        {
+            closeSpreadsheetDocument();
+        }
+
+
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+
 }