diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-19 15:50:09 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-04-19 15:51:01 +0200 |
| commit | 126e58925be1fa76008e5eaebaa8c6893bde879a (patch) | |
| tree | ba624051fe1791a4718bd6724ab224729ba4f616 /sc | |
| parent | 44481da569df85aa91455fdc2892a4e0c5818e6c (diff) | |
Revert "move testCVE into slowcheck"
This reverts commit 97fe16f4dc5582be597971b6e17431b8d353b8ba.
Make Norbert#s tinderbox happy again.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/filters-test.cxx | 21 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 417b842d60dc..de17ced857b0 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -96,6 +96,11 @@ 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(); @@ -112,6 +117,7 @@ public: #endif CPPUNIT_TEST_SUITE(ScFiltersTest); + CPPUNIT_TEST(testCVEs); CPPUNIT_TEST(testRangeNameODS); CPPUNIT_TEST(testContentODS); CPPUNIT_TEST(testContentXLS); @@ -183,6 +189,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()); +} + #if TEST_BUG_FILES void ScFiltersTest::testDir(osl::Directory& rDir, sal_uInt32 nType) diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 8476b85c1542..87697cdc1fd8 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -96,11 +96,6 @@ public: virtual void setUp(); virtual void tearDown(); - /** - * Ensure CVEs remain unbroken - */ - void testCVEs(); - //ods, xls, xlsx filter tests void testRangeNameXLS(); void testRangeNameXLSX(); @@ -127,7 +122,6 @@ public: CPPUNIT_TEST_SUITE(ScFiltersTest); - CPPUNIT_TEST(testCVEs); CPPUNIT_TEST(testRangeNameXLS); CPPUNIT_TEST(testRangeNameXLSX); CPPUNIT_TEST(testFunctionsODS); @@ -234,21 +228,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()); -} - namespace { void testRangeNameImpl(ScDocument* pDoc) |