SVN commit 814264 by roop:
testcase for leader-text in tab-stops
M +2 -2 STATUS
M +4 -11 TestLoading.cpp
AM data/FormattingProperties/ParagraphFormattingProperties/tabLeaderText.odt
A data/FormattingProperties/ParagraphFormattingProperties/tabLeaderText.qs
--- trunk/koffice/libs/kotext/opendocument/tests/STATUS #814263:814264
@@ -66,7 +66,7 @@
./FormattingProperties/ParagraphFormattingProperties/punctuationWrap/test.xml: unknown
./FormattingProperties/ParagraphFormattingProperties/breakBeforeAndBreakAfter/test.xml: fullsupport
*./FormattingProperties/ParagraphFormattingProperties/leaderType/test.xml: unsupported
-./FormattingProperties/ParagraphFormattingProperties/leaderText/test.xml: unsupported
+*./FormattingProperties/ParagraphFormattingProperties/leaderText/test.xml: unsupported
./FormattingProperties/ParagraphFormattingProperties/keepTogether/test.xml: fullsupport
./FormattingProperties/ParagraphFormattingProperties/dropCapsDistance/test.xml: unsupported
./FormattingProperties/ParagraphFormattingProperties/topAndBottomMargins/test.xml: fullsupport
@@ -103,7 +103,7 @@
./FormattingProperties/TextFormattingProperties/textCombine/test.xml: unsupported
*./FormattingProperties/TextFormattingProperties/lineThroughType/test.xml: fullsupport
*./FormattingProperties/TextFormattingProperties/underliningStyle/test.xml: fullsupport
-./FormattingProperties/TextFormattingProperties/lineThroughText/test.xml: unsupported
+*./FormattingProperties/TextFormattingProperties/lineThroughText/test.xml: unsupported
./FormattingProperties/TextFormattingProperties/textCombineStartAndEndCharacters/test.xml: unknown
*./FormattingProperties/TextFormattingProperties/textLineTroughWordMode/test.xml: unsupported
*./FormattingProperties/TextFormattingProperties/language/test.xml: fullsupport
--- trunk/koffice/libs/kotext/opendocument/tests/TestLoading.cpp #814263:814264
@@ -145,13 +145,6 @@
for (int i = 0; i();
KoText::Tab expectedTab = expectedTabList[i].value();
- //qDebug() << actualTab.position << " cmp " << expectedTab.position
- // << "\n" << actualTab.type << " cmp " << expectedTab.type
- // << "\n" << actualTab.delimiter << " cmp " << expectedTab.delimiter
- // << "\n" << actualTab.leaderStyle << " cmp " << expectedTab.leaderStyle
- // << "\n" << actualTab.leaderColor << " cmp " << expectedTab.leaderColor
- // << "\n" << actualTab.leaderText << " cmp " << expectedTab.leaderText
- // << "\n" << actualTab.textStyleId << " cmp " << expectedTab.textStyleId;
if (actualTab.position != expectedTab.position
|| actualTab.type != expectedTab.type
|| actualTab.delimiter != expectedTab.delimiter
@@ -160,8 +153,7 @@
|| actualTab.leaderColor != expectedTab.leaderColor
|| actualTab.leaderWeight != expectedTab.leaderWeight
|| actualTab.leaderWidth != expectedTab.leaderWidth
- // || actualTab.leaderText != expectedTab.leaderText
- // || actualTab.textStyleId != expectedTab.textStyleId
+ || actualTab.leaderText != expectedTab.leaderText
) {
return false;
}
@@ -474,7 +466,7 @@
obj.setProperty("leaderColor", QScriptValue(engine, tab.leaderColor.name())); // QColor
else
obj.setProperty("leaderColor", QScriptValue(engine, "invalid")); // QColor
- obj.setProperty("leaderText", QScriptValue(engine, tab.leaderText)); // QChar
+ obj.setProperty("leaderText", QScriptValue(engine, tab.leaderText)); // QString
return obj;
}
@@ -495,7 +487,7 @@
tab.leaderWidth = obj.property("leaderWidth").toNumber();
if (obj.property("leaderColor").toString() != "invalid")
tab.leaderColor = QColor(obj.property("leaderColor").toString());
- tab.leaderText = obj.property("leaderText").toString()[0];
+ tab.leaderText = obj.property("leaderText").toString();
}
QScriptValue constructKoTextTab(QScriptContext *, QScriptEngine *engine)
@@ -657,6 +649,7 @@
QTest::newRow("tabLeaderStyle") << "FormattingProperties/ParagraphFormattingProperties/tabLeaderStyle";
QTest::newRow("tabLeaderColor") << "FormattingProperties/ParagraphFormattingProperties/tabLeaderColor";
QTest::newRow("tabLeaderWidth") << "FormattingProperties/ParagraphFormattingProperties/tabLeaderWidth";
+ QTest::newRow("tabLeaderText") << "FormattingProperties/ParagraphFormattingProperties/tabLeaderText";
}
void TestLoading::testLoading()
** trunk/koffice/libs/kotext/opendocument/tests/data/FormattingProperties/ParagraphFormattingProperties/tabLeaderText.odt #property svn:mime-type
+ application/octet-stream