| 1 |
commit: e4fe58906834d266d47526044e24f43e3b1c3966 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 30 13:50:43 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 13:50:59 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fe5890 |
| 7 |
|
| 8 |
dev-java/htmcleaner: fixed tests |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/htmlcleaner-2.24-fix-tests.patch | 26 ++++++++++++++++++++++ |
| 14 |
dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 9 ++++---- |
| 15 |
2 files changed, 30 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..0e10ccee481 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch |
| 22 |
@@ -0,0 +1,26 @@ |
| 23 |
+diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java |
| 24 |
+index b09c6d6..f4e83f0 100644 |
| 25 |
+--- a/src/test/java/org/htmlcleaner/DomSerializerTest.java |
| 26 |
++++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java |
| 27 |
+@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest { |
| 28 |
+ + "</html>"; |
| 29 |
+ |
| 30 |
+ final String expectedOutput = |
| 31 |
+- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" |
| 32 |
++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" |
| 33 |
+ + "<html>\n" + |
| 34 |
+ " <head/>\n" + |
| 35 |
+ " <body>\n" + |
| 36 |
+diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java |
| 37 |
+index 3e1d1e9..d406c40 100644 |
| 38 |
+--- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java |
| 39 |
++++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java |
| 40 |
+@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest { |
| 41 |
+ + "</html>"; |
| 42 |
+ |
| 43 |
+ final String expectedOutput = |
| 44 |
+- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" |
| 45 |
++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" |
| 46 |
+ + "<html>\n" + |
| 47 |
+ " <head/>\n" + |
| 48 |
+ " <body>\n" + |
| 49 |
|
| 50 |
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild |
| 51 |
index 138bce85abb..72bceb361e0 100644 |
| 52 |
--- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild |
| 53 |
+++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild |
| 54 |
@@ -35,16 +35,15 @@ BDEPEND=" |
| 55 |
JAVA_SRC_DIR="src/main/java" |
| 56 |
JAVA_GENTOO_CLASSPATH="jdom-2" |
| 57 |
|
| 58 |
+PATCHES=( |
| 59 |
+ "${FILESDIR}/${P}-fix-tests.patch" |
| 60 |
+) |
| 61 |
+ |
| 62 |
src_prepare() { |
| 63 |
default |
| 64 |
# Don't require default.xml to be in the current directory. |
| 65 |
sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \ |
| 66 |
src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die |
| 67 |
- |
| 68 |
- sed -i \ |
| 69 |
- -e '/encoding=/s: standalone.*?>:?><html>:' \ |
| 70 |
- -e '/\+ \"<html>/d' \ |
| 71 |
- src/test/java/org/htmlcleaner/{Traversal,}DomSerializerTest.java || die |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
Archives