[libcommons-net-java] 14/31: * Team upload. * Enablement of JUnit test suite (LP: #876413) (Closes: #646089): - d/build.properties: enable test suite execution. - d/control: Added junit to B-D's to support testing. - d/rules: Added ant-junit and junit to DEB_JARS to support testing. - d/maven-build.xml: Exclude tests that require network access, fail build when tests fail. * d/control: Bumped Standards-Version: 3.9.2, no changes

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libcommons-net-java.

commit a42f724ba47768cc038e197c9ee9ca895cd27a70
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue May 29 23:28:31 2012 +0000

    * Team upload.
    * Enablement of JUnit test suite (LP: #876413) (Closes: #646089):
      - d/build.properties: enable test suite execution.
      - d/control: Added junit to B-D's to support testing.
      - d/rules: Added ant-junit and junit to DEB_JARS to support testing.
      - d/maven-build.xml: Exclude tests that require network access, fail
        build when tests fail.
    * d/control: Bumped Standards-Version: 3.9.2, no changes
---
 debian/build.properties |  3 +--
 debian/changelog        | 17 +++++++++++++++++
 debian/control          |  4 ++--
 debian/maven-build.xml  |  4 +++-
 debian/rules            |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 30b9e40..e6f0afc 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -1,5 +1,4 @@
 javadoc.dir=build/docs/api
-maven.test.skip=true
+#maven.test.skip=true
 build.javaVersion=1.5
 manifest=debian/tmp/MANIFEST.MF
-
diff --git a/debian/changelog b/debian/changelog
index a21d8be..83c2097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libcommons-net2-java (2.2-2) unstable; urgency=low
+
+  * Team upload.
+
+  [ James Page ]
+  * Enablement of JUnit test suite (LP: #876413) (Closes: #646089):
+    - d/build.properties: enable test suite execution.
+    - d/control: Added junit to B-D's to support testing.
+    - d/rules: Added ant-junit and junit to DEB_JARS to support testing.
+    - d/maven-build.xml: Exclude tests that require network access, fail 
+      build when tests fail.
+
+  [ Damien Raude-Morvan ]
+  * d/control: Bumped Standards-Version: 3.9.2, no changes
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 May 2012 01:17:01 +0200
+
 libcommons-net2-java (2.2-1) unstable; urgency=low
 
   [ Niels Thykier ]
diff --git a/debian/control b/debian/control
index e0e6340..f050b06 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc
-Standards-Version: 3.9.1
+Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc, junit
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-net2-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-net2-java/
 Homepage: http://commons.apache.org/net/
diff --git a/debian/maven-build.xml b/debian/maven-build.xml
index 9ffcec6..49d9801 100644
--- a/debian/maven-build.xml
+++ b/debian/maven-build.xml
@@ -320,7 +320,7 @@
 
     <target name="test" depends="test-compile" unless="maven.test.skip">
         <mkdir dir="${build.directory}/test-output"/>
-        <junit printsummary="yes" haltonfailure="no"> <!--  fork="yes" forkmode="once" -->
+        <junit printsummary="yes" haltonfailure="yes"> <!--  fork="yes" forkmode="once" -->
             <sysproperty key="basedir" value="${basedir}"/>
             <classpath>
                 <pathelement path="${classpath.full.test}"/>
@@ -331,6 +331,8 @@
                 <fileset dir="${build.testSourceDirectory}">
                     <include name="**/*Test.java"/>
                     <exclude name="**/Abstract*"/>
+                    <exclude name="**/*FunctionalTest.java"/>
+                    <exclude name="**/POP3*"/>
                     <exclude name="${maven.test.exclude}"/>
                 </fileset>
             </batchtest>
diff --git a/debian/rules b/debian/rules
index ef2e889..bf6ca69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps
+DEB_JARS             := ant-nodeps ant-junit junit
 DEB_ANT_BUILD_TARGET := package javadoc
 # work with a slightly modified version of maven-ant-helper's build file:
 DEB_ANT_BUILDFILE    := debian/maven-build.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-net-java.git