[Libreoffice-commits] .: sc/CppunitTest_sc_cellrangeobj.mk sc/qa test/inc test/Library_subsequenttest.mk test/Package_inc.mk test/source
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Sun Jan 29 15:24:18 PST 2012
sc/CppunitTest_sc_cellrangeobj.mk | 1
sc/qa/extras/sccellrangeobj.cxx | 20 ++++-
sc/qa/extras/sctablesheetobj.cxx | 8 +-
sc/qa/extras/testdocuments/ScTableSheetObj.ods |binary
test/Library_subsequenttest.mk | 1
test/Package_inc.mk | 1
test/inc/test/util/xreplaceable.hxx | 54 +++++++++++++
test/source/util/xreplaceable.cxx | 99 +++++++++++++++++++++++++
8 files changed, 180 insertions(+), 4 deletions(-)
New commits:
commit 8cab24997ac0cca4d3bde972397ad6550bf07859
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jan 30 00:20:54 2012 +0100
add test case for XReplaceable
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index c72a1c2..a6a43d5 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
forms/util/frm \
framework/util/fwk \
i18npool/util/i18npool \
+ i18npool/source/search/i18nsearch \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 20a191c..050724d 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -29,6 +29,8 @@
#include <test/unoapi_test.hxx>
#include <test/sheet/xcellrangesquery.hxx>
#include <test/sheet/cellproperties.hxx>
+#include <test/util/xreplaceable.hxx>
+#include <test/util/xsearchable.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -36,11 +38,14 @@
namespace sc_apitest {
-#define NUMBER_OF_TESTS 8
+#define NUMBER_OF_TESTS 12
-class ScCellRangeObj : public UnoApiTest, apitest::XCellRangesQuery, apitest::CellProperties
+class ScCellRangeObj : public UnoApiTest, apitest::XCellRangesQuery, apitest::CellProperties,
+ apitest::XSearchable, apitest::XReplaceable
{
public:
+ ScCellRangeObj();
+
virtual void setUp();
virtual void tearDown();
virtual uno::Reference< uno::XInterface > init();
@@ -55,6 +60,10 @@ public:
CPPUNIT_TEST(testQueryVisibleCells);
CPPUNIT_TEST(testVertJustify);
CPPUNIT_TEST(testRotateReference);
+ CPPUNIT_TEST(testFindAll);
+ CPPUNIT_TEST(testFindFirst);
+ CPPUNIT_TEST(testReplaceAll);
+ CPPUNIT_TEST(testCreateReplaceDescriptor);
CPPUNIT_TEST_SUITE_END();
private:
@@ -65,6 +74,13 @@ private:
sal_Int32 ScCellRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent;
+ScCellRangeObj::ScCellRangeObj():
+ apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), 1),
+ apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("35")))
+{
+
+}
+
uno::Reference< uno::XInterface > ScCellRangeObj::init()
{
rtl::OUString aFileURL;
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index 6fae46f..0f1d79a 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -27,6 +27,7 @@
*/
#include <test/unoapi_test.hxx>
+#include <test/util/xreplaceable.hxx>
#include <test/util/xsearchable.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -35,7 +36,7 @@
namespace sc_apitest
{
-class ScTableSheetObj : public UnoApiTest, apitest::XSearchable
+class ScTableSheetObj : public UnoApiTest, apitest::XSearchable, apitest::XReplaceable
{
public:
ScTableSheetObj();
@@ -46,6 +47,8 @@ public:
CPPUNIT_TEST(testFindAll);
CPPUNIT_TEST(testFindNext);
CPPUNIT_TEST(testFindFirst);
+ CPPUNIT_TEST(testReplaceAll);
+ CPPUNIT_TEST(testCreateReplaceDescriptor);
CPPUNIT_TEST_SUITE_END();
private:
@@ -57,7 +60,8 @@ sal_Int32 ScTableSheetObj::nTest = 0;
uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent;
ScTableSheetObj::ScTableSheetObj():
- apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4)
+ apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4),
+ apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("searchReplaceString")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replaceReplaceString")))
{
}
diff --git a/sc/qa/extras/testdocuments/ScTableSheetObj.ods b/sc/qa/extras/testdocuments/ScTableSheetObj.ods
index 49863c0..86d027c 100644
Binary files a/sc/qa/extras/testdocuments/ScTableSheetObj.ods and b/sc/qa/extras/testdocuments/ScTableSheetObj.ods differ
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index a8ac6fb..fea04b6 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xnamedrange \
test/source/sheet/xnamedranges \
test/source/sheet/xspreadsheets2 \
+ test/source/util/xreplaceable \
test/source/util/xsearchable \
))
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
index 52d8ac3..c424707 100644
--- a/test/Package_inc.mk
+++ b/test/Package_inc.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,te
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotfieldgrouping.hxx,test/sheet/xdatapilotfieldgrouping.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/datapilotfield.hxx,test/sheet/datapilotfield.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheets2.hxx,test/sheet/xspreadsheets2.hxx))
+$(eval $(call gb_Package_add_file,test_inc,inc/test/util/xreplaceable.hxx,test/util/xreplaceable.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/util/xsearchable.hxx,test/util/xsearchable.hxx))
# vim: set noet sw=4 ts=4:
diff --git a/test/inc/test/util/xreplaceable.hxx b/test/inc/test/util/xreplaceable.hxx
new file mode 100644
index 0000000..4f66ea1
--- /dev/null
+++ b/test/inc/test/util/xreplaceable.hxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <test/testdllapi.hxx>
+
+using namespace com::sun::star;
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XReplaceable
+{
+public:
+ XReplaceable( const rtl::OUString& rSearchString, const rtl::OUString& rReplaceString):
+ maSearchString(rSearchString), maReplaceString(rReplaceString) {}
+ virtual uno::Reference< uno::XInterface > init() = 0;
+
+ void testCreateReplaceDescriptor();
+ void testReplaceAll();
+
+private:
+ rtl::OUString maSearchString;
+ rtl::OUString maReplaceString;
+};
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/util/xreplaceable.cxx b/test/source/util/xreplaceable.cxx
new file mode 100644
index 0000000..9988b69
--- /dev/null
+++ b/test/source/util/xreplaceable.cxx
@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <test/util/xreplaceable.hxx>
+
+#include <com/sun/star/util/XReplaceable.hpp>
+#include <com/sun/star/util/XReplaceDescriptor.hpp>
+#include <com/sun/star/util/XSearchDescriptor.hpp>
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <iostream>
+
+using namespace com::sun::star::uno;
+
+namespace apitest {
+
+void XReplaceable::testCreateReplaceDescriptor()
+{
+ uno::Reference< util::XReplaceable > xReplaceable(init(), UNO_QUERY_THROW);
+ uno::Reference< util::XReplaceDescriptor> xReplaceDescr = xReplaceable->createReplaceDescriptor();
+ CPPUNIT_ASSERT(xReplaceDescr.is());
+}
+
+void XReplaceable::testReplaceAll()
+{
+ std::cout << "testReplaceAll" << std::endl;
+ uno::Reference< util::XReplaceable > xReplaceable(init(), UNO_QUERY_THROW);
+ uno::Reference< util::XReplaceDescriptor> xReplaceDescr = xReplaceable->createReplaceDescriptor();
+ CPPUNIT_ASSERT(xReplaceDescr.is());
+
+ uno::Reference< util::XSearchDescriptor > xSearchDescr = xReplaceable->createSearchDescriptor();
+ xSearchDescr->setSearchString(maSearchString);
+
+ //check that at least one object is there that will be replaced
+ uno::Reference< uno::XInterface > xElement = xReplaceable->findFirst(xSearchDescr);
+ CPPUNIT_ASSERT(xElement.is());
+
+ //check that there is none object with the replace string
+ xSearchDescr->setSearchString(maReplaceString);
+ xElement = xReplaceable->findFirst(xSearchDescr);
+ CPPUNIT_ASSERT(!xElement.is());
+
+ xReplaceDescr->setSearchString(maSearchString);
+ xReplaceDescr->setReplaceString(maReplaceString);
+
+ xReplaceable->replaceAll(uno::Reference< util::XSearchDescriptor >(xReplaceDescr, UNO_QUERY_THROW));
+
+ //check that now at least one element is found
+ xElement = xReplaceable->findFirst(xSearchDescr);
+ CPPUNIT_ASSERT(xElement.is());
+
+ xSearchDescr->setSearchString(maSearchString);
+ xElement = xReplaceable->findFirst(xSearchDescr);
+ CPPUNIT_ASSERT(!xElement.is());
+
+ //redo the whole thing
+ xReplaceDescr->setSearchString(maReplaceString);
+ xReplaceDescr->setReplaceString(maSearchString);
+
+ xReplaceable->replaceAll(uno::Reference< util::XSearchDescriptor >(xReplaceDescr, UNO_QUERY_THROW));
+
+ //check that it works
+ xElement = xReplaceable->findFirst(xSearchDescr);
+ CPPUNIT_ASSERT(xElement.is());
+
+ //check that there is none object with the replace string
+ xSearchDescr->setSearchString(maReplaceString);
+ xElement = xReplaceable->findFirst(xSearchDescr);
+ CPPUNIT_ASSERT(!xElement.is());
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list