summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-04-13 17:04:46 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-04-14 11:48:55 +0200
commit97fe16f4dc5582be597971b6e17431b8d353b8ba (patch)
treea7494d8a87ce92296fa15ba0a3076a417762322a
parentdaae05ccf52e37afc41dc1976afcc1f7c6fd978c (diff)
move testCVE into slowcheck
speed up rebuild of sc
-rw-r--r--sc/qa/unit/filters-test.cxx21
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx21
2 files changed, 21 insertions, 21 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index de17ced857b0..417b842d60dc 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/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 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)
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 1d8a8b6b6e32..f2ed04b529f5 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -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)