diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-14 11:31:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-14 11:50:25 +0200 |
| commit | f7b86315078f4fcdf7b6a6295abdfba2378f3601 (patch) | |
| tree | b90a62012294600d908fd90169b3e4af5a13adfd | |
| parent | 7c7958ef455d09a0c02683519fb766696904a103 (diff) | |
CppunitTest_sw_odfimport: allow running a single test only
Change-Id: I6dac6c98cd60955cf54e9e8554691566d29a34f1
| -rw-r--r-- | sw/qa/extras/inc/swmodeltestbase.hxx | 3 | ||||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index ace74f6cc8cb..8048b8c6ecc9 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -91,6 +91,7 @@ using namespace css; #define DECLARE_OOXMLEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) #define DECLARE_RTFIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) #define DECLARE_RTFEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) +#define DECLARE_ODFIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) // For testing during development of a test, you want to use // DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0 @@ -100,12 +101,14 @@ using namespace css; #define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) #define DECLARE_RTFIMPORT_TEST_ONLY(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) #define DECLARE_RTFEXPORT_TEST_ONLY(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) +#define DECLARE_ODFIMPORT_TEST_ONLY(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) #undef DECLARE_OOXMLEXPORT_TEST #define DECLARE_OOXMLIMPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #define DECLARE_RTFIMPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #define DECLARE_RTFEXPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() +#define DECLARE_ODFIMPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #endif #define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \ diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index bb6ee13f7b34..18de66814496 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -33,8 +33,6 @@ class Test : public SwModelTestBase Test() : SwModelTestBase("/sw/qa/extras/odfimport/data/", "writer8") {} }; -#define DECLARE_ODFIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) - DECLARE_ODFIMPORT_TEST(testEmptySvgFamilyName, "empty-svg-family-name.odt") { // .odt import did crash on the empty font list (which I think is valid according SVG spec) |