This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ini4j.
commit e4ef2d0e53a7541b5f5d2e8973e4911a5eab8881 Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 4 13:39:46 2014 +0100 Enabled the unit tests --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/maven.ignoreRules | 4 ---- debian/maven.properties | 1 - debian/maven.rules | 2 ++ debian/patches/02-fix-tests-cleanup.patch | 14 ++++++++++++++ debian/patches/series | 1 + 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1fa9c4a..071e551 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ini4j (0.5.2-SNAPSHOT-5) UNRELEASED; urgency=medium + + * Team upload. + * Enabled the unit tests + + -- Emmanuel Bourg <[email protected]> Thu, 04 Dec 2014 12:14:07 +0100 + ini4j (0.5.2-SNAPSHOT-4) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index feebf2f..d79a6e2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marek Slama <[email protected]>, Andres Mejia <[email protected]> -Build-Depends: cdbs, debhelper (>= 9), maven-debian-helper, default-jdk, libmaven-javadoc-plugin-java +Build-Depends: cdbs, debhelper (>= 9), maven-debian-helper, default-jdk, libmaven-javadoc-plugin-java, junit4, libbsh-java, libeasymock-java Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/ini4j.git Vcs-Git: git://anonscm.debian.org/pkg-java/ini4j.git diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 00ba913..b758f7e 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,7 +1,6 @@ com.google.code.maven-license-plugin maven-license-plugin * * * * jetty jetty * * * * -junit junit * * * * net.sf.retrotranslator retrotranslator-runtime * * * * org.apache.maven.plugins maven-antrun-plugin * * * * org.apache.maven.plugins maven-assembly-plugin * * * * @@ -14,11 +13,8 @@ org.apache.maven.plugins maven-pmd-plugin * * * * org.apache.maven.plugins maven-project-info-reports-plugin * * * * org.apache.maven.plugins maven-site-plugin * * * * org.apache.maven.plugins maven-source-plugin * * * * -org.apache.maven.plugins maven-surefire-plugin * * * * -org.beanshell bsh * * * * org.codehaus.mojo cobertura-maven-plugin * * * * org.codehaus.mojo retrotranslator-maven-plugin * * * * org.codehaus.mojo taglist-maven-plugin * * * * org.codehaus.mojo wagon-maven-plugin * * * * -org.easymock easymock * * * * org.easymock easymockclassextension * * * * diff --git a/debian/maven.properties b/debian/maven.properties index 242da7e..c67a92a 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -2,5 +2,4 @@ # For example: # maven.test.skip=true -maven.test.skip=true project.build.sourceEncoding=UTF-8 diff --git a/debian/maven.rules b/debian/maven.rules index 8b13789..9d8de13 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1,3 @@ +junit junit jar s/4\..*/4.x/ * * + diff --git a/debian/patches/02-fix-tests-cleanup.patch b/debian/patches/02-fix-tests-cleanup.patch new file mode 100644 index 0000000..ec3a324 --- /dev/null +++ b/debian/patches/02-fix-tests-cleanup.patch @@ -0,0 +1,14 @@ +Description: Clear the missing system properties to avoid test failures in ConfigTest +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/org/ini4j/test/Helper.java ++++ b/src/test/java/org/ini4j/test/Helper.java +@@ -56,6 +56,8 @@ + public static final float DELTA = 0.00000001f; + private static final String[] CONFIG_PROPERTIES = + { ++ Config.PROP_EMPTY_SECTION, Config.PROP_PATH_SEPARATOR, Config.PROP_PROPERTY_FIRST_UPPER, ++ Config.PROP_COMMENT, Config.PROP_HEADER_COMMENT, Config.PROP_TREE, + Config.PROP_EMPTY_OPTION, Config.PROP_GLOBAL_SECTION, Config.PROP_GLOBAL_SECTION_NAME, Config.PROP_INCLUDE, + Config.PROP_LOWER_CASE_OPTION, Config.PROP_LOWER_CASE_SECTION, Config.PROP_MULTI_OPTION, Config.PROP_MULTI_SECTION, + Config.PROP_STRICT_OPERATOR, Config.PROP_UNNAMED_SECTION, Config.PROP_ESCAPE diff --git a/debian/patches/series b/debian/patches/series index 3209aba..04d654b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-java8-compatibility.patch +02-fix-tests-cleanup.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ini4j.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
