|
35 | 35 | import org.apache.cloudstack.context.CallContext; |
36 | 36 | import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; |
37 | 37 | import org.apache.cloudstack.framework.config.ConfigKey; |
| 38 | +import org.apache.commons.collections.CollectionUtils; |
38 | 39 | import org.junit.After; |
39 | 40 | import org.junit.Assert; |
40 | 41 | import org.junit.Before; |
|
66 | 67 | import com.cloud.user.AccountVO; |
67 | 68 | import com.cloud.user.User; |
68 | 69 | import com.cloud.user.UserVO; |
| 70 | +import com.cloud.utils.Pair; |
69 | 71 | import com.cloud.utils.component.ComponentContext; |
70 | 72 | import com.cloud.utils.db.Filter; |
71 | 73 | import com.cloud.utils.db.SearchBuilder; |
@@ -142,14 +144,13 @@ public void listKubernetesSupportedVersionsTest() { |
142 | 144 | when(versionVO.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION); |
143 | 145 | versionVOs.add(versionVO); |
144 | 146 | when(kubernetesSupportedVersionDao.findById(Mockito.anyLong())).thenReturn(versionVO); |
145 | | - when(kubernetesSupportedVersionDao.search(Mockito.any(SearchCriteria.class), Mockito.any(Filter.class))).thenReturn(versionVOs); |
146 | | - ListResponse<KubernetesSupportedVersionResponse> response = |
147 | | - kubernetesVersionService.listKubernetesSupportedVersions( |
148 | | - cmd); |
149 | | - Assert.assertNotNull(response); |
150 | | - Assert.assertEquals(Integer.valueOf(1), response.getCount()); |
151 | | - Assert.assertEquals(1, response.getResponses().size()); |
152 | | - Assert.assertEquals(KubernetesVersionService.MIN_KUBERNETES_VERSION, response.getResponses().get(0).getSemanticVersion()); |
| 147 | + when(kubernetesSupportedVersionDao.searchAndCount(Mockito.any(SearchCriteria.class), |
| 148 | + Mockito.any(Filter.class))).thenReturn(new Pair<>(versionVOs, versionVOs.size())); |
| 149 | + ListResponse<KubernetesSupportedVersionResponse> versionsResponse = |
| 150 | + kubernetesVersionService.listKubernetesSupportedVersions(cmd); |
| 151 | + Assert.assertEquals(versionVOs.size(), versionsResponse.getCount().intValue()); |
| 152 | + Assert.assertTrue(CollectionUtils.isNotEmpty(versionsResponse.getResponses())); |
| 153 | + Assert.assertEquals(versionVOs.size(), versionsResponse.getResponses().size()); |
153 | 154 | } |
154 | 155 |
|
155 | 156 | @Test(expected = InvalidParameterValueException.class) |
|
0 commit comments