diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-06-06 21:27:52 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-06 21:28:29 +0100 |
commit | cae83eb8b6906bba4abf9b625b84364e5f6e36ca (patch) | |
tree | fa2545c1c9a3fc201b8cee030087c598ed1f564d | |
parent | 483626d8372309d1562a74ce659288f0905b4198 (diff) |
commit id with ccc in it breaks regression test
Change-Id: I1a222fdd5e837a4d0071f8b4d03b80c1d104f235
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 3b7cfcf769b3..11fa7dfc798e 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -229,6 +229,16 @@ void SwUiWriterTest::testExportRTF() aWrt.Write(xWrt); OString aData(static_cast<const sal_Char*>(aStream.GetBuffer()), aStream.GetSize()); + + //Amusingly eventually there was a commit id with "ccc" in it, and so the rtf contained + //{\*\generator LibreOfficeDev/4.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/f70664ccc6837f2cc21a29bb4f44e41e100efe6b} + //so the test fell over. so strip the generator tag + sal_Int32 nGeneratorStart = aData.indexOf("{\\*\\generator "); + CPPUNIT_ASSERT(nGeneratorStart != -1); + sal_Int32 nGeneratorEnd = aData.indexOf('}', nGeneratorStart + 1); + CPPUNIT_ASSERT(nGeneratorEnd != -1); + aData = aData.replaceAt(nGeneratorStart, nGeneratorEnd-nGeneratorStart+1, ""); + CPPUNIT_ASSERT(aData.startsWith("{\\rtf1")); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf("aaa")); CPPUNIT_ASSERT(aData.indexOf("bbb") != -1); |