From e4fe58906834d266d47526044e24f43e3b1c3966 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Fri, 30 Apr 2021 15:50:43 +0200 Subject: dev-java/htmcleaner: fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc --- .../files/htmlcleaner-2.24-fix-tests.patch | 26 ++++++++++++++++++++++ dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 9 ++++---- 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch new file mode 100644 index 000000000000..0e10ccee4816 --- /dev/null +++ b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java +index b09c6d6..f4e83f0 100644 +--- a/src/test/java/org/htmlcleaner/DomSerializerTest.java ++++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java +@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest { + + ""; + + final String expectedOutput = +- "\n" ++ "" + + "\n" + + " \n" + + " \n" + +diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java +index 3e1d1e9..d406c40 100644 +--- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java ++++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java +@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest { + + ""; + + final String expectedOutput = +- "\n" ++ "" + + "\n" + + " \n" + + " \n" + diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild index 138bce85abb6..72bceb361e04 100644 --- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild +++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild @@ -35,16 +35,15 @@ BDEPEND=" JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH="jdom-2" +PATCHES=( + "${FILESDIR}/${P}-fix-tests.patch" +) + src_prepare() { default # Don't require default.xml to be in the current directory. sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \ src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die - - sed -i \ - -e '/encoding=/s: standalone.*?>:?>:' \ - -e '/\+ \"/d' \ - src/test/java/org/htmlcleaner/{Traversal,}DomSerializerTest.java || die } src_configure() { -- cgit v1.2.3-65-gdbad