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