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/02 15:45:24 UTC
[incubator-datalab] branch DATALAB-2812 updated: update unit tests
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-2812
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2812 by this push:
new 722485fc4 update unit tests
722485fc4 is described below
commit 722485fc4890e9b8f4e0976726daed8e676712ea
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Thu Jun 2 18:45:13 2022 +0300
update unit tests
---
.../resources/ImageExploratoryResourceTest.java | 9 +++++++--
.../service/impl/BillingServiceImplTest.java | 17 +++++++----------
.../service/impl/ImageExploratoryServiceImplTest.java | 19 +++++++++++++++++--
3 files changed, 31 insertions(+), 14 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 6f7a0e224..98342f67a 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
@@ -42,6 +42,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.time.LocalDateTime;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -278,7 +279,7 @@ public class ImageExploratoryResourceTest extends TestBase {
private List<ImageInfoRecord> getImageList() {
ImageInfoRecord imageInfoRecord = new ImageInfoRecord("someName",
- "2020-02-02",
+ new Date(1580601722000L),
"someDescription",
"someProject",
"someEndpoint",
@@ -288,7 +289,11 @@ public class ImageExploratoryResourceTest extends TestBase {
CloudProvider.AWS,
"someFullName",
ImageStatus.CREATED,
- "private");
+ false,
+ null,
+ null,
+ null,
+ null);
return Collections.singletonList(imageInfoRecord);
}
}
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 b2345a8c8..e0b9d5046 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
@@ -57,14 +57,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import javax.ws.rs.core.GenericType;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.StringJoiner;
+import java.util.*;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
@@ -748,7 +741,7 @@ public class BillingServiceImplTest extends TestBase {
return Collections.singletonList(
new ImageInfoRecord(
IMAGE_NAME,
- "2020-02-02",
+ new Date(),
IMAGE_DESCRIPTION,
PROJECT,
ENDPOINT,
@@ -758,7 +751,11 @@ public class BillingServiceImplTest extends TestBase {
CloudProvider.GENERAL,
IMAGE_FULL_NAME,
ImageStatus.CREATED,
- "private")
+ false,
+ null,
+ null,
+ null,
+ null)
);
}
}
\ No newline at end of file
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 1af955aa8..51f439712 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
@@ -54,6 +54,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import java.time.LocalDateTime;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -309,8 +310,22 @@ public class ImageExploratoryServiceImplTest {
}
private ImageInfoRecord getImageInfoRecord() {
- return new ImageInfoRecord("someName", "2020-02-02","someDescription", "someProject", "someEndpoint", "someUser", "someApp",
- "someInstance",CloudProvider.GENERAL,"someFullName", ImageStatus.CREATED, "private");
+ return new ImageInfoRecord("someName",
+ new Date(),
+ "someDescription",
+ "someProject",
+ "someEndpoint",
+ "someUser",
+ "someApp",
+ "someInstance",
+ CloudProvider.GENERAL,
+ "someFullName",
+ ImageStatus.CREATED,
+ false,
+ null,
+ null,
+ null,
+ null);
}
private Image fetchImage() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org