=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java 2015-09-25 12:41:17 +0000
+++ dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java 2015-09-25 12:58:13 +0000
@@ -88,11 +88,11 @@
assertEquals( 3d, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
- expression = "(d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1)";
+ expression = "(d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1)";
assertEquals( 2d, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
- expression =
+ expression =
"((d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1) * 0.25) + " +
"((d2:zing(8) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1) * 0.75)";
=== modified file 'dhis-2/dhis-web/dhis-web-ohie/pom.xml'
--- dhis-2/dhis-web/dhis-web-ohie/pom.xml 2015-07-20 02:01:37 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/pom.xml 2015-09-25 12:58:13 +0000
@@ -98,6 +98,15 @@
org.hamcrest
hamcrest-library
+
+
+
+
+ junit
+ junit
+ test
+
+