You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2022/10/11 15:03:07 UTC

[incubator-streampipes] 02/02: [STREAMPIPES-583] Fix the test for the download dialog

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch STREAMPIPES-583
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 89739df13ac0304ae158285dea3a3261f8a42834
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Oct 11 17:02:43 2022 +0200

    [STREAMPIPES-583] Fix the test for the download dialog
---
 .../streampipes/dataexplorer/v4/SupportedDataLakeQueryParameters.java  | 1 +
 .../src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java    | 2 +-
 ui/cypress/fixtures/dataDownloadDialog/input.json                      | 2 +-
 ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv                | 3 ++-
 ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv            | 3 ++-
 ui/cypress/fixtures/dataDownloadDialog/testJson.json                   | 2 +-
 .../fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv   | 1 +
 .../tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts      | 2 +-
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/SupportedDataLakeQueryParameters.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/SupportedDataLakeQueryParameters.java
index 187ce97b6..e124253d8 100644
--- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/SupportedDataLakeQueryParameters.java
+++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/SupportedDataLakeQueryParameters.java
@@ -56,6 +56,7 @@ public class SupportedDataLakeQueryParameters {
           QP_CSV_DELIMITER,
           QP_COUNT_ONLY,
           QP_AUTO_AGGREGATE,
+          QP_MISSING_VALUE_BEHAVIOUR,
           QP_FILTER,
           QP_MAXIMUM_AMOUNT_OF_EVENTS
   );
diff --git a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java b/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
index 55bfe81a5..6a20ad7b9 100644
--- a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
+++ b/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
@@ -201,7 +201,7 @@ public class DataLakeResourceV4 extends AbstractRestResource {
             , @Parameter(in = ParameterIn.QUERY, description = "time interval for aggregation (e.g. 1m - one minute) for grouping operation") @QueryParam(QP_TIME_INTERVAL) String timeInterval
             , @Parameter(in = ParameterIn.QUERY, description = "format specification (csv, json - default is csv) for data download") @QueryParam(QP_FORMAT) String format
             , @Parameter(in = ParameterIn.QUERY, description = "csv delimiter (comma or semicolon)") @QueryParam(QP_CSV_DELIMITER) String csvDelimiter
-            , @Parameter(in = ParameterIn.QUERY, description = "missingValueBehaviour (ignore or emtpy)") @QueryParam(QP_MISSING_VALUE_BEHAVIOUR) String missingValueBehaviour
+            , @Parameter(in = ParameterIn.QUERY, description = "missingValueBehaviour (ignore or empty)") @QueryParam(QP_MISSING_VALUE_BEHAVIOUR) String missingValueBehaviour
             , @Parameter(in = ParameterIn.QUERY, description = "filter conditions (a comma-separated list of filter conditions such as [field,operator,condition])") @QueryParam(QP_FILTER) String filter
             , @Context UriInfo uriInfo) {
 
diff --git a/ui/cypress/fixtures/dataDownloadDialog/input.json b/ui/cypress/fixtures/dataDownloadDialog/input.json
index 59705f7af..b6b0dca8f 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/input.json
+++ b/ui/cypress/fixtures/dataDownloadDialog/input.json
@@ -2,4 +2,4 @@
 {"timestamp": 1623871500059, "v1": 4.2, "v2": "abc", "v3": false, "v4": 2},
 {"timestamp": 1623871507091, "v1": 4.3, "v4": 3},
 {"timestamp": 1623871508093, "v1": 4.4, "v2": "abc", "v3": true, "v4": 4},
-{"timestamp": 1623871508093, "v1": 4.5, "v4": 5}]
+{"timestamp": 1623871508095, "v1": 4.5, "v4": 5}]
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv b/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv
index b73f15230..474a7fd3d 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv
+++ b/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv
@@ -2,4 +2,5 @@ time,v1,v2,v3,v4
 1623871499055,4.099999904632568,abc,true,1.0
 1623871500059,4.199999809265137,abc,false,2.0
 1623871507091,4.300000190734863,,,3.0
-1623871508093,4.5,abc,true,5.0
+1623871508093,4.400000095367432,abc,true,4.0
+1623871508095,4.5,,,5.0
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv b/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv
index 402dabcac..f1ed0928e 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv
+++ b/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv
@@ -2,4 +2,5 @@ time;v1;v2;v3;v4
 1623871499055;4.099999904632568;abc;true;1.0
 1623871500059;4.199999809265137;abc;false;2.0
 1623871507091;4.300000190734863;;;3.0
-1623871508093;4.5;abc;true;5.0
+1623871508093;4.400000095367432;abc;true;4.0
+1623871508095;4.5;;;5.0
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testJson.json b/ui/cypress/fixtures/dataDownloadDialog/testJson.json
index 31f352cf4..d26278677 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testJson.json
+++ b/ui/cypress/fixtures/dataDownloadDialog/testJson.json
@@ -1 +1 @@
-[{"time": 1623871499055,"v1": 4.099999904632568,"v2": "abc","v3": true,"v4": 1.0},{"time": 1623871500059,"v1": 4.199999809265137,"v2": "abc","v3": false,"v4": 2.0},{"time": 1623871507091,"v1": 4.300000190734863,"v2": null,"v3": null,"v4": 3.0},{"time": 1623871508093,"v1": 4.5,"v2": "abc","v3": true,"v4": 5.0}]
+[{"time": 1623871499055,"v1": 4.099999904632568,"v2": "abc","v3": true,"v4": 1.0},{"time": 1623871500059,"v1": 4.199999809265137,"v2": "abc","v3": false,"v4": 2.0},{"time": 1623871507091,"v1": 4.300000190734863,"v2": null,"v3": null,"v4": 3.0},{"time": 1623871508093,"v1": 4.400000095367432,"v2": "abc","v3": true,"v4": 4.0},{"time": 1623871508095,"v1": 4.5,"v2": null,"v3": null,"v4": 5.0}]
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv b/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv
index a23984971..a7902e7ec 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv
+++ b/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv
@@ -1,3 +1,4 @@
 time;v1;v2;v3;v4
 1623871499055;4.099999904632568;abc;true;1.0
 1623871500059;4.199999809265137;abc;false;2.0
+1623871508093;4.400000095367432;abc;true;4.0
diff --git a/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts b/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
index e8e2a06e7..53b75ff31 100644
--- a/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
+++ b/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
@@ -31,8 +31,8 @@ describe('Test live data download dialog', () => {
   });
 
   beforeEach('Setup Test', () => {
-    cy.login();
     cy.removeDownloadDirectory();
+    cy.login();
   });
 
   const dataViewName = 'TestView';