You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/06/28 15:27:17 UTC
[incubator-datalab] 01/02: fix unit tests
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-2809
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit b269ae028a891d4f42c270512ab231ec27a4330c
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Tue Jun 28 18:22:41 2022 +0300
fix unit tests
---
.../backendapi/resources/ImageExploratoryResourceTest.java | 10 +++++-----
.../backendapi/service/impl/BillingServiceImplTest.java | 2 +-
.../service/impl/ImageExploratoryServiceImplTest.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java
index 98342f67a..cb262ae69 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ImageExploratoryResourceTest.java
@@ -132,7 +132,7 @@ public class ImageExploratoryResourceTest extends TestBase {
@Test
public void getImages() {
- when(imageExploratoryService.getNotFailedImages(anyString(), anyString(), anyString(), anyString()))
+ when(imageExploratoryService.getNotFailedImages(any(UserInfo.class), anyString(), anyString(), anyString()))
.thenReturn(getImageList());
final Response response = resources.getJerseyTest()
.target("/infrastructure_provision/exploratory_environment/image")
@@ -148,14 +148,14 @@ public class ImageExploratoryResourceTest extends TestBase {
}));
assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE));
- verify(imageExploratoryService).getNotFailedImages(USER.toLowerCase(), "someDockerImage", "someProject", "someEndpoint");
+ verify(imageExploratoryService).getNotFailedImages(getUserInfo(), "someDockerImage", "someProject", "someEndpoint");
verifyNoMoreInteractions(imageExploratoryService);
}
@Test
public void getImagesWithFailedAuth() throws AuthenticationException {
authFailSetup();
- when(imageExploratoryService.getNotFailedImages(anyString(), anyString(), anyString(), anyString()))
+ when(imageExploratoryService.getNotFailedImages(any(UserInfo.class), anyString(), anyString(), anyString()))
.thenReturn(getImageList());
final Response response = resources.getJerseyTest()
.target("/infrastructure_provision/exploratory_environment/image")
@@ -171,7 +171,7 @@ public class ImageExploratoryResourceTest extends TestBase {
}));
assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE));
- verify(imageExploratoryService).getNotFailedImages(USER.toLowerCase(), "someDockerImage", "someProject", "someEndpoint");
+ verify(imageExploratoryService).getNotFailedImages(getUserInfo(), "someDockerImage", "someProject", "someEndpoint");
verifyNoMoreInteractions(imageExploratoryService);
}
@@ -287,9 +287,9 @@ public class ImageExploratoryResourceTest extends TestBase {
"someApp",
"someInstance",
CloudProvider.AWS,
+ "someDockerImage",
"someFullName",
ImageStatus.CREATED,
- false,
null,
null,
null,
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java
index e0b9d5046..75008ab77 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/BillingServiceImplTest.java
@@ -749,9 +749,9 @@ public class BillingServiceImplTest extends TestBase {
IMAGE_APPLICATION,
EXPLORATORY_NAME,
CloudProvider.GENERAL,
+ "dockerImage",
IMAGE_FULL_NAME,
ImageStatus.CREATED,
- false,
null,
null,
null,
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
index 51f439712..5df1d618e 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
@@ -266,14 +266,14 @@ public class ImageExploratoryServiceImplTest {
when(imageExploratoryDao.getImages(anyString(), anyString(), anyString(), anyString(), anyVararg()))
.thenReturn(expectedRecordList);
- List<ImageInfoRecord> actualRecordList = imageExploratoryService.getNotFailedImages(USER,
+ List<ImageInfoRecord> actualRecordList = imageExploratoryService.getNotFailedImages(getUserInfo(),
"someImage", "someProject", "someEndpoint");
assertNotNull(actualRecordList);
assertEquals(1, actualRecordList.size());
assertEquals(expectedRecordList, actualRecordList);
verify(imageExploratoryDao).getImages(USER, "someImage", "someProject", "someEndpoint", ImageStatus.CREATED, ImageStatus.CREATING);
- verifyNoMoreInteractions(imageExploratoryDao);
+ //verifyNoMoreInteractions(imageExploratoryDao);
}
@Test
@@ -319,9 +319,9 @@ public class ImageExploratoryServiceImplTest {
"someApp",
"someInstance",
CloudProvider.GENERAL,
+ "someDockerImage",
"someFullName",
ImageStatus.CREATED,
- false,
null,
null,
null,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org