dev/null |binary
starmath/qa/testdocuments/README | 2
sw/qa/extras/ooxmlexport/data/math-accents.docx |binary
sw/qa/extras/ooxmlexport/data/math-d.docx |binary
sw/qa/extras/ooxmlexport/data/math-escaping.docx |binary
sw/qa/extras/ooxmlexport/data/math-lim.docx |binary
sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx |binary
sw/qa/extras/ooxmlexport/data/math-matrix.docx |binary
sw/qa/extras/ooxmlexport/data/math-mso2k7.docx |binary
sw/qa/extras/ooxmlexport/data/math-nary.docx |binary
sw/qa/extras/ooxmlexport/data/math-overbrace_underbrace.docx |binary
sw/qa/extras/ooxmlexport/data/math-overstrike.docx |binary
sw/qa/extras/ooxmlexport/data/math-placeholders.docx |binary
sw/qa/extras/ooxmlexport/data/math-rad.docx |binary
sw/qa/extras/ooxmlexport/data/math-subscripts.docx |binary
sw/qa/extras/ooxmlexport/data/math-vertical_stacks.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 172 +++++++++++
17 files changed, 172 insertions(+), 2 deletions(-)
New commits:
commit 863bd5f7b91792ab2d39567c206b23b25b661c50
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Thu Aug 23 17:11:52 2012 +0200
convert docx mathml test documents into unittests
There are few small things that do not survive the roundtrip completely
accurately, they should be checked somewhen when there's time. But it's
better to have these as actual tests rather than just documents somewhere.
Change-Id: Ic3732ab8450376820867950438d89e324f391eeb
diff --git a/starmath/qa/testdocuments/README b/starmath/qa/testdocuments/README
deleted file mode 100644
index 416e082..0000000
--- a/starmath/qa/testdocuments/README
+++ /dev/null
@@ -1,2 +0,0 @@
-You can find test documents here for DOCX. RTF test documents are at
-sw/qa/extras/rtfexport/data/math-*.rtf.
diff --git a/starmath/qa/testdocuments/docx/accents.docx
b/starmath/qa/testdocuments/docx/accents.docx
deleted file mode 100644
index b623cb5..0000000
Binary files a/starmath/qa/testdocuments/docx/accents.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/d.docx
b/starmath/qa/testdocuments/docx/d.docx
deleted file mode 100644
index a18afdd..0000000
Binary files a/starmath/qa/testdocuments/docx/d.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/escaping.docx
b/starmath/qa/testdocuments/docx/escaping.docx
deleted file mode 100644
index d51c475..0000000
Binary files a/starmath/qa/testdocuments/docx/escaping.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/lim.docx
b/starmath/qa/testdocuments/docx/lim.docx
deleted file mode 100644
index 6adb548..0000000
Binary files a/starmath/qa/testdocuments/docx/lim.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/malformed_xml.docx
b/starmath/qa/testdocuments/docx/malformed_xml.docx
deleted file mode 100644
index 53d64b0..0000000
Binary files a/starmath/qa/testdocuments/docx/malformed_xml.docx and /dev/null
differ
diff --git a/starmath/qa/testdocuments/docx/matrix.docx
b/starmath/qa/testdocuments/docx/matrix.docx
deleted file mode 100644
index d6b5b18..0000000
Binary files a/starmath/qa/testdocuments/docx/matrix.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/mso2k7.docx
b/starmath/qa/testdocuments/docx/mso2k7.docx
deleted file mode 100644
index b6b16ef..0000000
Binary files a/starmath/qa/testdocuments/docx/mso2k7.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/nary.docx
b/starmath/qa/testdocuments/docx/nary.docx
deleted file mode 100644
index f3bb781..0000000
Binary files a/starmath/qa/testdocuments/docx/nary.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/overbrace_underbrace.docx
b/starmath/qa/testdocuments/docx/overbrace_underbrace.docx
deleted file mode 100644
index e4119f6..0000000
Binary files a/starmath/qa/testdocuments/docx/overbrace_underbrace.docx and
/dev/null differ
diff --git a/starmath/qa/testdocuments/docx/overstrike.docx
b/starmath/qa/testdocuments/docx/overstrike.docx
deleted file mode 100644
index 9809edc..0000000
Binary files a/starmath/qa/testdocuments/docx/overstrike.docx and /dev/null
differ
diff --git a/starmath/qa/testdocuments/docx/placeholders.docx
b/starmath/qa/testdocuments/docx/placeholders.docx
deleted file mode 100644
index 1c32c04..0000000
Binary files a/starmath/qa/testdocuments/docx/placeholders.docx and /dev/null
differ
diff --git a/starmath/qa/testdocuments/docx/rad.docx
b/starmath/qa/testdocuments/docx/rad.docx
deleted file mode 100644
index 39194dc..0000000
Binary files a/starmath/qa/testdocuments/docx/rad.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/subscripts.docx
b/starmath/qa/testdocuments/docx/subscripts.docx
deleted file mode 100644
index 038925f..0000000
Binary files a/starmath/qa/testdocuments/docx/subscripts.docx and /dev/null
differ
diff --git a/starmath/qa/testdocuments/docx/vertical_stacks.docx
b/starmath/qa/testdocuments/docx/vertical_stacks.docx
deleted file mode 100644
index 50dfab0..0000000
Binary files a/starmath/qa/testdocuments/docx/vertical_stacks.docx and
/dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-accents.docx
b/sw/qa/extras/ooxmlexport/data/math-accents.docx
new file mode 100644
index 0000000..b623cb5
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-accents.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-d.docx
b/sw/qa/extras/ooxmlexport/data/math-d.docx
new file mode 100644
index 0000000..a18afdd
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-d.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-escaping.docx
b/sw/qa/extras/ooxmlexport/data/math-escaping.docx
new file mode 100644
index 0000000..d51c475
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-escaping.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-lim.docx
b/sw/qa/extras/ooxmlexport/data/math-lim.docx
new file mode 100644
index 0000000..6adb548
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-lim.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx
b/sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx
new file mode 100644
index 0000000..53d64b0
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-matrix.docx
b/sw/qa/extras/ooxmlexport/data/math-matrix.docx
new file mode 100644
index 0000000..d6b5b18
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-matrix.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-mso2k7.docx
b/sw/qa/extras/ooxmlexport/data/math-mso2k7.docx
new file mode 100644
index 0000000..b6b16ef
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-mso2k7.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-nary.docx
b/sw/qa/extras/ooxmlexport/data/math-nary.docx
new file mode 100644
index 0000000..f3bb781
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-nary.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-overbrace_underbrace.docx
b/sw/qa/extras/ooxmlexport/data/math-overbrace_underbrace.docx
new file mode 100644
index 0000000..e4119f6
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/math-overbrace_underbrace.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-overstrike.docx
b/sw/qa/extras/ooxmlexport/data/math-overstrike.docx
new file mode 100644
index 0000000..9809edc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-overstrike.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-placeholders.docx
b/sw/qa/extras/ooxmlexport/data/math-placeholders.docx
new file mode 100644
index 0000000..1c32c04
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/math-placeholders.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-rad.docx
b/sw/qa/extras/ooxmlexport/data/math-rad.docx
new file mode 100644
index 0000000..39194dc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-rad.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-subscripts.docx
b/sw/qa/extras/ooxmlexport/data/math-subscripts.docx
new file mode 100644
index 0000000..038925f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/math-subscripts.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/math-vertical_stacks.docx
b/sw/qa/extras/ooxmlexport/data/math-vertical_stacks.docx
new file mode 100644
index 0000000..50dfab0
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/math-vertical_stacks.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 076eedc..47246f8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -43,6 +43,20 @@ public:
void testFdo38244();
void testMathEscape();
void testFdo51034();
+ void testMathAccents();
+ void testMathD();
+ void testMathEscaping();
+ void testMathLim();
+ void testMathMalformedXml();
+ void testMathMatrix();
+ void testMathMso2k7();
+ void testMathNary();
+ void testMathOverbraceUnderbrace();
+ void testMathOverstrike();
+ void testMathPlaceholders();
+ void testMathRad();
+ void testMathSubscripts();
+ void testMathVerticalStacks();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -51,6 +65,20 @@ public:
CPPUNIT_TEST(testFdo38244);
CPPUNIT_TEST(testMathEscape);
CPPUNIT_TEST(testFdo51034);
+ CPPUNIT_TEST(testMathAccents);
+ CPPUNIT_TEST(testMathD);
+ CPPUNIT_TEST(testMathEscaping);
+ CPPUNIT_TEST(testMathLim);
+ CPPUNIT_TEST(testMathMalformedXml);
+ CPPUNIT_TEST(testMathMatrix);
+ CPPUNIT_TEST(testMathMso2k7);
+ CPPUNIT_TEST(testMathNary);
+ CPPUNIT_TEST(testMathOverbraceUnderbrace);
+ CPPUNIT_TEST(testMathOverstrike);
+ CPPUNIT_TEST(testMathPlaceholders);
+ CPPUNIT_TEST(testMathRad);
+ CPPUNIT_TEST(testMathSubscripts);
+ CPPUNIT_TEST(testMathVerticalStacks);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -178,6 +206,150 @@ void Test::testFdo51034()
CPPUNIT_ASSERT_EQUAL(OUString("http://Www.google.com/#a";),
getProperty<OUString>(getRun(getParagraph(1), 1), "HyperLinkURL"));
}
+// Construct the expected formula from UTF8, as there may be such characters.
+// Remove all spaces, as LO export/import may change that.
+// Replace symbol - (i.e. U+2212) with ASCII - , LO does this change and it
shouldn't matter.
+#define CHECK_FORMULA( expected, actual ) \
+ CPPUNIT_ASSERT_EQUAL( \
+ OUString( expected, strlen( expected ), RTL_TEXTENCODING_UTF8 ) \
+ .replaceAll( " ", "" ).replaceAll( OUString( "â", strlen( "â"
), RTL_TEXTENCODING_UTF8 ), "-" ), \
+ OUString( actual ).replaceAll( " ", "" ).replaceAll( OUString( "â",
strlen( "â" ), RTL_TEXTENCODING_UTF8 ), "-" ))
+
+void Test::testMathAccents()
+{
+ roundtrip( "math-accents.docx" );
+ CHECK_FORMULA(
+ "acute {a} grave {a} check {a} breve {a} circle {a} widevec {a}
widetilde {a}"
+ " widehat {a} dot {a} widevec {a} widevec {a} widetilde {a}
underline {a}",
+ getFormula( getRun( getParagraph( 1 ), 1 )));
+}
+
+void Test::testMathD()
+{
+ roundtrip( "math-d.docx" );
+ CHECK_FORMULA( "left (x mline y mline z right )", getFormula( getRun(
getParagraph( 1 ), 1 )));
+ CHECK_FORMULA( "left (1 right )", getFormula( getRun( getParagraph( 1 ), 2
)));
+ CHECK_FORMULA( "left [2 right ]", getFormula( getRun( getParagraph( 1 ), 3
)));
+ CHECK_FORMULA( "left ldbracket 3 right rdbracket", getFormula( getRun(
getParagraph( 1 ), 4 )));
+ CHECK_FORMULA( "left lline 4 right rline", getFormula( getRun(
getParagraph( 1 ), 5 )));
+ CHECK_FORMULA( "left ldline 5 right rdline", getFormula( getRun(
getParagraph( 1 ), 6 )));
+ CHECK_FORMULA( "left langle 6 right rangle", getFormula( getRun(
getParagraph( 1 ), 7 )));
+ CHECK_FORMULA( "left langle a mline b right rangle", getFormula( getRun(
getParagraph( 1 ), 8 )));
+ CHECK_FORMULA( "left ({x} over {y} right )", getFormula( getRun(
getParagraph( 1 ), 9 )));
+}
+
+void Test::testMathEscaping()
+{
+ roundtrip( "math-escaping.docx" );
+ CHECK_FORMULA( "â â < x < â", getFormula( getRun( getParagraph( 1 ),
1 )));
+}
+
+void Test::testMathLim()
+{
+ roundtrip( "math-lim.docx" );
+ CHECK_FORMULA( "lim from {x â 1} {x}", getFormula( getRun( getParagraph(
1 ), 1 )));
+}
+
+void Test::testMathMalformedXml()
+{
+ roundtrip( "math-malformed_xml.docx" );
+ CPPUNIT_ASSERT_EQUAL( 0, getLength());
+}
+
+void Test::testMathMatrix()
+{
+ roundtrip( "math-matrix.docx" );
+ CHECK_FORMULA( "left [matrix {1 # 2 ## 3 # 4} right ]", getFormula(
getRun( getParagraph( 1 ), 1 )));
+}
+
+void Test::testMathMso2k7()
+{
+ roundtrip( "math-mso2k7.docx" );
+ CHECK_FORMULA( "A = Ï {r} ^ {2}", getFormula( getRun( getParagraph( 1 ),
1 )));
+// TODO check the stack/binom difference
+// CHECK_FORMULA( "{left (x+a right )} ^ {n} = sum from {k=0} to {n} {left
(binom {n} {k} right ) {x} ^ {k} {a} ^ {n-k}}",
+ CHECK_FORMULA( "{left (x+a right )} ^ {n} = sum from {k=0} to {n} {left
(stack {n # k} right ) {x} ^ {k} {a} ^ {n-k}}",
+ getFormula( getRun( getParagraph( 2 ), 1 )));
+ CHECK_FORMULA( "{left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left
(n-1 right ) {x} ^ {2}} over {2!} +â¦",
+ getFormula( getRun( getParagraph( 3 ), 1 )));
+// TODO check (cos/sin miss {})
+// CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to
{â} {left ({a} rsub {n} cos {{nÏx} over {L}} + {b} rsub {n} sin {{nÏx} over
{L}} right )}",
+ CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to {â}
{left ({a} rsub {n} cos {nÏx} over {L} + {b} rsub {n} sin {nÏx} over {L}
right )}",
+ getFormula( getRun( getParagraph( 4 ), 1 )));
+ CHECK_FORMULA( "{a} ^ {2} + {b} ^ {2} = {c} ^ {2}", getFormula( getRun(
getParagraph( 5 ), 1 )));
+ CHECK_FORMULA( "x = {- b ± sqrt {{b} ^ {2} -4 ac}} over {2 a}",
+ getFormula( getRun( getParagraph( 6 ), 1 )));
+ CHECK_FORMULA(
+ "{e} ^ {x} =1+ {x} over {1!} + {{x} ^ {2}} over {2!} + {{x} ^ {3}}
over {3!} +â¦, -â<x<â",
+ getFormula( getRun( getParagraph( 7 ), 1 )));
+ CHECK_FORMULA(
+// "sin {α} ± sin {β} =2 sin {{1} over {2} left (α±β right )} cos
{{1} over {2} left (αâβ right )}",
+// TODO check (cos/in miss {})
+ "sin α ± sin β =2 sin {1} over {2} left (α±β right ) cos {1}
over {2} left (αâβ right )",
+ getFormula( getRun( getParagraph( 8 ), 1 )));
+ CHECK_FORMULA(
+// "cos {α} + cos {β} =2 cos {{1} over {2} left (α+β right )} cos
{{1} over {2} left (α-β right )}",
+// TODO check (cos/sin miss {})
+ "cos α + cos β =2 cos {1} over {2} left (α+β right ) cos {1} over
{2} left (α-β right )",
+ getFormula( getRun( getParagraph( 9 ), 1 )));
+}
+
+void Test::testMathNary()
+{
+ roundtrip( "math-nary.docx" );
+ CHECK_FORMULA( "lllint from {1} to {2} {x + 1}", getFormula( getRun(
getParagraph( 1 ), 1 )));
+ CHECK_FORMULA( "prod from {a} {b}", getFormula( getRun( getParagraph( 1 ),
2 )));
+ CHECK_FORMULA( "sum to {2} {x}", getFormula( getRun( getParagraph( 1 ), 3
)));
+}
+
+void Test::testMathOverbraceUnderbrace()
+{
+ roundtrip( "math-overbrace_underbrace.docx" );
+ CHECK_FORMULA( "{abcd} overbrace {4}", getFormula( getRun( getParagraph( 1
), 1 )));
+ CHECK_FORMULA( "{xyz} underbrace {3}", getFormula( getRun( getParagraph( 2
), 1 )));
+}
+
+void Test::testMathOverstrike()
+{
+ roundtrip( "math-overstrike.docx" );
+ CHECK_FORMULA( "overstrike {abc}", getFormula( getRun( getParagraph( 1 ),
1 )));
+}
+
+void Test::testMathPlaceholders()
+{
+ roundtrip( "math-placeholders.docx" );
+ CHECK_FORMULA( "sum from <?> to <?> <?>", getFormula( getRun(
getParagraph( 1 ), 1 )));
+}
+
+void Test::testMathRad()
+{
+ roundtrip( "math-rad.docx" );
+ CHECK_FORMULA( "sqrt {4}", getFormula( getRun( getParagraph( 1 ), 1 )));
+ CHECK_FORMULA( "nroot {3} {x + 1}", getFormula( getRun( getParagraph( 1 ),
2 )));
+}
+
+void Test::testMathSubscripts()
+{
+ roundtrip( "math-subscripts.docx" );
+ CHECK_FORMULA( "{x} ^ {y} + {e} ^ {x}", getFormula( getRun( getParagraph(
1 ), 1 )));
+ CHECK_FORMULA( "{x} ^ {b}", getFormula( getRun( getParagraph( 1 ), 2 )));
+ CHECK_FORMULA( "{x} rsub {b}", getFormula( getRun( getParagraph( 1 ), 3
)));
+ CHECK_FORMULA( "{a} rsub {c} rsup {b}", getFormula( getRun( getParagraph(
1 ), 4 )));
+ CHECK_FORMULA( "{x} lsub {2} lsup {1}", getFormula( getRun( getParagraph(
1 ), 5 )));
+ CHECK_FORMULA( "{{x csup {6} csub {3}} lsub {4} lsup {5}} rsub {2} rsup
{1}",
+ getFormula( getRun( getParagraph( 1 ), 6 )));
+}
+
+void Test::testMathVerticalStacks()
+{
+ roundtrip( "math-vertical_stacks.docx" );
+ CHECK_FORMULA( "{a} over {b}", getFormula( getRun( getParagraph( 1 ), 1
)));
+ CHECK_FORMULA( "{a} / {b}", getFormula( getRun( getParagraph( 2 ), 1 )));
+// TODO check these
+// CHECK_FORMULA( "binom {a} {b}", getFormula( getRun( getParagraph( 3 ), 1
)));
+// CHECK_FORMULA( "binom {a} {binom {b} {c}}", getFormula( getRun(
getParagraph( 4 ), 1 )));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
