This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository velocity-tools.
commit b3c8172021eb6d0ab21cc85d5179272f02ed0e6b Author: Damien Raude-Morvan <[email protected]> Date: Fri Jun 12 21:52:41 2009 +0000 velocity-tools (1.4-2) UNRELEASED; urgency=low * debian/patches/02_junit_45.dpatch: compatibility patch for JUnit 4.5 uploaded in Debian. -- Damien Raude-Morvan <[email protected]> Fri, 12 Jun 2009 23:39:20 +0200 --- debian/changelog | 7 +++++ debian/patches/00list | 1 + debian/patches/02_junit_45.dpatch | 57 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/debian/changelog b/debian/changelog index e2f0161..4568cbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +velocity-tools (1.4-2) UNRELEASED; urgency=low + + * debian/patches/02_junit_45.dpatch: compatibility patch + for JUnit 4.5 uploaded in Debian. + + -- Damien Raude-Morvan <[email protected]> Fri, 12 Jun 2009 23:39:20 +0200 + velocity-tools (1.4-1) unstable; urgency=low * Initial release. (Closes: #497436) diff --git a/debian/patches/00list b/debian/patches/00list index 83541cc..f8b9377 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ 01_dont_copy_test_lib +02_junit_45 diff --git a/debian/patches/02_junit_45.dpatch b/debian/patches/02_junit_45.dpatch new file mode 100755 index 0000000..855122f --- /dev/null +++ b/debian/patches/02_junit_45.dpatch @@ -0,0 +1,57 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_junit_45.dpatch by Damien Raude-Morvan <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: compatibility patch for JUnit 4.5 + +@DPATCH@ +diff -urNad velocity-tools-1.4~/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java velocity-tools-1.4/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java +--- velocity-tools-1.4~/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2007-10-30 20:59:17.000000000 +0100 ++++ velocity-tools-1.4/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2009-03-26 00:56:39.160193833 +0100 +@@ -97,9 +97,9 @@ + assertEquals(disp,dateTool.format(date)); + assertEquals(disp2,dateTool.format("yyyy/MM/dd",date)); + /* test parsing */ +- assertEquals(2007,dateTool.getYear(disp)); +- assertEquals(0,dateTool.getMonth(disp)); +- assertEquals(2,dateTool.getDay(disp)); ++ assertEquals(new Integer(2007), dateTool.getYear(disp)); ++ assertEquals(new Integer(0), dateTool.getMonth(disp)); ++ assertEquals(new Integer(2), dateTool.getDay(disp)); + } + + public @Test void testEscapeTool() { +@@ -128,24 +128,24 @@ + assertNotNull(mathTool); + assertEquals(1,mathTool.abs(-1)); + assertEquals(2,mathTool.add(1,1)); +- assertEquals(3,mathTool.ceil(2.5)); ++ assertEquals(new Integer(3),mathTool.ceil(2.5)); + assertEquals(4,mathTool.div(8,2)); +- assertEquals(5,mathTool.floor(5.1)); ++ assertEquals(new Integer(5),mathTool.floor(5.1)); + assertEquals(6,mathTool.getAverage(new long[] {5,6,7})); + /* getTotal() watches the type of its first argument, so assertEquals needs a long */ + assertEquals((long)7,mathTool.getTotal(new long[] {2,2,3})); +- assertEquals(8,mathTool.idiv(130,16)); ++ assertEquals(new Integer(8),mathTool.idiv(130,16)); + assertEquals(9,mathTool.max(9,-10)); + assertEquals(10,mathTool.min(10,20)); +- assertEquals(11,mathTool.mod(37,13)); ++ assertEquals(new Integer(11),mathTool.mod(37,13)); + assertEquals(12,mathTool.mul(3,4)); +- assertEquals(13,mathTool.round(12.8)); +- assertEquals(14.2,mathTool.roundTo(1,14.18)); +- assertEquals(-5.0,mathTool.roundTo(2,-4.999)); ++ assertEquals(new Integer(13),mathTool.round(12.8)); ++ assertEquals(new Double(14.2),mathTool.roundTo(1,14.18)); ++ assertEquals(new Double(-5.0),mathTool.roundTo(2,-4.999)); + assertEquals(15,mathTool.sub(30,15)); + assertEquals(16,mathTool.pow(4,2)); +- assertEquals(17,mathTool.toInteger("17")); +- assertEquals(18.1,mathTool.toDouble("18.1")); ++ assertEquals(new Integer(17),mathTool.toInteger("17")); ++ assertEquals(new Double(18.1),mathTool.toDouble("18.1")); + } + + public @Test void testNumberTool() { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/velocity-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
