Kaydet (Commit) 921dce61 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Let's just combine the two tests, since one requires the other.

Change-Id: I I4c02aa1d459f7d5c2a1d9c38255aae3c3043dda6
üst 7b773d9c
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp>
#define NUMBER_OF_TESTS 2 #define NUMBER_OF_TESTS 1
namespace sc_apitest { namespace sc_apitest {
...@@ -52,8 +52,7 @@ public: ...@@ -52,8 +52,7 @@ public:
CPPUNIT_TEST_SUITE(ScAnnotationShapeObj); CPPUNIT_TEST_SUITE(ScAnnotationShapeObj);
// XText // XText
CPPUNIT_TEST(testInsertTextContent); CPPUNIT_TEST(testInsertRemoveTextContent);
CPPUNIT_TEST(testRemoveTextContent);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
......
...@@ -45,8 +45,7 @@ public: ...@@ -45,8 +45,7 @@ public:
virtual uno::Reference<uno::XInterface> init() = 0; virtual uno::Reference<uno::XInterface> init() = 0;
virtual uno::Reference<text::XTextContent> getTextContent() = 0; virtual uno::Reference<text::XTextContent> getTextContent() = 0;
void testInsertTextContent(); void testInsertRemoveTextContent();
void testRemoveTextContent();
}; };
} }
......
...@@ -34,18 +34,12 @@ namespace apitest { ...@@ -34,18 +34,12 @@ namespace apitest {
XText::~XText() {} XText::~XText() {}
void XText::testInsertTextContent() void XText::testInsertRemoveTextContent()
{ {
uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW); uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW);
uno::Reference<text::XTextRange> xCursor(xText->createTextCursor(), UNO_QUERY_THROW); uno::Reference<text::XTextRange> xCursor(xText->createTextCursor(), UNO_QUERY_THROW);
xText->insertTextContent(xCursor, getTextContent(), sal_False); xText->insertTextContent(xCursor, getTextContent(), sal_False);
}
void XText::testRemoveTextContent()
{
testInsertTextContent();
uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW);
xText->removeTextContent(getTextContent()); xText->removeTextContent(getTextContent());
} }
......
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