Skip to content

Commit 4cea871

Browse files
committed
fix unit test
1 parent fe74f3a commit 4cea871

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/programrule/DefaultTrackerProgramRuleService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ private Set<ProgramStageInstance> getEventsFromEnrollment(
226226
.filter(event -> event.getEnrollment().equals(enrollmentUid))
227227
.collect(
228228
Collectors.toMap(
229-
Event::getUid,
229+
Event::getEvent,
230230
event ->
231231
eventTrackerConverterService.fromForRuleEngine(
232232
bundle.getPreheat(), event)));

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/programrule/DefaultTrackerProgramRuleServiceTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ void shouldInvokeSpecificMethodWhenCalculatingRuleEffectsForTrackerEvents() {
121121
when(trackerBundle.getPreheat()).thenReturn(preheat);
122122
when(eventTrackerConverterService.fromForRuleEngine(any(TrackerPreheat.class), anyList()))
123123
.thenReturn(programStageInstances);
124+
when(eventTrackerConverterService.fromForRuleEngine(
125+
any(TrackerPreheat.class), any(Event.class)))
126+
.thenReturn(programStageInstances.get(0));
124127
when(programRuleEngine.evaluateEnrollmentAndEvents(
125128
any(ProgramInstance.class), anySet(), anyList()))
126129
.thenReturn(Collections.emptyList());

0 commit comments

Comments
 (0)