diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-10 11:33:05 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-10 12:02:08 +0100 |
| commit | 650592cf0181e219921d5e6bc3ffe007c95dc192 (patch) | |
| tree | 92dee846d44109326c34471b2103e4a6512bc64c /sw | |
| parent | 54edd57f21519ab283fc1e0fb85b47b0beb59486 (diff) | |
fdo#40819 lp#868229: reenable CheckBookmarks subsequenttest
* MsWord Hash changed from DEV300m41 => behaviour change, possible regression?
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/JunitTest_sw_complex.mk | 13 | ||||
| -rw-r--r-- | sw/qa/complex/writer/CheckBookmarks.java | 8 |
2 files changed, 6 insertions, 15 deletions
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk index 5551577a1747..3c330b65baf3 100644 --- a/sw/JunitTest_sw_complex.mk +++ b/sw/JunitTest_sw_complex.mk @@ -57,6 +57,7 @@ $(eval $(call gb_JunitTest_add_jars,sw_complex,\ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ complex.accessibility.AccessibleRelationSet \ + complex.writer.CheckBookmarks \ complex.checkColor.CheckChangeColor \ complex.writer.CheckCrossReferences \ complex.writer.CheckFlies \ @@ -66,17 +67,5 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ # fd#35657 test disabled - reenable if fixed # complex.writer.TextPortionEnumerationTest \ -# Currently fails on all platforms, as getBookmarksHash in -# sw/qa/complex/writer/CheckBookmarks.java obtains from -# xBookmarks.getElementNames() names like "__UnoMark__1910_1361181355" that -# cause NoSuchElementException, see -# <https://bugs.freedesktop.org/show_bug.cgi?id=40819> "CheckBookmarks fails -# with NoSuchElementException on names __UnoMark__1910_1361181355:" -# # CheckBookmarks currently fails on windows because the hashes are different: -# ifneq ($(OS),WNT) -# $(eval $(call gb_JunitTest_add_classes,sw_complex,\ -# complex.writer.CheckBookmarks \ -# )) -# endif # vim: set noet sw=4 ts=4: diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java index 84bfe15ba045..405ca0d33e59 100644 --- a/sw/qa/complex/writer/CheckBookmarks.java +++ b/sw/qa/complex/writer/CheckBookmarks.java @@ -100,14 +100,16 @@ public class CheckBookmarks { private XTextDocument m_xMsWordReloadedDoc = null; private final BookmarkHashes actualHashes = new BookmarkHashes(); - private BookmarkHashes getDEV300m41Expectations() { + private BookmarkHashes get20111110Expectations() { BookmarkHashes result = new BookmarkHashes(); result.m_nSetupHash = new BigInteger("-4b0706744e8452fe1ae9d5e1c28cf70fb6194795",16); result.m_nInsertRandomHash = new BigInteger("25aa0fad3f4881832dcdfe658ec2efa8a1a02bc5",16); result.m_nDeleteRandomHash = new BigInteger("-3ec87e810b46d734677c351ad893bbbf9ea10f55",16); result.m_nLinebreakHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16); result.m_nOdfReloadHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16); - result.m_nMsWordReloadHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16); + // MsWord Hash changed from DEV300m41 => behaviour change, possible regression? + // result.m_nMsWordReloadHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16); + result.m_nMsWordReloadHash = new BigInteger("-53193413016049203700369483764549874348805475606",10); return result; } @@ -116,7 +118,7 @@ public class CheckBookmarks { com.sun.star.io.IOException, java.security.NoSuchAlgorithmException { - actualHashes.assertExpectation(getDEV300m41Expectations()); + actualHashes.assertExpectation(get20111110Expectations()); } @Before public void setUpDocuments() throws Exception { |