summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-12-04 22:57:32 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-12-04 23:01:38 +0000
commit3a57ade8bf9d44d13317237dcc8345eb522e80b4 (patch)
tree350a533f94a9584395b95f9fdc80dfe3f6af0ef2 /dev-java
parentsys-apps/kmod: version bump (diff)
downloadgentoo-3a57ade8bf9d44d13317237dcc8345eb522e80b4.tar.gz
gentoo-3a57ade8bf9d44d13317237dcc8345eb522e80b4.tar.bz2
gentoo-3a57ade8bf9d44d13317237dcc8345eb522e80b4.zip
dev-java/stringtemplate: Rewrite, EAPI bump, test fixes wrt bug #405057
Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/stringtemplate/files/3.2.1-test-fixes.patch53
-rw-r--r--dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild62
2 files changed, 115 insertions, 0 deletions
diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
new file mode 100644
index 000000000000..fd625abd0668
--- /dev/null
+++ b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
@@ -0,0 +1,53 @@
+https://github.com/antlr/stringtemplate3/pull/3
+
+--- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig 2015-09-18 22:04:18.131902875 +0100
++++ test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 22:04:21.651848456 +0100
+@@ -36,6 +36,10 @@
+ import java.text.SimpleDateFormat;
+ import java.util.*;
+
++import org.junit.FixMethodOrder;
++import org.junit.runners.MethodSorters;
++
++@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+ public class TestStringTemplate extends TestCase {
+ static final String newline = System.getProperty("line.separator");
+
+@@ -87,7 +91,7 @@
+ assertEquals(expecting,I.toString());
+ }
+
+- public void testNoGroupLoader() throws Exception {
++ public void testAaaNoGroupLoader() throws Exception {
+ // this also tests the group loader
+ StringTemplateErrorListener errors = new ErrorBuffer();
+ String tmpdir = System.getProperty("java.io.tmpdir");
+@@ -2214,8 +2218,12 @@
+ s.add("2");
+ s.add("3");
+ st.setAttribute("items", s);
+- expecting = "<li>3</li><li>2</li><li>1</li>";
+- assertEquals(expecting, st.toString());
++ String[] split = st.toString().split("(</?li>){1,2}");
++ Arrays.sort(split);
++ assertEquals("", split[0]);
++ assertEquals("1", split[1]);
++ assertEquals("2", split[2]);
++ assertEquals("3", split[3]);
+ }
+
+ public void testDumpMapAndSet() throws Exception {
+@@ -2235,8 +2243,11 @@
+ s.add("2");
+ s.add("3");
+ st.setAttribute("items", s);
+- expecting = "3,2,1";
+- assertEquals(expecting, st.toString());
++ String[] split = st.toString().split(",");
++ Arrays.sort(split);
++ assertEquals("1", split[0]);
++ assertEquals("2", split[1]);
++ assertEquals("3", split[2]);
+ }
+
+ public class Connector3 {
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..1179a5b450f4
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/"
+SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( >=dev-java/junit-4.11:4 )"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="antlr"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ # https://github.com/antlr/stringtemplate3/pull/3
+ epatch "${FILESDIR}/${PV}-test-fixes.patch"
+
+ java-pkg_clean
+}
+
+src_compile() {
+ local G; for G in action template angle.bracket.template eval group interface; do # from build.xml
+ antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
+ done
+
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc {CHANGES,README}.txt
+}
+
+src_test() {
+ cd test || die
+ local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+ local TESTS=$(find * -name "Test*.java")
+ TESTS="${TESTS//.java}"
+ TESTS="${TESTS//\//.}"
+
+ ejavac -classpath "${CP}" $(find -name "*.java")
+ ejunit4 -classpath "${CP}" ${TESTS}
+}