Skip to content

Commit 73e61b4

Browse files
committed
fix test
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent dd3019c commit 73e61b4

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionServiceTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.cloudstack.context.CallContext;
3636
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
3737
import org.apache.cloudstack.framework.config.ConfigKey;
38+
import org.apache.commons.collections.CollectionUtils;
3839
import org.junit.After;
3940
import org.junit.Assert;
4041
import org.junit.Before;
@@ -66,6 +67,7 @@
6667
import com.cloud.user.AccountVO;
6768
import com.cloud.user.User;
6869
import com.cloud.user.UserVO;
70+
import com.cloud.utils.Pair;
6971
import com.cloud.utils.component.ComponentContext;
7072
import com.cloud.utils.db.Filter;
7173
import com.cloud.utils.db.SearchBuilder;
@@ -142,14 +144,13 @@ public void listKubernetesSupportedVersionsTest() {
142144
when(versionVO.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
143145
versionVOs.add(versionVO);
144146
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());
153154
}
154155

155156
@Test(expected = InvalidParameterValueException.class)

0 commit comments

Comments
 (0)