Skip to content

C
core
Kaydet (Commit) d97370f4 authored tarafından Artur Dorda's avatar Artur Dorda
Dosyalara gözat
Seçenekler

Refactoring the border test in sw, one header will be in all 3 tests 

Change-Id: I007019738c901e0194006ae34e7e5b99f72ee91d
üst ecabd100
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 138 deletions
sw/CppunitTest_sw_subsequent_ooxmlimport.mk
Dosyayı görüntüle @ d97370f4
...@@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ ...@@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\ $(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\
-I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
......
sw/qa/extras/inc/bordertest.hxx 0 → 100644
Dosyayı görüntüle @ d97370f4
This diff is collapsed.
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Dosyayı görüntüle @ d97370f4
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include "../swmodeltestbase.hxx" #include "../swmodeltestbase.hxx"
#include "bordertest.hxx"
#include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
...@@ -43,16 +44,13 @@ ...@@ -43,16 +44,13 @@
#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/text/XTextTable.hpp>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
typedef std::map<rtl::OUString, com::sun::star::table::BorderLine> BorderLineMap;
typedef std::pair<rtl::OUString, com::sun::star::table::BorderLine> StringBorderPair;
using rtl::OString; using rtl::OString;
using rtl::OUString; using rtl::OUString;
...@@ -717,139 +715,8 @@ void Test::testBnc773061() ...@@ -717,139 +715,8 @@ void Test::testBnc773061()
void Test::testAllGapsWord() void Test::testAllGapsWord()
{ {
load("all_gaps_word.docx"); load("all_gaps_word.docx");
uno::Reference<text::XTextDocument> textDocument(mxComponent, uno::UNO_QUERY); BorderTest borderTest;
uno::Reference<container::XEnumerationAccess> xParaEnumAccess(textDocument->getText(), uno::UNO_QUERY); borderTest.testTheBorders(mxComponent);
// list of paragraphs
uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
// maps containing TopBorder widths for every cell
// one map for each tables - there are 8 of them, counting from 0
BorderLineMap map0;
map0.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 53, 26, 26)));
map0.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 79, 26, 26)));
map0.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 106, 26, 26)));
map0.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 159, 26, 26)));
map0.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 212, 26, 26)));
BorderLineMap map1;
map1.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 9, 9, 9)));
map1.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 18, 18, 18)));
map1.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26, 26, 26)));
map1.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 53, 53)));
map1.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 79, 79, 79)));
map1.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 106, 106, 106)));
BorderLineMap map2;
map2.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 9, 5, 5)));
map2.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 18, 9, 9)));
map2.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26, 14, 14)));
map2.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 35, 18, 18)));
map2.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 53, 26, 26)));
map2.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 79, 41, 41)));
map2.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 106, 53, 53)));
map2.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 159, 79, 79)));
map2.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 212, 106, 106)));
BorderLineMap map3;
map3.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 53, 26, 9)));
map3.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 53, 26, 18)));
map3.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 53, 26, 26)));
map3.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 26, 35)));
map3.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 53, 26, 53)));
map3.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 53, 26, 79)));
map3.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 53, 26, 106)));
map3.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 53, 26, 159)));
map3.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 53, 26, 212)));
map3.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 53, 26, 9)));
BorderLineMap map4;
map4.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 53, 26, 18)));
map4.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 53, 26, 26)));
map4.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 26, 35)));
map4.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 53, 26, 35)));
map4.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 53, 26, 79)));
map4.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 53, 26, 106)));
map4.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 53, 26, 159)));
map4.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 53, 26, 212)));
BorderLineMap map5;
map5.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 26, 53, 9)));
map5.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26, 53, 18)));
map5.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26, 53, 26)));
map5.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 26, 53, 35)));
map5.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 26, 53, 53)));
map5.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 26, 53, 79)));
map5.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 26, 53, 106)));
map5.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 26, 53, 159)));
map5.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 26, 53, 212)));
BorderLineMap map6;
map6.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 14, 14, 26)));
map6.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26, 26, 53)));
map6.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 41, 41, 79)));
map6.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 53, 106)));
map6.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 79, 79, 159)));
map6.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 106, 106, 212)));
BorderLineMap map7;
map7.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 14, 14, 26)));
map7.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26, 26, 53)));
map7.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 41, 41, 79)));
map7.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 53, 106)));
map7.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 79, 79, 159)));
map7.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 106, 106, 212)));
sal_Int32 currentTable = 0; //to know which map should we check with the current table
BorderLineMap* tempMap;
tempMap = &map0;
do
{
uno::Reference<lang::XServiceInfo> xServiceInfo;
if (xParaEnum->nextElement() >>= xServiceInfo)
{
if (xServiceInfo->supportsService("com.sun.star.text.TextTable"))
{
uno::Reference<text::XTextTable> const xTextTable(xServiceInfo, uno::UNO_QUERY_THROW);
uno::Sequence<rtl::OUString> const cells = xTextTable->getCellNames();
uno::Sequence< uno::Sequence< sal_Int32 > > borderWidthSequence;
sal_Int32 nLength = cells.getLength();
if(currentTable == sal_Int32(1))
tempMap = &map1;
if(currentTable == sal_Int32(2))
tempMap = &map2;
if(currentTable == sal_Int32(3))
tempMap = &map3;
if(currentTable == sal_Int32(4))
tempMap = &map4;
if(currentTable == sal_Int32(5))
tempMap = &map5;
if(currentTable == sal_Int32(6))
tempMap = &map6;
if(currentTable == sal_Int32(7))
tempMap = &map7;
BorderLineMap::iterator it;
it = tempMap->begin();
for (sal_Int32 i = 0; i < nLength; ++i)
{
uno::Reference<table::XCell> xCell = xTextTable->getCellByName(cells[i]);
uno::Reference< beans::XPropertySet > xPropSet(xCell, uno::UNO_QUERY_THROW);
uno::Any aAny = xPropSet->getPropertyValue("TopBorder");
table::BorderLine aBorderLine;
it = tempMap->find(cells[i]);
if ((aAny >>= aBorderLine) && (it!=tempMap->end()))
{
sal_Int32 innerLineWidth = aBorderLine.InnerLineWidth;
sal_Int32 outerLineWidth = aBorderLine.OuterLineWidth;
sal_Int32 lineDistance = aBorderLine.LineDistance;
sal_Int32 perfectInner = it->second.InnerLineWidth;
sal_Int32 perfectOuter = it->second.OuterLineWidth;
sal_Int32 perfectDistance = it->second.LineDistance;
CPPUNIT_ASSERT_EQUAL(perfectInner, innerLineWidth);
CPPUNIT_ASSERT_EQUAL(perfectOuter, outerLineWidth);
CPPUNIT_ASSERT_EQUAL(perfectDistance, lineDistance);
}
}
++currentTable;
}
}
} while(xParaEnum->hasMoreElements());
} }
CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_TEST_SUITE_REGISTRATION(Test);
......
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