From a2a5f2b8d69d2b9b73f12de88eb1972641a97046 Mon Sep 17 00:00:00 2001
From: Fabian Köster <koesterreich@fastmail.fm>
Date: Wed, 27 Mar 2013 15:24:13 +0100
Subject: Improve spiffy ebuild after review from Gentoo devs

---
 dev-java/spiffy/spiffy-0.05.ebuild | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'dev-java/spiffy/spiffy-0.05.ebuild')

diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild
index 4d8313a..90fc9e1 100644
--- a/dev-java/spiffy/spiffy-0.05.ebuild
+++ b/dev-java/spiffy/spiffy-0.05.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-pkg-simple
+inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A collection of often used helper methods and utility classes used in industry"
 HOMEPAGE="http://spiffyframework.sourceforge.net/"
@@ -22,19 +22,33 @@ COMMON_DEPS="dev-java/log4j"
 DEPEND="${COMMON_DEPS}
 	app-arch/unzip
 	dev-java/junit:4
-	dev-java/struts
+	dev-java/struts:1.2
 	>=virtual/jdk-1.5"
 RDEPEND="${COMMON_DEPS}
 	>=virtual/jre-1.5"
 
+JAVA_SRC_DIR="src"
 JAVA_GENTOO_CLASSPATH="junit-4,log4j,struts-1.2"
 
 src_unpack() {
 	unpack ${A}
-	rm -v ${PN}-all-${PV}.jar || die
-	rm -v ${PN}-with_source-all-${PV}.jar || die
-	rm -v ${PN}-all-${PV}-javadoc.zip || die
-	cd "${S}"
-	unzip ${PN}-all-${PV}-source.zip
-	rm ${PN}-all-${PV}-source.zip
+	rm -v ${PN}-all-${PV}.jar ${PN}-with_source-all-${PV}.jar ${PN}-all-${PV}-javadoc.zip || die
+	unpack ./${PN}-all-${PV}-source.zip
+	rm -v ${PN}-all-${PV}-source.zip || die
+}
+
+src_test() {
+	JAVA_SRC_DIR="test" \
+	JAVA_CLASSPATH_EXTRA="${PN}.jar" \
+	PN="${PN}-test" \
+	java-pkg-simple_src_compile
+
+	ejunit4 -cp "${PN}.jar:${PN}-test.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" \
+	spiffy.core.lang.StringHelperTest \
+	spiffy.core.util.CollectionHelperTest \
+	spiffy.core.util.HashMapBuilderTest \
+	spiffy.core.util.PushBackIteratorTest \
+	spiffy.core.util.ThreeDHashMapTest \
+	spiffy.core.util.TwoDHashMapTest \
+	spiffy.junit.AssertHelperTest
 }
-- 
cgit v1.2.3-65-gdbad