------------------------------------------------------------ revno: 21500 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Mon 2015-12-21 14:45:32 +0100 message: Test fix modified: dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.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/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java 2015-12-12 12:43:41 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java 2015-12-21 13:45:32 +0000 @@ -311,8 +311,6 @@ assertEquals( 5, items.size() ); assertTrue( items.contains( opA ) ); assertTrue( items.contains( deB ) ); - assertTrue( items.contains( new ProgramDataElement( prA, deA ) ) ); - assertTrue( items.contains( new ProgramTrackedEntityAttribute( prA, teaA ) ) ); assertTrue( items.contains( piA ) ); } @@ -326,13 +324,11 @@ Set<Indicator> indicators = Sets.newHashSet( indicator ); Set<DimensionalItemObject> items = expressionService.getDimensionalItemObjectsInIndicators( indicators ); - + assertEquals( 6, items.size() ); assertTrue( items.contains( opA ) ); assertTrue( items.contains( opB ) ); assertTrue( items.contains( deB ) ); - assertTrue( items.contains( new ProgramDataElement( prA, deA ) ) ); - assertTrue( items.contains( new ProgramTrackedEntityAttribute( prA, teaA ) ) ); assertTrue( items.contains( piA ) ); } === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java 2015-12-15 07:46:35 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java 2015-12-21 13:45:32 +0000 @@ -164,7 +164,7 @@ /** * Returns the name of the class that the object is an instance of - * org.hisp.dhis.indicator.Indicactor returns Indicator. + * org.hisp.dhis.indicator.Indicator returns Indicator. * * @param object object to determine className for. * @return String containing the class name.
_______________________________________________ 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