2020import com .cloud .api .query .dao .TemplateJoinDao ;
2121import com .cloud .api .query .vo .EventJoinVO ;
2222import com .cloud .api .query .vo .TemplateJoinVO ;
23+ import com .cloud .event .EventVO ;
24+ import com .cloud .event .dao .EventDao ;
2325import com .cloud .event .dao .EventJoinDao ;
2426import com .cloud .exception .InvalidParameterValueException ;
2527import com .cloud .exception .PermissionDeniedException ;
@@ -92,6 +94,9 @@ public class QueryManagerImplTest {
9294 @ Mock
9395 AccountManager accountManager ;
9496
97+ @ Mock
98+ EventDao eventDao ;
99+
95100 @ Mock
96101 EventJoinDao eventJoinDao ;
97102
@@ -128,12 +133,12 @@ private void setupCommonMocks() {
128133 UUID .randomUUID ().toString (), User .Source .UNKNOWN );
129134 CallContext .register (user , account );
130135 Mockito .when (accountManager .isRootAdmin (account .getId ())).thenReturn (false );
131- final SearchBuilder <EventJoinVO > searchBuilder = Mockito .mock (SearchBuilder .class );
132- final SearchCriteria <EventJoinVO > searchCriteria = Mockito .mock (SearchCriteria .class );
133- final EventJoinVO eventJoinVO = Mockito .mock (EventJoinVO .class );
134- when (searchBuilder .entity ()).thenReturn (eventJoinVO );
135- when (searchBuilder .create ()).thenReturn (searchCriteria );
136- Mockito .when (eventJoinDao .createSearchBuilder ()).thenReturn (searchBuilder );
136+ final SearchBuilder <EventVO > eventSearchBuilder = Mockito .mock (SearchBuilder .class );
137+ final SearchCriteria <EventVO > eventSearchCriteria = Mockito .mock (SearchCriteria .class );
138+ final EventVO eventVO = Mockito .mock (EventVO .class );
139+ when (eventSearchBuilder .entity ()).thenReturn (eventVO );
140+ when (eventSearchBuilder .create ()).thenReturn (eventSearchCriteria );
141+ Mockito .when (eventDao .createSearchBuilder ()).thenReturn (eventSearchBuilder );
137142 }
138143
139144 private ListEventsCmd setupMockListEventsCmd () {
@@ -149,19 +154,26 @@ public void searchForEventsSuccess() {
149154 String uuid = UUID .randomUUID ().toString ();
150155 Mockito .when (cmd .getResourceId ()).thenReturn (uuid );
151156 Mockito .when (cmd .getResourceType ()).thenReturn (ApiCommandResourceType .Network .toString ());
152- List <EventJoinVO > events = new ArrayList <>();
153- events .add (Mockito .mock (EventJoinVO .class ));
154- events .add (Mockito .mock (EventJoinVO .class ));
155- events .add (Mockito .mock (EventJoinVO .class ));
156- Pair <List <EventJoinVO >, Integer > pair = new Pair <>(events , events .size ());
157+ List <EventVO > events = new ArrayList <>();
158+ events .add (Mockito .mock (EventVO .class ));
159+ events .add (Mockito .mock (EventVO .class ));
160+ events .add (Mockito .mock (EventVO .class ));
161+ Pair <List <EventVO >, Integer > pair = new Pair <>(events , events .size ());
162+
163+ List <EventJoinVO > eventJoins = new ArrayList <>();
164+ eventJoins .add (Mockito .mock (EventJoinVO .class ));
165+ eventJoins .add (Mockito .mock (EventJoinVO .class ));
166+ eventJoins .add (Mockito .mock (EventJoinVO .class ));
167+
157168 NetworkVO network = Mockito .mock (NetworkVO .class );
158169 Mockito .when (network .getId ()).thenReturn (1L );
159170 Mockito .when (network .getAccountId ()).thenReturn (account .getId ());
160171 Mockito .when (entityManager .findByUuidIncludingRemoved (Network .class , uuid )).thenReturn (network );
161172 Mockito .doNothing ().when (accountManager ).checkAccess (account , SecurityChecker .AccessType .ListEntry , true , network );
162- Mockito .when (eventJoinDao .searchAndCount (Mockito .any (), Mockito .any (Filter .class ))).thenReturn (pair );
173+ Mockito .when (eventDao .searchAndCount (Mockito .any (), Mockito .any (Filter .class ))).thenReturn (pair );
174+ Mockito .when (eventJoinDao .searchByIds (Mockito .any ())).thenReturn (eventJoins );
163175 List <EventResponse > respList = new ArrayList <EventResponse >();
164- for (EventJoinVO vt : events ) {
176+ for (EventJoinVO vt : eventJoins ) {
165177 respList .add (eventJoinDao .newEventResponse (vt ));
166178 }
167179 try (MockedStatic <ViewResponseHelper > ignored = Mockito .mockStatic (ViewResponseHelper .class )) {
0 commit comments