tdf#45904: Move _XFootnote Java tests to C++
Change-Id: Ibdc28ab8818860b9c94abeac33713607dbcf8df4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155635
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <[email protected]>
diff --git a/include/test/text/xfootnote.hxx b/include/test/text/xfootnote.hxx
new file mode 100644
index 0000000..eb6f8bd
--- /dev/null
+++ b/include/test/text/xfootnote.hxx
@@ -0,0 +1,36 @@
/* -*- 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 <rtl/ustring.hxx>
#include <test/testdllapi.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <utility>
namespace apitest
{
class OOO_DLLPUBLIC_TEST XFootnote
{
public:
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testGetSetLabel();
protected:
~XFootnote() {}
};
} // namespace apitest
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9e89070..60343d0 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -623,7 +623,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/text/_XDocumentIndex \
qadevOOo/tests/java/ifc/text/_XDocumentIndexesSupplier \
qadevOOo/tests/java/ifc/text/_XEndnotesSupplier \
qadevOOo/tests/java/ifc/text/_XFootnote \
qadevOOo/tests/java/ifc/text/_XFootnotesSettingsSupplier \
qadevOOo/tests/java/ifc/text/_XFootnotesSupplier \
qadevOOo/tests/java/ifc/text/_XLineNumberingProperties \
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
index 8889875..125fef2 100644
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
+++ b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
@@ -10,8 +10,6 @@
"SwXFootnote";"com::sun::star::text::XTextRange";"getEnd()"
"SwXFootnote";"com::sun::star::text::XTextRange";"getString()"
"SwXFootnote";"com::sun::star::text::XTextRange";"setString()"
"SwXFootnote";"com::sun::star::text::XFootnote";"getLabel()"
"SwXFootnote";"com::sun::star::text::XFootnote";"setLabel()"
"SwXFootnote";"com::sun::star::text::XTextContent";"attach()"
"SwXFootnote";"com::sun::star::text::XTextContent";"getAnchor()"
"SwXFootnote";"com::sun::star::text::XText";"insertTextContent()"
diff --git a/qadevOOo/tests/java/ifc/text/_XFootnote.java b/qadevOOo/tests/java/ifc/text/_XFootnote.java
deleted file mode 100644
index 6aedd2c..0000000
--- a/qadevOOo/tests/java/ifc/text/_XFootnote.java
+++ /dev/null
@@ -1,101 +0,0 @@
/*
* 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.text;
import lib.MultiMethodTest;
import com.sun.star.text.XFootnote;
/**
* Testing <code>com.sun.star.text.XFootnote</code>
* interface methods :
* <ul>
* <li><code> getLabel()</code></li>
* <li><code> setLabel()</code></li>
* </ul> <p>
* Test is <b> NOT </b> multithread compliant. <p>
* @see com.sun.star.text.XFootnote
*/
public class _XFootnote extends MultiMethodTest {
public XFootnote oObj = null; // oObj filled by MultiMethodTest
/**
* Test calls the method. <p>
* Has <b> OK </b> status if the method returns not
* <code>null</code> value.
*/
public void _getLabel(){
boolean result;
// testing getLabel
log.println("Testing getLabel() ... ");
String oldLabel = oObj.getLabel();
log.println("getLabel: Old Value: " + oldLabel);
result = (oldLabel != null);
if (result) {
log.println(" ... getLabel() - OK");
}
else {
log.println(" ... getLabel() - FAILED");
}
tRes.tested("getLabel()", result);
} // finished getLabel
/**
* Sets a new label, then using <code>getLabel</code> method
* checks if the label was set. <p>
*
* Has <b>OK</b> status if set and get values are equal.
*/
public void _setLabel(){
boolean result;
String str = "New XFootnote Label";
// testing getLabel
log.println("Testing setLabel() ... ");
log.println("New label : " + str);
String oldLabel = oObj.getLabel();
log.println("Old label was: " + oldLabel);
oObj.setLabel(str);
String res = oObj.getLabel();
log.println("verify setLabel result");
result = res.equals(str);
if (result) {
log.println(" ... setLabel() - OK");
}
else {
log.println(" ... setLabel() - FAILED");
}
tRes.tested("setLabel()", result);
log.println("restoring the old label value");
oObj.setLabel(oldLabel);
} // finished setLabel
}
diff --git a/sw/qa/api/SwXFootnote.cxx b/sw/qa/api/SwXFootnote.cxx
index 24e7db3..ea3ec02 100644
--- a/sw/qa/api/SwXFootnote.cxx
+++ b/sw/qa/api/SwXFootnote.cxx
@@ -13,6 +13,7 @@
#include <test/text/xtextrange.hxx>
#include <test/text/xtextcontent.hxx>
#include <test/text/xtext.hxx>
#include <test/text/xfootnote.hxx>
#include <unotest/macros_test.hxx>
#include <com/sun/star/frame/Desktop.hpp>
@@ -39,7 +40,8 @@ class SwXFootnote final : public test::BootstrapFixture,
public apitest::XSimpleText,
public apitest::XTextRange,
public apitest::XTextContent,
public apitest::XText
public apitest::XText,
public apitest::XFootnote
{
public:
virtual void setUp() override;
@@ -67,6 +69,7 @@ public:
CPPUNIT_TEST(testGetStart);
CPPUNIT_TEST(testGetText);
// CPPUNIT_TEST(testInsertRemoveTextContent);
CPPUNIT_TEST(testGetSetLabel);
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index f8fd36e..9d06b43 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -193,6 +193,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/text/numberingrules \
test/source/text/textcontent \
test/source/text/xautotextcontainer \
test/source/text/xfootnote \
test/source/text/xsimpletext \
test/source/text/xtext \
test/source/text/xtextcontent \
diff --git a/test/source/text/xfootnote.cxx b/test/source/text/xfootnote.cxx
new file mode 100644
index 0000000..d46506b
--- /dev/null
+++ b/test/source/text/xfootnote.cxx
@@ -0,0 +1,41 @@
/* -*- 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/text/xfootnote.hxx>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/XFootnote.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
namespace apitest
{
void XFootnote::testGetSetLabel()
{
Reference<text::XFootnote> xFootnote(init(), UNO_QUERY_THROW);
rtl::OUString labelName = "New XFootnote Label";
xFootnote->setLabel(labelName);
rtl::OUString newLabel = xFootnote->getLabel();
CPPUNIT_ASSERT(!newLabel.isEmpty());
CPPUNIT_ASSERT_EQUAL(labelName, newLabel);
}
} // namespace apitest
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
