Skip to content

Commit 4d24432

Browse files
committed
fix errors in ConfigurationGroupsAggregatorTest
1 parent 2d25b7b commit 4d24432

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

engine/schema/src/test/java/com/cloud/upgrade/ConfigurationGroupsAggregatorTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
// under the License.
1717
package 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;
2219
import static org.mockito.Mockito.when;
2320

2421
import java.util.Collections;
@@ -37,9 +34,6 @@
3734
import org.mockito.Mockito;
3835
import org.mockito.junit.MockitoJUnitRunner;
3936

40-
import com.cloud.utils.db.SearchBuilder;
41-
import com.cloud.utils.db.SearchCriteria;
42-
4337
@RunWith(MockitoJUnitRunner.class)
4438
public 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

Comments
 (0)