diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-10-27 00:33:58 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-10-27 00:33:58 +0000 |
| commit | 8b8a21585bbfdf88bfc5b22e9cc587fab567676a (patch) | |
| tree | 69e90d0d84ca0934546d00ace7435e878e5deeea /dev-java/jaxen | |
| parent | Remove plugin depending on masked xmms. Thanks to Jorge Vargas in bug #152936. (diff) | |
| download | gentoo-2-8b8a21585bbfdf88bfc5b22e9cc587fab567676a.tar.gz gentoo-2-8b8a21585bbfdf88bfc5b22e9cc587fab567676a.tar.bz2 gentoo-2-8b8a21585bbfdf88bfc5b22e9cc587fab567676a.zip | |
Correct testcases so they don't require 1.5 JDK API. Fixes bug #152400.
(Portage version: 2.1.2_pre3-r9)
Diffstat (limited to 'dev-java/jaxen')
| -rw-r--r-- | dev-java/jaxen/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch | 20 | ||||
| -rw-r--r-- | dev-java/jaxen/jaxen-1.1_beta11.ebuild | 6 |
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog index 450974e53beb..bf7ba929f52b 100644 --- a/dev-java/jaxen/ChangeLog +++ b/dev-java/jaxen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jaxen # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.29 2006/10/23 07:47:13 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.30 2006/10/27 00:33:58 caster Exp $ + + 27 Oct 2006; Vlastimil Babka <caster@gentoo.org> + +files/jaxen-1.1_beta11-fix-jdk14-tests.patch, jaxen-1.1_beta11.ebuild: + Correct testcases so they don't require 1.5 JDK API. Fixes bug #152400. 23 Oct 2006; Vlastimil Babka <caster@gentoo.org> jaxen-1.1_beta11.ebuild: Added missing junit dependency. diff --git a/dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch b/dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch new file mode 100644 index 000000000000..2138da37518b --- /dev/null +++ b/dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch @@ -0,0 +1,20 @@ +--- src/java/test/org/jaxen/test/SimpleVariableContextTest.java 2006-10-27 02:24:14.000000000 +0200 ++++ src/java/test/org/jaxen/test/SimpleVariableContextTest.java 2006-10-27 02:22:23.000000000 +0200 +@@ -99,7 +99,7 @@ + + // test the result + assertEquals("String Value", copy.getVariableValue("", "", "s")); +- assertEquals(Double.valueOf(3.1415292), copy.getVariableValue("", "", "x")); ++ assertEquals(new Double(3.1415292), copy.getVariableValue("", "", "x")); + assertEquals(Boolean.TRUE, copy.getVariableValue("", "", "b")); + assertEquals("", ""); + +@@ -116,7 +116,7 @@ + + // test the result + assertEquals("String Value", context.getVariableValue("", "", "s")); +- assertEquals(Double.valueOf(3.1415292), context.getVariableValue("", "", "x")); ++ assertEquals(new Double(3.1415292), context.getVariableValue("", "", "x")); + assertEquals(Boolean.TRUE, context.getVariableValue("", "", "b")); + assertEquals("", ""); + diff --git a/dev-java/jaxen/jaxen-1.1_beta11.ebuild b/dev-java/jaxen/jaxen-1.1_beta11.ebuild index 2372f2e14e3c..55d1b82132ce 100644 --- a/dev-java/jaxen/jaxen-1.1_beta11.ebuild +++ b/dev-java/jaxen/jaxen-1.1_beta11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta11.ebuild,v 1.2 2006/10/23 07:47:13 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta11.ebuild,v 1.3 2006/10/27 00:33:58 caster Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -35,6 +35,10 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} + cd ${S} + # TODO file upstream + epatch ${FILESDIR}/${P}-fix-jdk14-tests.patch + mkdir -p ${S}/target/lib cd ${S}/target/lib java-pkg_jar-from xerces-2 |