summaryrefslogtreecommitdiffstats
path: root/sd/qa
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-05-14 11:54:37 +0200
committerJan Holesovsky <kendy@suse.cz>2013-05-14 16:50:47 +0200
commit39ee11db03368a18bc1746a6312307c4cf1b4bdc (patch)
tree35e557e42e14757ba07ea16052cb0f8e1e55ff80 /sd/qa
parentsd unittests: Reorganize the Impress tests to be a bit more focused. (diff)
downloadcore-39ee11db03368a18bc1746a6312307c4cf1b4bdc.tar.gz
core-39ee11db03368a18bc1746a6312307c4cf1b4bdc.zip
sd unittests: Move a smoketest where it belongs.
Change-Id: I495f8698f58a2a4a11999e8e439eddd6a703b321
Diffstat (limited to 'sd/qa')
-rw-r--r--sd/qa/unit/data/smoketest.pptx (renamed from sd/qa/unit/data/a.pptx)bin29956 -> 29956 bytes
-rw-r--r--sd/qa/unit/filters-test.cxx31
-rw-r--r--sd/qa/unit/import-tests.cxx31
3 files changed, 31 insertions, 31 deletions
diff --git a/sd/qa/unit/data/a.pptx b/sd/qa/unit/data/smoketest.pptx
index e0cfe49009c9..e0cfe49009c9 100644
--- a/sd/qa/unit/data/a.pptx
+++ b/sd/qa/unit/data/smoketest.pptx
Binary files differ
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 496fb5038f5e..e51a7770b6ca 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -50,13 +50,11 @@ public:
virtual void setUp();
virtual void tearDown();
- void test();
// Ensure CVEs remain unbroken
void testCVEs();
void testN778859();
CPPUNIT_TEST_SUITE(SdFiltersTest);
- CPPUNIT_TEST(test);
CPPUNIT_TEST(testN778859);
CPPUNIT_TEST(testCVEs);
CPPUNIT_TEST_SUITE_END();
@@ -114,35 +112,6 @@ FileFormat aFileFormats[] = {
return xDocShRef;
}
-void SdFiltersTest::test()
-{
- ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/a.pptx"));
- CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
- CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() );
-
- SdDrawDocument *pDoc = xDocShRef->GetDoc();
- CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
-
- // cf. SdrModel svx/svdmodel.hxx ...
-
- CPPUNIT_ASSERT_MESSAGE( "wrong page count", pDoc->GetPageCount() == 3);
-
- const SdrPage *pPage = pDoc->GetPage (1);
- CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
-
- sal_uIntPtr nObjs = pPage->GetObjCount();
- for (sal_uIntPtr i = 0; i < nObjs; i++)
- {
- SdrObject *pObj = pPage->GetObj(i);
- SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
- SdrTextObj *pTxt = dynamic_cast<SdrTextObj *>( pObj );
- (void)pTxt; (void)eKind;
- }
-
- CPPUNIT_ASSERT_MESSAGE( "changed", !pDoc->IsChanged() );
- xDocShRef->DoClose();
-}
-
void SdFiltersTest::testN778859()
{
::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"));
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 73da840273d3..0906464057b5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -24,10 +24,12 @@ class SdFiltersTest : public SdModelTestBase
{
public:
void testDocumentLayout();
+ void testSmoketest();
void testN759180();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
+ CPPUNIT_TEST(testSmoketest);
CPPUNIT_TEST(testN759180);
CPPUNIT_TEST_SUITE_END();
};
@@ -51,6 +53,35 @@ void SdFiltersTest::testDocumentLayout()
}
}
+void SdFiltersTest::testSmoketest()
+{
+ ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"));
+ CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+ CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() );
+
+ SdDrawDocument *pDoc = xDocShRef->GetDoc();
+ CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+
+ // cf. SdrModel svx/svdmodel.hxx ...
+
+ CPPUNIT_ASSERT_MESSAGE( "wrong page count", pDoc->GetPageCount() == 3);
+
+ const SdrPage *pPage = pDoc->GetPage (1);
+ CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+
+ sal_uIntPtr nObjs = pPage->GetObjCount();
+ for (sal_uIntPtr i = 0; i < nObjs; i++)
+ {
+ SdrObject *pObj = pPage->GetObj(i);
+ SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
+ SdrTextObj *pTxt = dynamic_cast<SdrTextObj *>( pObj );
+ (void)pTxt; (void)eKind;
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "changed", !pDoc->IsChanged() );
+ xDocShRef->DoClose();
+}
+
void SdFiltersTest::testN759180()
{
::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/n759180.pptx"));