tdf#45904 Move XTextField Java tests to C++

Move XTextField Java tests to C++ for ScEditFieldObj_Header (formerly
ScHeaderFieldObj).

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

4 files changed, 34 insertions, 14 deletions

diff --git a/include/test/text/xtextfield.hxx b/include/test/text/xtextfield.hxx
index 870d51d20da5..6d717b1ead06 100644
--- a/include/test/text/xtextfield.hxx
+++ b/include/test/text/xtextfield.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -10,25 +10,28 @@
 #ifndef INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
 #define INCLUDED_TEST_TEXT_XTEXTFIELD_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 XTextField
 {
 public:
-    virtual ~XTextField() {}
-
-    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+    virtual css::uno::Reference<css::uno::XInterface> init() = 0;
 
     void testGetPresentation();
+    void testGetPresentationEmptyString();
+
+protected:
+    ~XTextField() {}
 };
 
-}
+} // namespace apitest
 
 #endif // INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
index 343631dee5b6..e4f37d6e1016 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
@@ -1,4 +1,3 @@
 "ScHeaderFieldObj";"com::sun::star::lang::XComponent";"dispose()"
 "ScHeaderFieldObj";"com::sun::star::lang::XComponent";"addEventListener()"
 "ScHeaderFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()"
-"ScHeaderFieldObj";"com::sun::star::text::XTextField";"getPresentation()"
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx
index a38b3a122ebb..f8d1e5d5a0d4 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -11,6 +11,7 @@
 #include <test/beans/xpropertyset.hxx>
 #include <test/text/textcontent.hxx>
 #include <test/text/xtextcontent.hxx>
+#include <test/text/xtextfield.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -38,7 +39,8 @@ namespace sc_apitest
 class ScEditFieldObj_Header : public CalcUnoApiTest,
                               public apitest::TextContent,
                               public apitest::XPropertySet,
-                              public apitest::XTextContent
+                              public apitest::XTextContent,
+                              public apitest::XTextField
 {
 public:
     ScEditFieldObj_Header();
@@ -66,6 +68,9 @@ public:
     CPPUNIT_TEST(testGetAnchor);
     CPPUNIT_TEST(testAttach);
 
+    // XTextField
+    CPPUNIT_TEST(testGetPresentationEmptyString);
+
     CPPUNIT_TEST_SUITE_END();
 
 private:
diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx
index 1d0abb22dad0..87fff9db3f83 100644
--- a/test/source/text/xtextfield.cxx
+++ b/test/source/text/xtextfield.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -8,24 +8,37 @@
  */
 
 #include <test/text/xtextfield.hxx>
+#include <rtl/string.hxx>
+
 #include <com/sun/star/text/XTextField.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace css;
-using namespace css::uno;
 
 namespace apitest
 {
-
 void XTextField::testGetPresentation()
 {
-    uno::Reference< text::XTextField > xTextField(init(), UNO_QUERY_THROW);
+    uno::Reference<text::XTextField> xTextField(init(), uno::UNO_QUERY_THROW);
+
     OUString aString = xTextField->getPresentation(true);
     CPPUNIT_ASSERT(!aString.isEmpty());
     aString = xTextField->getPresentation(false);
     CPPUNIT_ASSERT(!aString.isEmpty());
 }
 
+void XTextField::testGetPresentationEmptyString()
+{
+    uno::Reference<text::XTextField> xTextField(init(), uno::UNO_QUERY_THROW);
+
+    OUString aString = xTextField->getPresentation(true);
+    CPPUNIT_ASSERT(aString.isEmpty());
+    aString = xTextField->getPresentation(false);
+    CPPUNIT_ASSERT(aString.isEmpty());
 }
+} // namespace apitest
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */