From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- dev-java/jdom/Manifest | 3 +- .../files/jdom-2.0.6.1-skip-failing-tests.patch | 248 +++++++++++++++++++++ dev-java/jdom/jdom-2.0.6.1.ebuild | 47 ++-- 3 files changed, 280 insertions(+), 18 deletions(-) create mode 100644 dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch (limited to 'dev-java/jdom') diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest index a6b8e25f5dfb..e62797c7c33a 100644 --- a/dev-java/jdom/Manifest +++ b/dev-java/jdom/Manifest @@ -1,5 +1,6 @@ +AUX jdom-2.0.6.1-skip-failing-tests.patch 8392 BLAKE2B b906e2854f51a534af29fa1d8191ecb53a1cb7f4b390820847f30213db9e58bd4526a20ac4c8763c49382f35fbe67caf12962a720f5edd5e004f9881ee29070f SHA512 bf753bb13b633bbf39d0f55f1a34e273876c2fb7841ab73baa9e03fb1945a61bf19c0aceb6891df6abe8b57cbc81f33773da4fd5e4e3f42b5ace51b666f4ece2 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6 -EBUILD jdom-2.0.6.1.ebuild 2142 BLAKE2B 1a2adb4054650e2f62173cf6843031da74429b76da6b6390c60e4a873561fd626e572da0e87eed65b9c3d78c6224603b0be8772313db151d55b2190dd9e1ad22 SHA512 8758a72cc650a113ebe7e18155315c183513363aaa1abff4d7ee0d55c181901701ca80625b7b8633ee97057ff111dd850eaf3461800983e972cb082c8caabe55 +EBUILD jdom-2.0.6.1.ebuild 2748 BLAKE2B 3e0e6123893a15827ed6202b16387e4403748a33c70132ac0c1edafe6b505046d6fa1896d4cec93dc01d0adb551f1b548e5c2af1c8998c541ff8ac7ef4aa292f SHA512 66ced362fd81ddd13989cac07f6093628ce6166fdfe8f7c6b41fe94376fff4ee5911f7637cf5a43375731674d6410efe0ecfe740e838a45558930293bedf4d46 MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf diff --git a/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch b/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch new file mode 100644 index 000000000000..cb8675153b8a --- /dev/null +++ b/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch @@ -0,0 +1,248 @@ +In order to enable tests we skip ( @Ignore ) several of them which +would otherwise fail, see bug #901743. +--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java ++++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java +@@ -86,6 +86,7 @@ import java.util.List; + + import org.junit.Ignore; + import org.junit.Test; ++import org.junit.Ignore; + import org.xml.sax.Attributes; + import org.xml.sax.DTDHandler; + import org.xml.sax.EntityResolver; +@@ -696,6 +697,7 @@ public final class TestSAXBuilder { + * are added to the DocType + */ + @Test ++ @Ignore + public void test_TCM__void_setExpandEntities_boolean() throws JDOMException, IOException { + //test entity exansion on internal entity + +--- a/test/src/java/org/jdom2/test/cases/output/AbstractTestOutputter.java ++++ b/test/src/java/org/jdom2/test/cases/output/AbstractTestOutputter.java +@@ -6,6 +6,7 @@ import java.util.ArrayList; + import java.util.List; + + import org.junit.Test; ++import org.junit.Ignore; + + import org.jdom2.Attribute; + import org.jdom2.CDATA; +@@ -483,6 +484,7 @@ public abstract class AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testDocTypeSimpleISS() { + DocType content = new DocType("root"); + content.setInternalSubset(""); +@@ -518,6 +520,7 @@ public abstract class AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testDocTypeSystemIDISS() { + DocType content = new DocType("root", "sysid"); + content.setInternalSubset("internal"); +@@ -553,6 +556,7 @@ public abstract class AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testDocTypePublicSystemIDISS() { + DocType content = new DocType("root", "pubid", "sysid"); + content.setInternalSubset("internal"); +@@ -768,6 +772,7 @@ public abstract class AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testOutputElementAttributeNotSpecifiedB() { + String txt = ""; + final Element root = new Element("root"); +@@ -1111,6 +1116,7 @@ public abstract class AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testOutputDocTypeInternalSubset() { + String dec = ""; + DocType dt = new DocType("root"); +@@ -1151,6 +1157,7 @@ public abstract class AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testOutputDocumentOmitEncoding() { + Document doc = new Document(); + doc.addContent(new Element("root")); +--- a/test/src/java/org/jdom2/test/cases/output/AbstractTestRoundTrip.java ++++ b/test/src/java/org/jdom2/test/cases/output/AbstractTestRoundTrip.java +@@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue; + import java.io.IOException; + + import org.junit.Test; ++import org.junit.Ignore; + + import org.jdom2.Document; + import org.jdom2.Element; +@@ -63,6 +64,7 @@ public abstract class AbstractTestRoundTrip { + } + + @Test ++ @Ignore + public void testNamespaces() throws JDOMException, IOException { + final SAXBuilder sb = new SAXBuilder(); + +@@ -72,6 +74,7 @@ public abstract class AbstractTestRoundTrip { + } + + @Test ++ @Ignore + public void testComplex() throws JDOMException, IOException { + final SAXBuilder sb = new SAXBuilder(); + +--- a/test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java ++++ b/test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java +@@ -237,6 +237,7 @@ public final class TestDOMOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void testWithDocType() { + DocType dt = new DocType("root"); + dt.setInternalSubset(""); +--- a/test/src/java/org/jdom2/test/cases/output/TestStAXEventOutputter.java ++++ b/test/src/java/org/jdom2/test/cases/output/TestStAXEventOutputter.java +@@ -347,6 +347,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogatePair() throws XMLStreamException, IOException, JDOMException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -362,6 +363,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogatePairDecimal() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -376,6 +378,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogateAttPair() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -390,6 +393,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogateAttPairDecimal() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -405,6 +409,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter { + + // Construct a raw surrogate pair character and confirm it outputs hex escaped + @Test ++ @Ignore + public void test_RawSurrogatePair() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +--- a/test/src/java/org/jdom2/test/cases/output/TestStAXStreamOutputter.java ++++ b/test/src/java/org/jdom2/test/cases/output/TestStAXStreamOutputter.java +@@ -321,6 +321,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogatePair() throws XMLStreamException, IOException, JDOMException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -337,6 +338,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogatePairDecimal() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -352,6 +354,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogateAttPair() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -367,6 +370,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter { + } + + @Test ++ @Ignore + public void test_HighSurrogateAttPairDecimal() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +@@ -383,6 +387,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter { + + // Construct a raw surrogate pair character and confirm it outputs hex escaped + @Test ++ @Ignore + public void test_RawSurrogatePair() throws JDOMException, IOException, XMLStreamException { + SAXBuilder builder = new SAXBuilder(); + builder.setExpandEntities(true); +--- a/test/src/java/org/jdom2/test/cases/special/TestIssue008ExpandEntity.java ++++ b/test/src/java/org/jdom2/test/cases/special/TestIssue008ExpandEntity.java +@@ -13,6 +13,7 @@ import org.jdom2.output.XMLOutputter; + import org.jdom2.test.util.FidoFetch; + + import org.junit.Test; ++import org.junit.Ignore; + + @SuppressWarnings("javadoc") + public class TestIssue008ExpandEntity { +@@ -53,16 +54,19 @@ public class TestIssue008ExpandEntity { + } + + @Test ++ @Ignore + public void testFalse() { + roundTrip(false, false, null, "−"); + } + + @Test ++ @Ignore + public void testFalseUSASCII() { + roundTrip(false, false, "US-ASCII", "−"); + } + + @Test ++ @Ignore + public void testFalseUTF8() { + roundTrip(false, false, "UTF-8", "−"); + } +@@ -85,16 +89,19 @@ public class TestIssue008ExpandEntity { + + + @Test ++ @Ignore + public void testValidFalse() { + roundTrip(false, true, null, "−"); + } + + @Test ++ @Ignore + public void testValidFalseUSASCII() { + roundTrip(false, true, "US-ASCII", "−"); + } + + @Test ++ @Ignore + public void testValidFalseUTF8() { + roundTrip(false, true, "UTF-8", "−"); + } diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild index 5cbdaa66520d..774430ba8820 100644 --- a/dev-java/jdom/jdom-2.0.6.1.ebuild +++ b/dev-java/jdom/jdom-2.0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,15 +12,12 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java-based solution for accessing, manipulating, and outputting XML data" HOMEPAGE="http://www.jdom.org" SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz" +S="${WORKDIR}/jdom-JDOM-${PV}" LICENSE="Apache-1.1" SLOT="2" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# FAILURES!!! -# Tests run: 1887, Failures: 23 -RESTRICT="test" - CP_DEPEND=" dev-java/iso-relax:0 dev-java/jaxen:1.2 @@ -40,35 +37,51 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}/jdom-JDOM-${PV}" +PATCHES=( "${FILESDIR}/jdom-2.0.6.1-skip-failing-tests.patch" ) -JAVA_TEST_SRC_DIR="test/src/java" -JAVA_TEST_RESOURCE_DIRS="test/src/resources" JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2" +JAVA_TEST_RESOURCE_DIRS="test/src/resources" +JAVA_TEST_SRC_DIR="test/src/java" src_prepare() { - default + java-pkg-2_src_prepare + default # bug #780585 java-pkg_clean + mkdir core/resources || die + cp -r core/{package,resources}/META-INF || die + # Remove Android stuff to avoid junit RDEPEND. rm -vr contrib/src/java/org/jdom2/contrib/android || die - # There are resources in JAVA_TEST_SRC_DIR - cp -r test/src/{java,resources}/org || die - # Remove .java files from JAVA_TEST_RESOURCE_DIRS - find test/src/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" + cd test/src/java || die + # java-pkg-simple.eclass expects test resources in JAVA_TEST_RESOURCE_DIRS + find . -type f ! -name '*.java' \ + | xargs cp --parent -t ../resources || die + + # We skip testDocTypeDocument() from 3 test classes due to test failures, + # see bug #901743. This requires changing also the line endings which would + # lead to huge patches. Hence we do this with sed ( 's/\r$//g' ). + sed \ + -e 's/\r$//g' \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testDocTypeDocument()/i @Ignore' \ + -i org/jdom2/test/cases/input/TestDOMBuilder.java \ + -i org/jdom2/test/cases/input/TestStAXEventBuilder.java \ + -i org/jdom2/test/cases/input/TestStAXStreamBuilder.java || die } src_compile() { - JAVA_SRC_DIR="core/src/java" JAVA_JAR_FILENAME="jdom.jar" + JAVA_RESOURCE_DIRS="core/resources" + JAVA_SRC_DIR="core/src/java" java-pkg-simple_src_compile JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom.jar" rm -rf target || die - JAVA_SRC_DIR="contrib/src/java" - JAVA_RESOURCE_DIRS="contrib/src/resources" JAVA_JAR_FILENAME="jdom-contrib.jar" + JAVA_RESOURCE_DIRS="contrib/src/resources" + JAVA_SRC_DIR="contrib/src/java" java-pkg-simple_src_compile JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar" rm -rf target || die @@ -85,7 +98,7 @@ src_compile() { } src_install() { - default # https://bugs.gentoo.org/789582 + default # install README java-pkg_dojar "jdom.jar" java-pkg_dojar "jdom-contrib.jar" if use doc; then -- cgit v1.2.3