summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-05-22 19:32:19 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-05-22 19:52:27 +0200
commit8e2b894c30f90c577857a16bab13e45f867bf36e (patch)
tree4d75d956693cd82fef7ad34d0c7a4444fd4b5787
parent8acb6155c310ac19827f97227c8e45753fcef7e6 (diff)
fdo#76101 move testcase to CppunitTest_sw_ooxmlsdrexport
The motivation is that this test takes time to execute (and we're testing a limit here, so it's not easy to speed it up), though moving it out of CppunitTest_sw_ooxmlexport is still possible (which is the current critical path during a toplevel 'make'). Change-Id: Ibe6580f8aea1439f4feb281996f2f4bbd46ff4ce
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx10
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx10
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 562541da1184..e348ccd0860c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3091,16 +3091,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76248, "FDO76248.docx")
assertXPath(pXmlDoc, "//a:graphicData[not(*)]", 0);
}
-DECLARE_OOXMLEXPORT_TEST(testFdo76101, "fdo76101.docx")
-{
- xmlDocPtr pXmlDoc = parseExport("word/styles.xml");
-
- if (!pXmlDoc)
- return;
- xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, "/w:styles/w:style");
- CPPUNIT_ASSERT(4091 >= xmlXPathNodeSetGetLength(pXmlNodes));
-}
-
DECLARE_OOXMLEXPORT_TEST(testFDO76163 , "fdo76163.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 2dde9d120825..9c492162068b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1414,6 +1414,16 @@ DECLARE_OOXMLEXPORT_TEST(testPresetShape, "preset-shape.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(21600), aSubViewSize[0].Height);
}
+DECLARE_OOXMLEXPORT_TEST(testFdo76101, "fdo76101.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/styles.xml");
+
+ if (!pXmlDoc)
+ return;
+ xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, "/w:styles/w:style");
+ CPPUNIT_ASSERT(4091 >= xmlXPathNodeSetGetLength(pXmlNodes));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();