diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-17 16:43:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-17 16:43:19 +0100 |
| commit | a2d7a4dea3affb2b860d0979e3eafe362865e7ca (patch) | |
| tree | 8722c1382505a14546f0bb3be24a96a051c49722 /sw/qa | |
| parent | 660b629785ec5386c3efc150d62a6794a58bf7f5 (diff) | |
make it easy to dump undetermined pass/fail files in for testing
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/core/filters-test.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index 75262f70cdbf..6a2d611bc5c2 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -65,6 +65,8 @@ SO2_DECL_REF(SwDocShell) SO2_IMPL_REF(SwDocShell) +const int indeterminate = 2; + using namespace ::com::sun::star; /* Implementation of Filters test */ @@ -78,7 +80,7 @@ public: virtual void setUp(); virtual void tearDown(); - void recursiveScan(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, bool bExpected); + void recursiveScan(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, int nExpected); bool load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData); bool testLoad(const rtl::OUString &rFilter, @@ -115,7 +117,7 @@ bool FiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, return xDocShRef->DoLoad(&aSrcMed); } -void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, bool bExpected) +void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, int nExpected) { osl::Directory aDir(rURL); @@ -127,7 +129,7 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin aItem.getFileStatus(aFileStatus); rtl::OUString sURL = aFileStatus.getFileURL(); if (aFileStatus.getFileType() == osl::FileStatus::Directory) - recursiveScan(rFilter, sURL, rUserData, bExpected); + recursiveScan(rFilter, sURL, rUserData, nExpected); else { sal_Int32 nGitIndex = sURL.lastIndexOfAsciiL( @@ -138,7 +140,12 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin bool bRes = load(rFilter, sURL, rUserData); rtl::OString aRes(rtl::OUStringToOString(sURL, osl_getThreadTextEncoding())); - CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == bExpected); + if (nExpected == indeterminate) + { + printf("indeterminate pass/fail %s was %d\n", aRes.getStr(), bRes); + continue; + } + CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == nExpected); } } CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.close()); @@ -176,6 +183,8 @@ void FiltersTest::testCVEs() recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Word 97")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/clone/writer/sw/qa/core/data/ww8/fail")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CWW8")), false); + recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Word 97")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/clone/writer/sw/qa/core/data/ww8/indeterminate")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CWW8")), indeterminate); + #endif } |