1616// under the License.
1717package com .cloud .upgrade ;
1818
19- import static org .mockito .ArgumentMatchers .any ;
20- import static org .mockito .ArgumentMatchers .eq ;
21- import static org .mockito .ArgumentMatchers .isNull ;
2219import static org .mockito .Mockito .when ;
2320
2421import java .util .Collections ;
3734import org .mockito .Mockito ;
3835import org .mockito .junit .MockitoJUnitRunner ;
3936
40- import com .cloud .utils .db .SearchBuilder ;
41- import com .cloud .utils .db .SearchCriteria ;
42-
4337@ RunWith (MockitoJUnitRunner .class )
4438public class ConfigurationGroupsAggregatorTest {
4539 @ InjectMocks
@@ -64,13 +58,7 @@ public void testUpdateConfigurationGroups() {
6458 config .setGroupId (1L );
6559 config .setSubGroupId (1L );
6660
67- SearchBuilder <ConfigurationVO > sb = Mockito .mock (SearchBuilder .class );
68- when (configDao .createSearchBuilder ()).thenReturn (sb );
69- Mockito .when (sb .select ("name" , SearchCriteria .Func .NATIVE , "test.config.name" )).thenReturn (sb );
70- Mockito .when (sb .select ("groupId" , SearchCriteria .Func .NATIVE , 1L )).thenReturn (sb );
71- Mockito .when (sb .select ("subGroupId" , SearchCriteria .Func .NATIVE , 1L )).thenReturn (sb );
72- Mockito .when (sb .entity ()).thenReturn (config );
73- when (configDao .searchIncludingRemoved (any (), isNull (), isNull (), eq (false ))).thenReturn (Collections .singletonList (config ));
61+ when (configDao .searchPartialConfigurations ()).thenReturn (Collections .singletonList (config ));
7462
7563 ConfigurationSubGroupVO configSubGroup = Mockito .mock (ConfigurationSubGroupVO .class );
7664 when (configSubGroupDao .findByName ("name" )).thenReturn (configSubGroup );
0 commit comments