added Utils

apache · Nov 16, 2023 · ea5529c · ea5529c
1 parent 27dac13
commit ea5529c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 155 deletions.
diff --git a/ui/cypress/support/utils/datalake/DataLakeUtils.ts b/ui/cypress/support/utils/datalake/DataLakeUtils.ts
@@ -30,6 +30,11 @@ export class DataLakeUtils {
         cy.visit('#/dataexplorer');
     }
 
+    public static initDataLakeTests() {
+        cy.initStreamPipesTest();
+        DataLakeUtils.loadRandomDataSetIntoDataLake();
+    }
+
     public static getDataLakeTestSetAdapter(
         name: string,
         storeInDataLake: boolean = true,
@@ -88,7 +93,7 @@ export class DataLakeUtils {
         DataLakeUtils.createAndEditDataView(dataViewName);
 
         DataLakeUtils.selectTimeRange(
-            new Date(2015, 10, 20, 22, 44),
+            new Date(2020, 10, 20, 22, 44),
             DataLakeUtils.getFutureDate(),
         );
         // DataLakeUtils.addNewWidget();
@@ -342,20 +347,4 @@ export class DataLakeUtils {
 
         return currentDate;
     }
-
-    public static addFilter(field: string, operator: string, value: string) {
-        DataLakeUtils.selectDataConfig();
-        cy.dataCy('design-panel-data-settings-add-filter').click();
-        cy.dataCy('design-panel-data-settings-filter-field')
-            .click()
-            .get('mat-option')
-            .contains(field)
-            .click();
-        cy.dataCy('design-panel-data-settings-filter-operator')
-            .click()
-            .get('mat-option')
-            .contains(operator)
-            .click();
-        cy.dataCy('design-panel-data-settings-filter-value').type(value);
-    }
 }
diff --git a/ui/cypress/tests/datalake/widgets/2d-correlation.spec.ts b/ui/cypress/tests/datalake/widgets/2d-correlation.spec.ts
@@ -20,31 +20,11 @@ import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
 
 describe('Test 2d Correlation View in Data Explorer', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
     });
 
     it('Perform Test', () => {
-        DataLakeUtils.goToDatalake();
-
-        DataLakeUtils.createAndEditDataView('view');
-
-        DataLakeUtils.addNewWidget();
-
-        DataLakeUtils.selectDataSet('Persist');
-
-        DataLakeUtils.dataConfigSelectAllFields();
-
-        DataLakeUtils.selectVisualizationConfig();
-
-        DataLakeUtils.selectVisualizationType('2D Correlation');
-
-        DataLakeUtils.clickCreateButton();
-
-        DataLakeUtils.selectTimeRange(
-            new Date(2020, 10, 20, 22, 44),
-            DataLakeUtils.getFutureDate(),
-        );
+        DataLakeUtils.addDataViewAndWidget('view', 'Persist', '2D Correlation');
 
         // Check if scatter plot is displayed
         cy.get('g').should('have.class', 'scatterlayer mlayer');

diff --git a/ui/cypress/tests/datalake/widgets/distribution.spec.ts b/ui/cypress/tests/datalake/widgets/distribution.spec.ts
@@ -20,37 +20,17 @@ import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
 
 describe('Test Distribution View in Data Explorer', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
     });
 
     it('Perform Test', () => {
-        DataLakeUtils.goToDatalake();
-
-        DataLakeUtils.createAndEditDataView('view');
-
-        DataLakeUtils.addNewWidget();
-
-        DataLakeUtils.selectDataSet('Persist');
-
-        DataLakeUtils.dataConfigSelectAllFields();
-
-        DataLakeUtils.selectVisualizationConfig();
-
-        DataLakeUtils.selectVisualizationType('Distribution');
+        DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Distribution');
 
         // Change field for histogram
         DataLakeUtils.selectVisualizationConfig();
         cy.get('div').contains('randomtext (prepared_data #1)').click();
         cy.get('div').contains('randomnumber (prepared_data #1)').click();
 
-        DataLakeUtils.clickCreateButton();
-
-        DataLakeUtils.selectTimeRange(
-            new Date(2020, 10, 20, 22, 44),
-            DataLakeUtils.getFutureDate(),
-        );
-
         // Check if distribution chart is displayed
         cy.get('sp-data-explorer-distribution-chart-widget').should(
             'be.visible',

diff --git a/ui/cypress/tests/datalake/widgets/heatmap.spec.ts b/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
@@ -20,35 +20,16 @@ import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
 
 describe('Test Heatmap View in Data Explorer', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
     });
 
     it('Perform Test', () => {
-        DataLakeUtils.goToDatalake();
-
-        DataLakeUtils.createAndEditDataView('view');
-
-        DataLakeUtils.addNewWidget();
-
-        DataLakeUtils.selectDataSet('Persist');
-
-        DataLakeUtils.dataConfigSelectAllFields();
-
-        DataLakeUtils.selectVisualizationConfig();
-
-        DataLakeUtils.selectVisualizationType('Heatmap');
+        DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Heatmap');
 
         // Check checkbox
+        DataLakeUtils.selectVisualizationConfig();
         cy.get('mat-checkbox input').click({ force: true });
 
-        DataLakeUtils.clickCreateButton();
-
-        DataLakeUtils.selectTimeRange(
-            new Date(2020, 10, 20, 22, 44),
-            DataLakeUtils.getFutureDate(),
-        );
-
         // Check if heatmap chart is visible
         cy.get('sp-data-explorer-heatmap-widget').should('be.visible');
     });

diff --git a/ui/cypress/tests/datalake/widgets/indicator.spec.ts b/ui/cypress/tests/datalake/widgets/indicator.spec.ts
@@ -20,40 +20,21 @@ import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
 
 describe('Test Indicator View in Data Explorer', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
     });
 
     it('Perform Test', () => {
-        DataLakeUtils.goToDatalake();
-
-        DataLakeUtils.createAndEditDataView('view');
-
-        DataLakeUtils.addNewWidget();
-
-        DataLakeUtils.selectDataSet('Persist');
-
-        DataLakeUtils.dataConfigSelectAllFields();
-
-        DataLakeUtils.selectVisualizationConfig();
-
-        DataLakeUtils.selectVisualizationType('Indicator');
+        DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Indicator');
 
         // Check checkbox
+        DataLakeUtils.selectVisualizationConfig();
         cy.get('mat-checkbox input').click({ force: true });
         cy.dataCy('data-explorer-select-delta-field')
             .click()
             .get('mat-option')
             .contains('count')
             .click();
 
-        DataLakeUtils.clickCreateButton();
-
-        DataLakeUtils.selectTimeRange(
-            new Date(2020, 10, 20, 22, 44),
-            DataLakeUtils.getFutureDate(),
-        );
-
         // Check if indicator is displayed
         cy.get('g').should('have.class', 'indicatorlayer');
         // Check if delta is displayed

diff --git a/ui/cypress/tests/datalake/widgets/map.spec.ts b/ui/cypress/tests/datalake/widgets/map.spec.ts
@@ -20,24 +20,11 @@ import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
 
 describe('Test Map View in Data Explorer', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
     });
 
     it('Perform Test', () => {
-        DataLakeUtils.goToDatalake();
-
-        DataLakeUtils.createAndEditDataView('view');
-
-        DataLakeUtils.addNewWidget();
-
-        DataLakeUtils.selectDataSet('Persist');
-
-        DataLakeUtils.dataConfigSelectAllFields();
-
-        DataLakeUtils.selectVisualizationConfig();
-
-        DataLakeUtils.selectVisualizationType('Map');
+        DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Map');
 
         // Change marker positions
         DataLakeUtils.selectVisualizationConfig();
@@ -51,12 +38,6 @@ describe('Test Map View in Data Explorer', () => {
             .get('mat-option')
             .contains('randomnumber (prepared_data #1)')
             .click();
-        DataLakeUtils.clickCreateButton();
-
-        DataLakeUtils.selectTimeRange(
-            new Date(2020, 10, 20, 22, 44),
-            DataLakeUtils.getFutureDate(),
-        );
 
         // Check if map with markers is visible
         cy.get('sp-data-explorer-map-widget').should('be.visible');

diff --git a/ui/cypress/tests/datalake/widgets/table.spec.ts b/ui/cypress/tests/datalake/widgets/table.spec.ts
@@ -20,31 +20,11 @@ import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
 
 describe('Test Table View in Data Explorer', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
     });
 
     it('Perform Test', () => {
-        DataLakeUtils.goToDatalake();
-
-        DataLakeUtils.createAndEditDataView('view');
-
-        DataLakeUtils.addNewWidget();
-
-        DataLakeUtils.selectDataSet('Persist');
-
-        DataLakeUtils.dataConfigSelectAllFields();
-
-        DataLakeUtils.selectVisualizationConfig();
-
-        DataLakeUtils.selectVisualizationType('Table');
-
-        DataLakeUtils.clickCreateButton();
-
-        DataLakeUtils.selectTimeRange(
-            new Date(2020, 10, 20, 22, 44),
-            DataLakeUtils.getFutureDate(),
-        );
+        DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Table');
 
         // Check if table is displayed correctly
         cy.dataCy('data-explorer-table-row-timestamp', {

diff --git a/ui/cypress/tests/datalake/widgets/timeSeriesSave.spec.ts b/ui/cypress/tests/datalake/widgets/timeSeriesSave.spec.ts
@@ -24,8 +24,7 @@ const dataSet = 'Persist';
 
 describe('Test if widget configuration is updated correctly', () => {
     beforeEach('Setup Test', () => {
-        cy.initStreamPipesTest();
-        DataLakeUtils.loadRandomDataSetIntoDataLake();
+        DataLakeUtils.initDataLakeTests();
 
         // Create first test data view with one time series widget
         DataLakeUtils.addDataViewAndTimeSeriesWidget(testView1, dataSet);
@@ -72,9 +71,4 @@ const runTestCase = (editOption: boolean) => {
 
     // Check if bar plot is displayed
     cy.get('g').should('have.class', 'barlayer mlayer');
-
-    // Validate that filter works and displays correct amount of data points
-    DataLakeUtils.addFilter('count', '>=', '125');
-    cy.dataCy('reload-data-view-button').click();
-    cy.get('g.point', { timeout: 10000 }).should('have.length', 7);
 };