tdf#45904 Move XReplaceDescriptor Java tests to C++

Move XReplaceDescriptor Java tests to C++ for ScCellSearchObj.

Change-Id: Ica5042ce8b5eac3663a0fb5f66ae0a2830c89d93
Reviewed-on: https://gerrit.libreoffice.org/71645
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>

framework/qa/complex/api_internal/api.lst

@@ -73,7 +73,6 @@ job73=sc.ScAccessiblePreviewTable
 job74=sc.ScAccessibleSpreadsheet
 job78=sc.ScAutoFormatFieldObj
 job81=sc.ScCellFieldObj
-job85=sc.ScCellSearchObj
 job88=sc.ScDatabaseRangeObj
 job98=sc.ScHeaderFieldObj
 job99=sc.ScHeaderFieldsObj

include/test/util/xreplacedescriptor.hxx

+/* -*- 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/.
+ */
+
+#pragma once
+
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <test/testdllapi.hxx>
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XReplaceDescriptor
+{
+public:
+    virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+    void testGetSetReplaceString();
+
+protected:
+    ~XReplaceDescriptor() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

qadevOOo/Jar_OOoRunner.mk

@@ -953,7 +953,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_sc/ScCellObj \
     qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
     qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
-    qadevOOo/tests/java/mod/_sc/ScCellSearchObj \
     qadevOOo/tests/java/mod/_sc/ScCellTextCursor \
     qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
     qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \

qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv

-"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"getReplaceString()"
-"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"setReplaceString()"

qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java

-/*
- * 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.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-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 com.sun.star.util.XSearchable;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.util.SearchDescriptor</code> that was implemented by
-* a spreadsheet. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::util::XSearchDescriptor</code></li>
-*  <li> <code>com::sun::star::util::SearchDescriptor</code></li>
-*  <li> <code>com::sun::star::beans::XPropertySet</code></li>
-*  <li> <code>com::sun::star::util::XReplaceDescriptor</code></li>
-* </ul>
-* @see com.sun.star.util.SearchDescriptor
-* @see com.sun.star.util.XSearchDescriptor
-* @see com.sun.star.util.SearchDescriptor
-* @see com.sun.star.beans.XPropertySet
-* @see com.sun.star.util.XReplaceDescriptor
-* @see ifc.util._XSearchDescriptor
-* @see ifc.util._SearchDescriptor
-* @see ifc.beans._XPropertySet
-* @see ifc.util._XReplaceDescriptor
-*/
-public class ScCellSearchObj 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. Creates search descriptor using the interface
-    * <code>XSearchable</code>. The created search descriptor is instance of
-    * the service <code>com.sun.star.util.SearchDescriptor</code> that
-    * implemented by a spreasheet.
-    * @see com.sun.star.util.XSearchable
-    */
-    @Override
-    protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) throws Exception {
-
-        XInterface oObj = null;
-
-        // creation of testobject here
-        // first we write what we are intend to do to log file
-        log.println( "creating a test environment" );
-
-        log.println("getting sheets");
-        XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
-
-        log.println("getting a sheet");
-        XSpreadsheet oSheet = null;
-        XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
-
-        oSheet = (XSpreadsheet) AnyConverter.toObject(
-                new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
-
-        XSearchable xSearch = UnoRuntime.queryInterface(XSearchable.class,oSheet);
-
-        oObj = xSearch.createSearchDescriptor();
-        // create testobject here
-        log.println("creating a new environment for object");
-        TestEnvironment tEnv = new TestEnvironment(oObj);
-
-        return tEnv;
-    } // finish method getTestEnvironment
-}    // finish class ScCellSearchObj
-

sc/qa/extras/sccellsearchobj.cxx

@@ -10,6 +10,7 @@
 #include <test/calc_unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/util/searchdescriptor.hxx>
+#include <test/util/xreplacedescriptor.hxx>
 #include <test/util/xsearchdescriptor.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -29,6 +30,7 @@ namespace sc_apitest
 class ScCellSearchObj : public CalcUnoApiTest,
                         public apitest::SearchDescriptor,
                         public apitest::XPropertySet,
+                        public apitest::XReplaceDescriptor,
                         public apitest::XSearchDescriptor
 {
 public:
@@ -50,6 +52,9 @@ public:
     CPPUNIT_TEST(testPropertyChangeListener);
     CPPUNIT_TEST(testVetoableChangeListener);
 
+    // XReplaceDescriptor
+    CPPUNIT_TEST(testGetSetReplaceString);
+
     // XSearchDescriptor
     CPPUNIT_TEST(testGetSetSearchString);
 

sc/qa/unoapi/sc_3.sce

@@ -17,5 +17,4 @@
 #
 -o sc.ScCellRangeObj
 -o sc.ScCellRangesObj
--o sc.ScCellSearchObj
 -o sc.ScCellTextCursor

test/Library_subsequenttest.mk

@@ -191,6 +191,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/util/xmergeable \
 	test/source/util/xrefreshable \
 	test/source/util/xreplaceable \
+	test/source/util/xreplacedescriptor \
 	test/source/util/xsearchable \
 	test/source/util/xsearchdescriptor \
 	test/source/view/xcontrolaccess \

test/source/util/xreplacedescriptor.cxx

+/* -*- 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/util/xreplacedescriptor.hxx>
+#include <rtl/ustring.hxx>
+
+#include <com/sun/star/util/XReplaceDescriptor.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace css;
+
+namespace apitest
+{
+void XReplaceDescriptor::testGetSetReplaceString()
+{
+    uno::Reference<util::XReplaceDescriptor> xRD(init(), uno::UNO_QUERY_THROW);
+    const OUString aReplaceStringOld = xRD->getReplaceString();
+    CPPUNIT_ASSERT(aReplaceStringOld.isEmpty());
+
+    xRD->setReplaceString("_XReplaceDescriptor");
+    const OUString aReplaceStringNew = xRD->getReplaceString();
+    CPPUNIT_ASSERT_EQUAL(OUString("_XReplaceDescriptor"), aReplaceStringNew);
+    CPPUNIT_ASSERT(aReplaceStringOld != aReplaceStringNew);
+}
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */