------------------------------------------------------------
revno: 19821
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Sun 2015-08-23 09:22:07 -0400
message:
Test fix
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-08-22 15:11:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-08-23 13:22:07 +0000
@@ -1009,4 +1009,3 @@
current_date=Current date
value_count=Value count
zero_pos_value_count=Zero or positive value count
-
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java 2015-08-22 15:04:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java 2015-08-23 13:22:07 +0000
@@ -522,7 +522,7 @@
public void testGetAnalyticsSqlWithFunctionsB()
{
String col = COL_QUOTE + deA.getUid() + COL_QUOTE;
- String expected = "case when " + col + " >= 0 then 1 else " + col + " end";
+ String expected = "case when " + col + " >= 0 then 1 else 0 end";
String expression = "d2:oizp(" + col + ")";
assertEquals( expected, programIndicatorService.getAnalyticsSQl( expression ) );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
