Skip to content

C
core
Kaydet (Commit) 57ca3b3b authored tarafından Jens Carl's avatar Jens Carl
Dosyalara gözat
Seçenekler

tdf#45904 Move XTableCharts Java tests to C++ 

Move XTableCharts Java tests to C++ for ScChartsObj.

Change-Id: Ibd08cc60d38d8ca01af9168d862a9f391c48e90a
Reviewed-on: https://gerrit.libreoffice.org/68992
Tested-by: Jenkins
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst b0a1e1c8
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 325 deletions
include/test/table/xtablecharts.hxx 0 → 100644
Dosyayı görüntüle @ 57ca3b3b
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_TEST_TABLE_XTABLECHARTS_HXX
#define INCLUDED_TEST_TABLE_XTABLECHARTS_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
namespace apitest
{
class OOO_DLLPUBLIC_TEST XTableCharts
{
public:
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testAddNewRemoveByName();
protected:
~XTableCharts() {}
};
} // namespace apitest
#endif // INCLUDED_TEST_TABLE_XTABLECHARTS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
qadevOOo/Jar_OOoRunner.mk
Dosyayı görüntüle @ 57ca3b3b
...@@ -587,7 +587,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ ...@@ -587,7 +587,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/table/_XAutoFormattable \ qadevOOo/tests/java/ifc/table/_XAutoFormattable \
qadevOOo/tests/java/ifc/table/_XCellRange \ qadevOOo/tests/java/ifc/table/_XCellRange \
qadevOOo/tests/java/ifc/table/_XTableChart \ qadevOOo/tests/java/ifc/table/_XTableChart \
qadevOOo/tests/java/ifc/table/_XTableCharts \
qadevOOo/tests/java/ifc/table/_XTableColumns \ qadevOOo/tests/java/ifc/table/_XTableColumns \
qadevOOo/tests/java/ifc/table/_XTableRows \ qadevOOo/tests/java/ifc/table/_XTableRows \
qadevOOo/tests/java/ifc/task/_XInteractionHandler \ qadevOOo/tests/java/ifc/task/_XInteractionHandler \
...@@ -960,7 +959,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ ...@@ -960,7 +959,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScCellRangesObj \ qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
qadevOOo/tests/java/mod/_sc/ScCellSearchObj \ qadevOOo/tests/java/mod/_sc/ScCellSearchObj \
qadevOOo/tests/java/mod/_sc/ScCellTextCursor \ qadevOOo/tests/java/mod/_sc/ScCellTextCursor \
qadevOOo/tests/java/mod/_sc/ScChartsObj \
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \ qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj \ qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \ qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
......
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartsObj.csv deleted 100644 → 0
Dosyayı görüntüle @ b0a1e1c8
"ScChartsObj";"com::sun::star::table::XTableCharts";"addNewByName()"
"ScChartsObj";"com::sun::star::table::XTableCharts";"removeByName()"
qadevOOo/tests/java/ifc/table/_XTableCharts.java deleted 100644 → 0
Dosyayı görüntüle @ b0a1e1c8
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package ifc.table;
import lib.MultiMethodTest;
import com.sun.star.awt.Rectangle;
import com.sun.star.table.CellRangeAddress;
import com.sun.star.table.XTableCharts;
/**
* Testing <code>com.sun.star.table.XTableCharts</code>
* interface methods :
* <ul>
* <li><code> addNewByName()</code></li>
* <li><code> removeByName()</code></li>
* </ul> <p>
* This test needs the following object relations :
* <ul>
* <li> <code>'ADDR'</code>
* (of type <code>com.sun.star.table.CellRangeAddress[]</code>):
* data source ranges for chart creating. </li>
* <li> <code>'RECT'</code>
* (of type <code>com.sun.star.awt.Rectangle</code>):
* the position of chart </li>
* <ul> <p>
* Test is <b> NOT </b> multithread compliant. <p>
* @see com.sun.star.table.XTableCharts
*/
public class _XTableCharts extends MultiMethodTest {
public XTableCharts oObj = null;
/**
* Adds a new chart into table with specified name . <p>
* Has <b> OK </b> status if <code>hasByName()</code> returns
* <code>true</code>. <p>
*/
public void _addNewByName() {
CellRangeAddress[] the_Range = (CellRangeAddress[])
tEnv.getObjRelation("ADDR");
Rectangle the_rect = (Rectangle) tEnv.getObjRelation("RECT");
oObj.addNewByName("XTableCharts",the_rect,the_Range,true,true);
tRes.tested("addNewByName()", oObj.hasByName("XTableCharts") );
} // addNewByName()
/**
* Removes the chart added before. <p>
* Has <b> OK </b> status if <code>hasByName()</code> returns
* <code>false</code>. <p>
* The following method tests are to be completed successfully before :
* <ul>
* <li> <code> addNewByName() </code> : chart must be added first </li>
* </ul>
*/
public void _removeByName() {
requiredMethod("addNewByName()") ;
oObj.removeByName("XTableCharts");
tRes.tested("removeByName()", !oObj.hasByName("XTableCharts") );
} // removeByName()
} // finish class _XTableCharts
qadevOOo/tests/java/mod/_sc/ScChartsObj.java deleted 100644 → 0
Dosyayı görüntüle @ b0a1e1c8
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package mod._sc;
import java.io.PrintWriter;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
import util.SOfficeFactory;
import com.sun.star.awt.Rectangle;
import com.sun.star.container.XIndexAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XCellRangeAddressable;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.sheet.XSpreadsheets;
import com.sun.star.table.CellRangeAddress;
import com.sun.star.table.XCell;
import com.sun.star.table.XCellRange;
import com.sun.star.table.XTableCharts;
import com.sun.star.table.XTableChartsSupplier;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
/**
* Test for object which is represented by service
* <code>com.sun.star.table.TableCharts</code>. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XNameAccess</code></li>
* <li> <code>com::sun::star::container::XIndexAccess</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* <li> <code>com::sun::star::table::XTableCharts</code></li>
* </ul>
* @see com.sun.star.table.TableCharts
* @see com.sun.star.container.XNameAccess
* @see com.sun.star.container.XIndexAccess
* @see com.sun.star.container.XElementAccess
* @see com.sun.star.table.XTableCharts
* @see ifc.container._XNameAccess
* @see ifc.container._XIndexAccess
* @see ifc.container._XElementAccess
* @see ifc.table._XTableCharts
*/
public class ScChartsObj extends TestCase {
private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
*/
@Override
protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
// get a soffice factory object
SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
log.println( "creating a sheetdocument" );
xSheetDoc = SOF.createCalcDoc(null);
}
/**
* Disposes Spreadsheet document.
*/
@Override
protected void cleanup( TestParameters tParam, PrintWriter log ) {
log.println( " disposing xSheetDoc " );
XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc);
util.DesktopTools.closeDoc(oComp);
}
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Retrieves a collection of spreadsheets from a document
* and takes one of them. Inserts some values into the cells of the same cell
* range address. Obtains the collection of the charts using the interface
* <code>XTableChartsSupplier</code>. Creates and adds the chart that using
* the data from the cells of this cell range address. Collection of
* the charts is the instance of the service
* <code>com.sun.star.table.TableCharts</code>.
* Object relations created :
* <ul>
* <li> <code>'RECT'</code> for
* {@link ifc.table._XTableCharts}(of type <code>Rectangle</code>
* the position of the chart)</li>
* <li> <code>'ADDR'</code> for
* {@link ifc.table._XTableCharts}(of type
* <code>com.sun.star.table.CellRangeAddress[]</code> data source ranges
* for chart creating)</li>
* </ul>
* @see com.sun.star.container.XNamed
* @see com.sun.star.table.XTableChartsSupplier
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
XSpreadsheet oSheet=null;
log.println("Getting spreadsheet") ;
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets = UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
oSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
log.println("Creating the Header") ;
insertIntoCell(1,0,"JAN",oSheet,"");
insertIntoCell(2,0,"FEB",oSheet,"");
insertIntoCell(3,0,"MAR",oSheet,"");
insertIntoCell(4,0,"APR",oSheet,"");
insertIntoCell(5,0,"MAI",oSheet,"");
insertIntoCell(6,0,"JUN",oSheet,"");
insertIntoCell(7,0,"JUL",oSheet,"");
insertIntoCell(8,0,"AUG",oSheet,"");
insertIntoCell(9,0,"SEP",oSheet,"");
insertIntoCell(10,0,"OCT",oSheet,"");
insertIntoCell(11,0,"NOV",oSheet,"");
insertIntoCell(12,0,"DEC",oSheet,"");
insertIntoCell(13,0,"SUM",oSheet,"");
log.println("Fill the lines");
insertIntoCell(0,1,"Smith",oSheet,"");
insertIntoCell(1,1,"42",oSheet,"V");
insertIntoCell(2,1,"58.9",oSheet,"V");
insertIntoCell(3,1,"-66.5",oSheet,"V");
insertIntoCell(4,1,"43.4",oSheet,"V");
insertIntoCell(5,1,"44.5",oSheet,"V");
insertIntoCell(6,1,"45.3",oSheet,"V");
insertIntoCell(7,1,"-67.3",oSheet,"V");
insertIntoCell(8,1,"30.5",oSheet,"V");
insertIntoCell(9,1,"23.2",oSheet,"V");
insertIntoCell(10,1,"-97.3",oSheet,"V");
insertIntoCell(11,1,"22.4",oSheet,"V");
insertIntoCell(12,1,"23.5",oSheet,"V");
insertIntoCell(13,1,"=SUM(B2:M2)",oSheet,"");
insertIntoCell(0,2,"Jones",oSheet,"");
insertIntoCell(1,2,"21",oSheet,"V");
insertIntoCell(2,2,"40.9",oSheet,"V");
insertIntoCell(3,2,"-57.5",oSheet,"V");
insertIntoCell(4,2,"-23.4",oSheet,"V");
insertIntoCell(5,2,"34.5",oSheet,"V");
insertIntoCell(6,2,"59.3",oSheet,"V");
insertIntoCell(7,2,"27.3",oSheet,"V");
insertIntoCell(8,2,"-38.5",oSheet,"V");
insertIntoCell(9,2,"43.2",oSheet,"V");
insertIntoCell(10,2,"57.3",oSheet,"V");
insertIntoCell(11,2,"25.4",oSheet,"V");
insertIntoCell(12,2,"28.5",oSheet,"V");
insertIntoCell(13,2,"=SUM(B3:M3)",oSheet,"");
insertIntoCell(0,3,"Brown",oSheet,"");
insertIntoCell(1,3,"31.45",oSheet,"V");
insertIntoCell(2,3,"-20.9",oSheet,"V");
insertIntoCell(3,3,"-117.5",oSheet,"V");
insertIntoCell(4,3,"23.4",oSheet,"V");
insertIntoCell(5,3,"-114.5",oSheet,"V");
insertIntoCell(6,3,"115.3",oSheet,"V");
insertIntoCell(7,3,"-171.3",oSheet,"V");
insertIntoCell(8,3,"89.5",oSheet,"V");
insertIntoCell(9,3,"41.2",oSheet,"V");
insertIntoCell(10,3,"71.3",oSheet,"V");
insertIntoCell(11,3,"25.4",oSheet,"V");
insertIntoCell(12,3,"38.5",oSheet,"V");
insertIntoCell(13,3,"=SUM(A4:L4)",oSheet,"");
// insert a chart
Rectangle oRect = new Rectangle(500, 3000, 25000, 11000);
XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet);
XCellRange myRange = oRange.getCellRangeByName("A1:N4");
XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange);
CellRangeAddress myAddr = oRangeAddr.getRangeAddress();
CellRangeAddress[] oAddr = new CellRangeAddress[1];
oAddr[0] = myAddr;
XTableChartsSupplier oSupp = UnoRuntime.queryInterface(XTableChartsSupplier.class, oSheet);
log.println("Insert Chart");
XTableCharts oCharts = oSupp.getCharts();
oCharts.addNewByName("ScChartObj", oRect, oAddr, true, true);
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oCharts);
tEnv.addObjRelation("RECT", oRect);
tEnv.addObjRelation("ADDR", oAddr);
return tEnv;
}
/**
* Inserts a value or a formula in the cell of the spreasheet.
* @param CellX is the column index of the cell
* @param CellY is the row index of the cell
* @param theValue string representation of the value
* @param TT1 specify the spreadsheet, the interface
* <code>com.sun.star.sheet.XSpreadsheet</code>
* @param flag if it's equal to <code>'V'</code> then the method inserts
* a double-value in the cell else it inserts a formula in the cell
*/
public static void insertIntoCell(
int CellX, int CellY, String theValue, XSpreadsheet TT1, String flag)
throws com.sun.star.lang.IndexOutOfBoundsException {
XCell oCell = TT1.getCellByPosition(CellX, CellY);
if (flag.equals("V")) {
oCell.setValue(Float.parseFloat(theValue));
} else {
oCell.setFormula(theValue);
}
} // end of insertIntoCell
}
sc/qa/extras/scchartsobj.cxx
Dosyayı görüntüle @ 57ca3b3b
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <test/container/xindexaccess.hxx> #include <test/container/xindexaccess.hxx>
#include <test/container/xnameaccess.hxx> #include <test/container/xnameaccess.hxx>
#include <test/lang/xserviceinfo.hxx> #include <test/lang/xserviceinfo.hxx>
#include <test/table/xtablecharts.hxx>
#include <cppu/unotype.hxx> #include <cppu/unotype.hxx>
#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Rectangle.hpp>
...@@ -42,7 +43,8 @@ class ScChartsObj : public CalcUnoApiTest, ...@@ -42,7 +43,8 @@ class ScChartsObj : public CalcUnoApiTest,
public apitest::XElementAccess, public apitest::XElementAccess,
public apitest::XIndexAccess, public apitest::XIndexAccess,
public apitest::XNameAccess, public apitest::XNameAccess,
public apitest::XServiceInfo public apitest::XServiceInfo,
public apitest::XTableCharts
{ {
public: public:
ScChartsObj(); ScChartsObj();
...@@ -74,6 +76,9 @@ public: ...@@ -74,6 +76,9 @@ public:
CPPUNIT_TEST(testGetSupportedServiceNames); CPPUNIT_TEST(testGetSupportedServiceNames);
CPPUNIT_TEST(testSupportsService); CPPUNIT_TEST(testSupportsService);
// XTableCharts
CPPUNIT_TEST(testAddNewRemoveByName);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
......
sc/qa/unoapi/sc_3.sce
Dosyayı görüntüle @ 57ca3b3b
...@@ -19,4 +19,3 @@ ...@@ -19,4 +19,3 @@
-o sc.ScCellRangesObj -o sc.ScCellRangesObj
-o sc.ScCellSearchObj -o sc.ScCellSearchObj
-o sc.ScCellTextCursor -o sc.ScCellTextCursor
-o sc.ScChartsObj
test/Library_subsequenttest.mk
Dosyayı görüntüle @ 57ca3b3b
...@@ -164,6 +164,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ ...@@ -164,6 +164,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/table/xcellcursor \ test/source/table/xcellcursor \
test/source/table/xcolumnrowrange \ test/source/table/xcolumnrowrange \
test/source/table/xtablechart \ test/source/table/xtablechart \
test/source/table/xtablecharts \
test/source/table/xtablechartssupplier \ test/source/table/xtablechartssupplier \
test/source/table/xtablerows \ test/source/table/xtablerows \
test/source/text/xsimpletext \ test/source/text/xsimpletext \
......
test/source/table/xtablecharts.cxx 0 → 100644
Dosyayı görüntüle @ 57ca3b3b
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/table/xtablecharts.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/table/XTableCharts.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <cppunit/extensions/HelperMacros.h>
using namespace css;
namespace apitest
{
void XTableCharts::testAddNewRemoveByName()
{
uno::Reference<table::XTableCharts> xTC(init(), uno::UNO_QUERY_THROW);
uno::Sequence<table::CellRangeAddress> aRanges(1);
aRanges[0] = table::CellRangeAddress(0, 1, 1, 14, 4);
xTC->addNewByName("XTableCharts", awt::Rectangle(500, 3000, 25000, 11000), aRanges, true, true);
CPPUNIT_ASSERT(xTC->hasByName("XTableCharts"));
xTC->removeByName("XTableCharts");
CPPUNIT_ASSERT(!xTC->hasByName("XTableCharts"));
}
} // namespace apitest
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment