This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 7f61aee fixed unit tests for self-service
new 8e96caa Merge pull request #1397 from denysyankiv/DATALAB-2673
7f61aee is described below
commit 7f61aee180620574ff8ffc476300db80f32ffc97
Author: Denys Yankiv <[email protected]>
AuthorDate: Tue Jan 25 13:39:23 2022 +0200
fixed unit tests for self-service
---
.../service/impl/BillingServiceImplTest.java | 18 ++++++++++--------
.../service/impl/SystemInfoServiceImplTest.java | 2 +-
.../epam/datalab/backendapi/util/CSVFormatterTest.java | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
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 672bc2e..6f6e09a 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
@@ -558,7 +558,7 @@ String get = getDownloadReport();
.user(USER).project(PROJECT).endpoint(ENDPOINT).resourceName(EXPLORATORY_NAME).resourceType(BillingResourceType.VOLUME).build();
BillingReportLine compute =
BillingReportLine.builder().datalabId(COMPUTE_ID).usageDate(USAGE_DATE).application(ENDPOINT).user(USER).project(PROJECT)
-
.endpoint(ENDPOINT).resourceName(COMPUTE_NAME).resourceType(BillingResourceType.COMPUTATIONAL).shape("3
x " + SHAPE).exploratoryName(EXPLORATORY_NAME).build();
+
.endpoint(ENDPOINT).resourceName(COMPUTE_NAME).resourceType(BillingResourceType.COMPUTATIONAL).shape("Master:
" + SHAPE+"Slave: 2 x "+SHAPE).exploratoryName(EXPLORATORY_NAME).build();
BillingReportLine computePrimaryVolume =
BillingReportLine.builder().datalabId(COMPUTE_VOLUME_PRIMARY_ID).usageDate(USAGE_DATE).application(ENDPOINT).user(USER)
.project(PROJECT).endpoint(ENDPOINT).resourceName(COMPUTE_NAME).resourceType(BillingResourceType.VOLUME).build();
BillingReportLine computeSecondaryVolume =
BillingReportLine.builder().datalabId(COMPUTE_VOLUME_SECONDARY_ID).usageDate(USAGE_DATE).application(ENDPOINT).user(USER)
@@ -687,16 +687,17 @@ String get = getDownloadReport();
private String getDownloadReport() {
StringBuilder sb = new StringBuilder();
sb.append("\"Service base name:
").append(SERVICE_BASE_NAME).append(". Available reporting period from:
").append("Jan 1, 2020")
- .append(" to: ").append("May 1,
2020").append("\"\r\n");
+ .append(" to: ").append("May 1,
2020").append("\"").append(System.lineSeparator());
sb.append(new StringJoiner(",").add("DataLab
ID").add("User").add("Project").add("DataLab Resource
Type").add("Status").add("Shape").add("Product")
.add("Cost\r\n").toString());
- sb.append(new
StringJoiner(",").add(EDGE_ID_1).add(USER).add(PROJECT).add("Edge").add("running").add(SHAPE).add(PRODUCT).add(1.999
+ "\r\n"));
- sb.append(new
StringJoiner(",").add(EXPLORATORY_ID).add(USER).add(PROJECT).add("Exploratory").add("failed").add(SHAPE).add(PRODUCT).add(1.0
+ "\r\n"));
- sb.append(new
StringJoiner(",").add(COMPUTE_ID).add(USER).add(PROJECT).add("Computational").add("creating").add(SHAPE).add(PRODUCT).add(1.0
+ "\r\n"));
+ sb.append(new
StringJoiner(",").add(EDGE_ID_1).add(USER).add(PROJECT).add("Edge").add("running").add(SHAPE).add(PRODUCT).add(1.999
+ System.lineSeparator()));
+ sb.append(new
StringJoiner(",").add(EXPLORATORY_ID).add(USER).add(PROJECT).add("Exploratory").add("failed").add(SHAPE).add(PRODUCT).add(1.0
+ System.lineSeparator()));
+ sb.append(new
StringJoiner(",").add(COMPUTE_ID).add(USER).add(PROJECT).add("Computational").add("creating").add(SHAPE).add(PRODUCT).add(1.0
+ System.lineSeparator()));
- sb.append(",,,,,,,Total: 4.0 currency\r\n");
+ sb.append(",,,,,,,Total: 4.0 currency");
+ sb.append(System.lineSeparator());
return sb.toString();
}
@@ -738,8 +739,9 @@ String get = getDownloadReport();
resource.setComputationalId(COMPUTE_ID);
resource.setComputationalName(COMPUTE_NAME);
resource.setImageName(DataEngineType.SPARK_STANDALONE.getName());
- resource.setDataengineInstanceCount(3);
- resource.setDataengineShape(SHAPE);
+ resource.setTotalInstanceCount(3);
+ resource.setMasterNodeShape(SHAPE);
+ resource.setSlaveNodeShape(SHAPE);
resource.setStatus("creating");
return resource;
diff --git
a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/SystemInfoServiceImplTest.java
b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/SystemInfoServiceImplTest.java
index 388e01c..e3e01a3 100644
---
a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/SystemInfoServiceImplTest.java
+++
b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/SystemInfoServiceImplTest.java
@@ -90,7 +90,7 @@ public class SystemInfoServiceImplTest {
assertEquals(OS_FAMILY, systemInfo.getOsInfo().getFamily());
assertEquals(PROCESSOR_MODEL,
systemInfo.getProcessorInfo().getModel());
assertEquals(AVAILABLE_MEMORY,
systemInfo.getMemoryInfo().getAvailableMemory());
- assertEquals(2, systemInfo.getDisksInfo().size());
+ assertEquals(1, systemInfo.getDisksInfo().size());
verify(si).getOperatingSystem();
verify(si).getHardware();
diff --git
a/services/self-service/src/test/java/com/epam/datalab/backendapi/util/CSVFormatterTest.java
b/services/self-service/src/test/java/com/epam/datalab/backendapi/util/CSVFormatterTest.java
index f4fe781..5098fe8 100644
---
a/services/self-service/src/test/java/com/epam/datalab/backendapi/util/CSVFormatterTest.java
+++
b/services/self-service/src/test/java/com/epam/datalab/backendapi/util/CSVFormatterTest.java
@@ -31,7 +31,7 @@ public class CSVFormatterTest {
@Test
public void formatLine() {
List<String> values = Arrays.asList("aaa", "bbb", "ccc", "aa", "bb",
"cc", "a", "b", "c");
- String expected = "aaa,bbb,ccc,aa,bb,cc,a,b,c\r\n";
+ String expected =
"aaa,bbb,ccc,aa,bb,cc,a,b,c".concat(System.lineSeparator());
String actual = CSVFormatter.formatLine(values, ',');
assertEquals(expected, actual);
}
@@ -39,7 +39,7 @@ public class CSVFormatterTest {
@Test
public void formatLineWithCustomQuote() {
List<String> values = Arrays.asList("aaa", "bbb", "ccc", "aa", "bb",
"cc", "a", "b", "c");
- String expected =
"\"aaa\",\"bbb\",\"ccc\",\"aa\",\"bb\",\"cc\",\"a\",\"b\",\"c\"\r\n";
+ String expected =
"\"aaa\",\"bbb\",\"ccc\",\"aa\",\"bb\",\"cc\",\"a\",\"b\",\"c\"".concat(System.lineSeparator());
String actual = CSVFormatter.formatLine(values, ',', '"');
assertEquals(expected, actual);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
