Kaydet (Commit) 126df1ee authored tarafından Michael Stahl's avatar Michael Stahl

sw: solve the CheckBookmarks fails on WNT mystery

After many years of careful investigation, we finally managed to solve
the mystery: it turns out that Windows has different line endings than
UNIX, which results in different hash values starting at m_nLinebreakHash.

Change-Id: Ib5fab7cd43ad10ea9a33c29857c5b53c84e623fb
üst 57972554
...@@ -50,6 +50,7 @@ $(eval $(call gb_JunitTest_use_jars,sw_complex,\ ...@@ -50,6 +50,7 @@ $(eval $(call gb_JunitTest_use_jars,sw_complex,\
$(eval $(call gb_JunitTest_add_classes,sw_complex,\ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.accessibility.AccessibleRelationSet \ complex.accessibility.AccessibleRelationSet \
complex.checkColor.CheckChangeColor \ complex.checkColor.CheckChangeColor \
complex.writer.CheckBookmarks \
complex.writer.CheckCrossReferences \ complex.writer.CheckCrossReferences \
complex.writer.CheckFlies \ complex.writer.CheckFlies \
complex.writer.CheckTable \ complex.writer.CheckTable \
...@@ -58,11 +59,4 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ ...@@ -58,11 +59,4 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.writer.TextPortionEnumerationTest \ complex.writer.TextPortionEnumerationTest \
)) ))
# FIXME has never worked on windows, 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: # vim: set noet sw=4 ts=4:
...@@ -72,7 +72,7 @@ class BookmarkHashes { ...@@ -72,7 +72,7 @@ class BookmarkHashes {
xBookmark); xBookmark);
buffer.append(sBookmarkname); buffer.append(sBookmarkname);
buffer.append(':'); buffer.append(':');
buffer.append(xBookmarkAsContent.getAnchor().getString()); buffer.append(xBookmarkAsContent.getAnchor().getString().replaceAll("\r\n", "\n"));
buffer.append(';'); buffer.append(';');
} }
java.security.MessageDigest sha1 = java.security.MessageDigest.getInstance("SHA-1"); java.security.MessageDigest sha1 = java.security.MessageDigest.getInstance("SHA-1");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment