[pkg-java] r16797 - trunk/libcommons-jexl2-java/debian/patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-31 21:33:24 +0000 (Fri, 31 May 2013)
New Revision: 16797

Modified:
   trunk/libcommons-jexl2-java/debian/patches/001-Fix-tests.patch
Log:
Improved the patch fixing the test failure



Modified: trunk/libcommons-jexl2-java/debian/patches/001-Fix-tests.patch
===================================================================
--- trunk/libcommons-jexl2-java/debian/patches/001-Fix-tests.patch	2013-05-31 17:55:47 UTC (rev 16796)
+++ trunk/libcommons-jexl2-java/debian/patches/001-Fix-tests.patch	2013-05-31 21:33:24 UTC (rev 16797)
@@ -1,29 +1,21 @@
-Description: Disable the tests failing with JUnit 4.11 but not with the previous versions
+Description: Fix a test failure with JUnit 4.11 due to the out of order
+ execution of the test methods. This issue is fixed in JEXL 3.
 Author: Emmanuel Bourg
 Forwarded: not-needed
 --- a/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
 +++ b/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
-@@ -165,16 +165,8 @@
-         asserter.assertExpression("6 / 3", new Integer(6 / 3));
-         asserter.assertExpression("6.4 / 3", new Double(6.4 / 3));
-         asserter.assertExpression("0 / 3", new Integer(0 / 3));
--        asserter.assertExpression("3 / 0", new Double(0));
-         asserter.assertExpression("4 % 3", new Integer(1));
-         asserter.assertExpression("4.8 % 3", new Double(4.8 % 3));
--
--        /*
--         * test new null coersion
--         */
--        asserter.setVariable("imanull", null);
--        asserter.assertExpression("imanull + 2", new Integer(2));
--        asserter.assertExpression("imanull + imanull", new Integer(0));
-     }
- 
-     public void testCoercions() throws Exception {
-@@ -347,4 +339,4 @@
-         }
-         debuggerCheck(jexl);
-     }
+@@ -137,6 +137,7 @@
+      * test some simple mathematical calculations
+      */
+     public void testCalculations() throws Exception {
++        JexlThreadedArithmetic.setLenient(Boolean.TRUE);
+ 
+         asserter.setVariable("foo", new Integer(2));
+ 
+@@ -347,4 +348,4 @@
+         }
+         debuggerCheck(jexl);
+     }
 -}
 \ No newline at end of file
-+}
++}