move testCVE into slowcheck

speed up rebuild of sc
This commit is contained in:
Markus Mohrhard 2012-04-13 17:04:46 +02:00
parent daae05ccf5
commit 97fe16f4dc
2 changed files with 21 additions and 21 deletions

View file

@ -96,11 +96,6 @@ public:
virtual void setUp();
virtual void tearDown();
/**
* Ensure CVEs remain unbroken
*/
void testCVEs();
//ods, xls, xlsx filter tests
void testRangeNameODS(); // only test ods here, xls and xlsx in subsequent_filters-test
void testContentODS();
@ -117,7 +112,6 @@ public:
#endif
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testCVEs);
CPPUNIT_TEST(testRangeNameODS);
CPPUNIT_TEST(testContentODS);
CPPUNIT_TEST(testContentXLS);
@ -189,21 +183,6 @@ void ScFiltersTest::createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rCSVPath = aBuffer.makeStringAndClear();
}
void ScFiltersTest::testCVEs()
{
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")),
getURLFromSrc("/sc/qa/unit/data/qpro/"), rtl::OUString());
//warning, the current "sylk filter" in sc (docsh.cxx) automatically
//chains on failure on trying as csv, rtf, etc. so "success" may
//not indicate that it imported as .slk.
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYLK")),
getURLFromSrc("/sc/qa/unit/data/slk/"), rtl::OUString());
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel 97")),
getURLFromSrc("/sc/qa/unit/data/xls/"), rtl::OUString());
}
#if TEST_BUG_FILES
void ScFiltersTest::testDir(osl::Directory& rDir, sal_uInt32 nType)

View file

@ -93,6 +93,11 @@ public:
virtual void setUp();
virtual void tearDown();
/**
* Ensure CVEs remain unbroken
*/
void testCVEs();
//ods, xls, xlsx filter tests
void testRangeNameXLS();
void testRangeNameXLSX();
@ -115,6 +120,7 @@ public:
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testCVEs);
CPPUNIT_TEST(testRangeNameXLS);
CPPUNIT_TEST(testRangeNameXLSX);
CPPUNIT_TEST(testFunctionsODS);
@ -216,6 +222,21 @@ void ScFiltersTest::createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rCSVPath = aBuffer.makeStringAndClear();
}
void ScFiltersTest::testCVEs()
{
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")),
getURLFromSrc("/sc/qa/unit/data/qpro/"), rtl::OUString());
//warning, the current "sylk filter" in sc (docsh.cxx) automatically
//chains on failure on trying as csv, rtf, etc. so "success" may
//not indicate that it imported as .slk.
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYLK")),
getURLFromSrc("/sc/qa/unit/data/slk/"), rtl::OUString());
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel 97")),
getURLFromSrc("/sc/qa/unit/data/xls/"), rtl::OUString());
}
namespace {
void testRangeNameImpl(ScDocument* pDoc)