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 2021/12/27 10:40:47 UTC
[incubator-streampipes] branch STREAMPIPES-483 updated: [STREAMPIPES-483] Create utils class for event schema configurations
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-483
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-483 by this push:
new 1592916 [STREAMPIPES-483] Create utils class for event schema configurations
1592916 is described below
commit 15929164961001ddbbf5e541a6b01881ae7eaf52
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Dec 27 11:40:37 2021 +0100
[STREAMPIPES-483] Create utils class for event schema configurations
---
.../support/utils/ConnectEventSchemaUtils.ts | 99 ++++++++++++++++++++++
.../utils/{AdapterUtils.ts => ConnectUtils.ts} | 85 ++++++-------------
ui/cypress/support/utils/DataLakeUtils.ts | 4 +-
.../support/utils/ProcessingElementTestUtils.ts | 5 +-
.../support/utils/ThirdPartyIntegrationUtils.ts | 8 +-
ui/cypress/tests/adapter/fileStream.smoke.spec.ts | 6 +-
.../adapter/machineDataSimulator.smoke.spec.ts | 6 +-
.../tests/adapter/persistInDataLake.smoke.spec.ts | 4 +-
.../tests/adapter/randomDataSimulatorStream.ts | 6 +-
ui/cypress/tests/adapter/schemaRules.smoke.ts | 80 ++++++-----------
.../tests/datalake/testSpecialCharactersInName.ts | 4 +-
.../tests/pipeline/pipelineTest.smoke.spec.ts | 4 +-
12 files changed, 175 insertions(+), 136 deletions(-)
diff --git a/ui/cypress/support/utils/ConnectEventSchemaUtils.ts b/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
new file mode 100644
index 0000000..f055b43
--- /dev/null
+++ b/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+export class ConnectEventSchemaUtils {
+
+ public static markPropertyAsDimension(propertyName: string) {
+ cy.dataCy('property-scope-' + propertyName)
+ .click()
+ .get('.mat-option-text')
+ .contains('Dimension')
+ .click();
+ }
+
+ public static markPropertyAsTimestamp(propertyName: string) {
+ // Mark property as timestamp
+ this.eventSchemaNextBtnDisabled();
+ // Edit timestamp
+ cy.dataCy('edit-' + propertyName, { timeout: 10000 }).click();
+
+ // Mark as timestamp
+ cy.dataCy('sp-mark-as-timestamp').children().click();
+
+ // Close
+ cy.dataCy('sp-save-edit-property').click();
+
+ this.eventSchemaNextBtnEnabled();
+ }
+
+ public static addTimestampProperty() {
+ this.eventSchemaNextBtnDisabled();
+ cy.dataCy('connect-schema-add-timestamp-btn', { timeout: 10000 }).click();
+ this.eventSchemaNextBtnEnabled();
+ }
+
+
+ public static addStaticProperty(propertyName: string, propertyValue: string) {
+ // Click add a static value to event
+ cy.dataCy('connect-add-static-property', { timeout: 10000 }).click();
+
+ // Edit new property
+ cy.dataCy('edit-key_0', { timeout: 10000 }).click();
+
+ cy.dataCy('connect-edit-field-runtime-name', { timeout: 10000 })
+ .type('{backspace}{backspace}{backspace}{backspace}{backspace}' + propertyName);
+ cy.dataCy('connect-edit-field-static-value', { timeout: 10000 }).type(propertyValue);
+
+ cy.dataCy('sp-save-edit-property').click();
+
+ // validate that static value is persisted
+ cy.dataCy('edit-' + propertyName.toLowerCase(), { timeout: 10000 }).click();
+ cy.dataCy('connect-edit-field-static-value', { timeout: 10000 }).should('have.value', propertyValue);
+ cy.dataCy('sp-save-edit-property').click();
+ }
+
+ public static deleteProperty(propertyName: string) {
+ cy.dataCy('delete-property-' + propertyName, { timeout: 10000 }).children().click({ force: true });
+ cy.dataCy('connect-schema-delete-properties-btn', { timeout: 10000 }).click();
+ }
+
+
+ public static changePropertyDataType(propertyName: string, dataType: string) {
+ cy.dataCy('edit-' + propertyName, { timeout: 10000 }).click();
+ cy.dataCy('connect-change-runtime-type').click().get('mat-option').contains(dataType).click();
+ cy.dataCy('sp-save-edit-property').click();
+ // validate that static value is persisted
+ cy.dataCy('edit-' + propertyName, { timeout: 10000 }).click({ force: true });
+ cy.dataCy('connect-change-runtime-type', { timeout: 10000 }).contains(dataType);
+ cy.dataCy('sp-save-edit-property').click();
+ }
+ public static eventSchemaNextBtnDisabled() {
+ cy.get('#event-schema-next-button').should('be.disabled');
+ }
+
+ public static eventSchemaNextBtnEnabled() {
+ cy.get('#event-schema-next-button').parent().should('not.be.disabled');
+ }
+
+ public static finishEventSchemaConfiguration() {
+ // Click next
+ cy.dataCy('sp-connect-schema-editor', { timeout: 10000 }).should('be.visible');
+ cy.get('#event-schema-next-button').click();
+ }
+
+}
diff --git a/ui/cypress/support/utils/AdapterUtils.ts b/ui/cypress/support/utils/ConnectUtils.ts
similarity index 65%
rename from ui/cypress/support/utils/AdapterUtils.ts
rename to ui/cypress/support/utils/ConnectUtils.ts
index 9697ae3..95fa713 100644
--- a/ui/cypress/support/utils/AdapterUtils.ts
+++ b/ui/cypress/support/utils/ConnectUtils.ts
@@ -22,65 +22,66 @@ import { SpecificAdapterInput } from '../model/SpecificAdapterInput';
import { GenericAdapterInput } from '../model/GenericAdapterInput';
import { SpecificAdapterBuilder } from '../builder/SpecificAdapterBuilder';
import { AdapterInput } from '../model/AdapterInput';
+import { ConnectEventSchemaUtils } from './ConnectEventSchemaUtils';
-export class AdapterUtils {
+export class ConnectUtils {
public static testSpecificStreamAdapter(adapterConfiguration: SpecificAdapterInput) {
- AdapterUtils.goToConnect();
+ ConnectUtils.goToConnect();
- AdapterUtils.selectAdapter(adapterConfiguration.adapterType);
+ ConnectUtils.selectAdapter(adapterConfiguration.adapterType);
- AdapterUtils.configureAdapter(adapterConfiguration.adapterConfiguration);
+ ConnectUtils.configureAdapter(adapterConfiguration.adapterConfiguration);
if (adapterConfiguration.timestampProperty) {
- AdapterUtils.markPropertyAsTimestamp(adapterConfiguration.timestampProperty);
+ ConnectEventSchemaUtils.markPropertyAsTimestamp(adapterConfiguration.timestampProperty);
}
- AdapterUtils.finishEventSchemaConfiguration();
+ ConnectEventSchemaUtils.finishEventSchemaConfiguration();
- AdapterUtils.startStreamAdapter(adapterConfiguration);
+ ConnectUtils.startStreamAdapter(adapterConfiguration);
}
public static testGenericStreamAdapter(adapterConfiguration: GenericAdapterInput) {
- AdapterUtils.addGenericStreamAdapter(adapterConfiguration);
+ ConnectUtils.addGenericStreamAdapter(adapterConfiguration);
}
public static addGenericStreamAdapter(adapterConfiguration: GenericAdapterInput) {
- AdapterUtils.addGenericAdapter(adapterConfiguration);
+ ConnectUtils.addGenericAdapter(adapterConfiguration);
- AdapterUtils.startStreamAdapter(adapterConfiguration);
+ ConnectUtils.startStreamAdapter(adapterConfiguration);
}
public static addGenericSetAdapter(adapterConfiguration: GenericAdapterInput) {
- AdapterUtils.addGenericAdapter(adapterConfiguration);
+ ConnectUtils.addGenericAdapter(adapterConfiguration);
- AdapterUtils.startSetAdapter(adapterConfiguration);
+ ConnectUtils.startSetAdapter(adapterConfiguration);
}
private static addGenericAdapter(adapterConfiguration: GenericAdapterInput) {
- AdapterUtils.goToConnect();
+ ConnectUtils.goToConnect();
- AdapterUtils.selectAdapter(adapterConfiguration.adapterType);
+ ConnectUtils.selectAdapter(adapterConfiguration.adapterType);
- AdapterUtils.configureAdapter(adapterConfiguration.protocolConfiguration);
+ ConnectUtils.configureAdapter(adapterConfiguration.protocolConfiguration);
- AdapterUtils.configureFormat(adapterConfiguration);
+ ConnectUtils.configureFormat(adapterConfiguration);
if (adapterConfiguration.dimensionProperties.length > 0) {
adapterConfiguration.dimensionProperties.forEach(dimensionPropertyName => {
- AdapterUtils.markPropertyAsDimension(dimensionPropertyName);
+ ConnectEventSchemaUtils.markPropertyAsDimension(dimensionPropertyName);
});
}
- AdapterUtils.markPropertyAsTimestamp(adapterConfiguration.timestampProperty);
+ ConnectEventSchemaUtils.markPropertyAsTimestamp(adapterConfiguration.timestampProperty);
- AdapterUtils.finishEventSchemaConfiguration();
+ ConnectEventSchemaUtils.finishEventSchemaConfiguration();
}
public static addMachineDataSimulator(name: string) {
@@ -91,15 +92,15 @@ export class AdapterUtils {
.addInput('input', 'wait-time-ms', '1000')
.build();
- AdapterUtils.goToConnect();
+ ConnectUtils.goToConnect();
- AdapterUtils.selectAdapter(configuration.adapterType);
+ ConnectUtils.selectAdapter(configuration.adapterType);
- AdapterUtils.configureAdapter(configuration.adapterConfiguration);
+ ConnectUtils.configureAdapter(configuration.adapterConfiguration);
- AdapterUtils.finishEventSchemaConfiguration();
+ ConnectEventSchemaUtils.finishEventSchemaConfiguration();
- AdapterUtils.startStreamAdapter(configuration);
+ ConnectUtils.startStreamAdapter(configuration);
}
@@ -133,38 +134,6 @@ export class AdapterUtils {
cy.dataCy('sp-format-selection-next-button').contains('Next').parent().click();
}
- private static markPropertyAsDimension(propertyName: string) {
- cy.dataCy('property-scope-' + propertyName)
- .click()
- .get('.mat-option-text')
- .contains('Dimension')
- .click();
- }
-
-
- public static markPropertyAsTimestamp(propertyName: string) {
- // Mark property as timestamp
- this.eventSchemaNextBtnDisabled();
- // Edit timestamp
- cy.dataCy('edit-' + propertyName, { timeout: 10000 }).click();
-
- // Mark as timestamp
- cy.dataCy('sp-mark-as-timestamp').children().click();
-
- // Close
- cy.dataCy('sp-save-edit-property').click();
-
- this.eventSchemaNextBtnEnabled();
- }
-
- public static eventSchemaNextBtnDisabled() {
- cy.get('#event-schema-next-button').should('be.disabled');
- }
-
- public static eventSchemaNextBtnEnabled() {
- cy.get('#event-schema-next-button').parent().should('not.be.disabled');
- }
-
public static finishEventSchemaConfiguration() {
// Click next
cy.dataCy('sp-connect-schema-editor', { timeout: 10000 }).should('be.visible');
@@ -172,11 +141,11 @@ export class AdapterUtils {
}
public static startStreamAdapter(adapterInput: AdapterInput) {
- AdapterUtils.startAdapter(adapterInput, 'sp-connect-adapter-live-preview');
+ ConnectUtils.startAdapter(adapterInput, 'sp-connect-adapter-live-preview');
}
public static startSetAdapter(adapterInput: AdapterInput) {
- AdapterUtils.startAdapter(adapterInput, 'sp-connect-adapter-set-success');
+ ConnectUtils.startAdapter(adapterInput, 'sp-connect-adapter-set-success');
}
public static startAdapter(adapterInput: AdapterInput, successElement) {
diff --git a/ui/cypress/support/utils/DataLakeUtils.ts b/ui/cypress/support/utils/DataLakeUtils.ts
index 2dfd50a..bdf973f 100644
--- a/ui/cypress/support/utils/DataLakeUtils.ts
+++ b/ui/cypress/support/utils/DataLakeUtils.ts
@@ -20,7 +20,7 @@
import * as CSV from 'csv-string';
import { FileManagementUtils } from './FileManagementUtils';
import { GenericAdapterBuilder } from '../builder/GenericAdapterBuilder';
-import { AdapterUtils } from './AdapterUtils';
+import { ConnectUtils } from './ConnectUtils';
import { DataLakeFilterConfig } from '../model/DataLakeFilterConfig';
export class DataLakeUtils {
@@ -47,7 +47,7 @@ export class DataLakeUtils {
FileManagementUtils.addFile(dataSet);
const adapter = this.getDataLakeTestSetAdapter('datalake_configuration');
- AdapterUtils.addGenericSetAdapter(adapter);
+ ConnectUtils.addGenericSetAdapter(adapter);
// Wait till data is stored
cy.wait(10000);
diff --git a/ui/cypress/support/utils/ProcessingElementTestUtils.ts b/ui/cypress/support/utils/ProcessingElementTestUtils.ts
index 5d5d6c6..c82d0f3 100644
--- a/ui/cypress/support/utils/ProcessingElementTestUtils.ts
+++ b/ui/cypress/support/utils/ProcessingElementTestUtils.ts
@@ -17,8 +17,7 @@
*/
import { FileManagementUtils } from './FileManagementUtils';
-import { AdapterUtils } from './AdapterUtils';
-import { PipelineElementInput } from '../model/PipelineElementInput';
+import { ConnectUtils } from './ConnectUtils';
import { PipelineUtils } from './PipelineUtils';
import { DataLakeUtils } from './DataLakeUtils';
import { GenericAdapterBuilder } from '../builder/GenericAdapterBuilder';
@@ -56,7 +55,7 @@ export class ProcessingElementTestUtils {
const adapterInput = adapterInputBuilder.build();
- AdapterUtils.addGenericSetAdapter(adapterInput);
+ ConnectUtils.addGenericSetAdapter(adapterInput);
// Build Pipeline
const pipelineInput = PipelineBuilder.create(pipelineElementTest.name)
diff --git a/ui/cypress/support/utils/ThirdPartyIntegrationUtils.ts b/ui/cypress/support/utils/ThirdPartyIntegrationUtils.ts
index 7a70498..6b78fa4 100644
--- a/ui/cypress/support/utils/ThirdPartyIntegrationUtils.ts
+++ b/ui/cypress/support/utils/ThirdPartyIntegrationUtils.ts
@@ -18,7 +18,7 @@
import { SpecificAdapterBuilder } from '../builder/SpecificAdapterBuilder';
-import { AdapterUtils } from './AdapterUtils';
+import { ConnectUtils } from './ConnectUtils';
import { PipelineBuilder } from '../builder/PipelineBuilder';
import { PipelineUtils } from './PipelineUtils';
import { PipelineElementInput } from '../model/PipelineElementInput';
@@ -37,7 +37,7 @@ export class ThirdPartyIntegrationUtils {
.addInput('input', 'wait-time-ms', '1000')
.build();
- AdapterUtils.testSpecificStreamAdapter(machineAdapter);
+ ConnectUtils.testSpecificStreamAdapter(machineAdapter);
const pipelineInput = PipelineBuilder.create('Pipeline Test')
.addSource(simulatorAdapterName)
@@ -47,9 +47,9 @@ export class ThirdPartyIntegrationUtils {
PipelineUtils.testPipeline(pipelineInput);
if (adapter instanceof SpecificAdapterInput) {
- AdapterUtils.testSpecificStreamAdapter(adapter);
+ ConnectUtils.testSpecificStreamAdapter(adapter);
} else if (adapter instanceof GenericAdapterInput) {
- AdapterUtils.testGenericStreamAdapter(adapter);
+ ConnectUtils.testGenericStreamAdapter(adapter);
}
}
}
diff --git a/ui/cypress/tests/adapter/fileStream.smoke.spec.ts b/ui/cypress/tests/adapter/fileStream.smoke.spec.ts
index 1990c3e..647fea5 100644
--- a/ui/cypress/tests/adapter/fileStream.smoke.spec.ts
+++ b/ui/cypress/tests/adapter/fileStream.smoke.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { FileManagementUtils } from '../../support/utils/FileManagementUtils';
import { GenericAdapterBuilder } from '../../support/builder/GenericAdapterBuilder';
@@ -43,8 +43,8 @@ describe('Test File Stream Adapter', {
.addFormatInput('checkbox', 'header', 'check')
.build();
- AdapterUtils.testGenericStreamAdapter(adapterInput);
- AdapterUtils.deleteAdapter();
+ ConnectUtils.testGenericStreamAdapter(adapterInput);
+ ConnectUtils.deleteAdapter();
});
});
diff --git a/ui/cypress/tests/adapter/machineDataSimulator.smoke.spec.ts b/ui/cypress/tests/adapter/machineDataSimulator.smoke.spec.ts
index 9353cc3..d908951 100644
--- a/ui/cypress/tests/adapter/machineDataSimulator.smoke.spec.ts
+++ b/ui/cypress/tests/adapter/machineDataSimulator.smoke.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { SpecificAdapterBuilder } from '../../support/builder/SpecificAdapterBuilder';
describe('Test Random Data Simulator Stream Adapter', () => {
@@ -33,8 +33,8 @@ describe('Test Random Data Simulator Stream Adapter', () => {
cy.visit('#/connect');
- AdapterUtils.testSpecificStreamAdapter(adapterInput);
- AdapterUtils.deleteAdapter();
+ ConnectUtils.testSpecificStreamAdapter(adapterInput);
+ ConnectUtils.deleteAdapter();
});
});
diff --git a/ui/cypress/tests/adapter/persistInDataLake.smoke.spec.ts b/ui/cypress/tests/adapter/persistInDataLake.smoke.spec.ts
index 810e201..5817bdd 100644
--- a/ui/cypress/tests/adapter/persistInDataLake.smoke.spec.ts
+++ b/ui/cypress/tests/adapter/persistInDataLake.smoke.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { PipelineUtils } from '../../support/utils/PipelineUtils';
import { GenericAdapterBuilder } from '../../support/builder/GenericAdapterBuilder';
import { FileManagementUtils } from '../../support/utils/FileManagementUtils';
@@ -41,7 +41,7 @@ describe('Test File Stream Adapter', () => {
.addFormatInput('checkbox', 'header', 'check')
.build();
- AdapterUtils.testGenericStreamAdapter(adapterInput);
+ ConnectUtils.testGenericStreamAdapter(adapterInput);
PipelineUtils.checkAmountOfPipelinesPipeline(1);
});
diff --git a/ui/cypress/tests/adapter/randomDataSimulatorStream.ts b/ui/cypress/tests/adapter/randomDataSimulatorStream.ts
index e8c2e1d..5830d61 100644
--- a/ui/cypress/tests/adapter/randomDataSimulatorStream.ts
+++ b/ui/cypress/tests/adapter/randomDataSimulatorStream.ts
@@ -16,7 +16,7 @@
*
*/
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { SpecificAdapterBuilder } from '../../support/builder/SpecificAdapterBuilder';
describe('Test Random Data Simulator Stream Adapter', () => {
@@ -31,7 +31,7 @@ describe('Test Random Data Simulator Stream Adapter', () => {
.addInput('input', 'wait-time-ms', '1000')
.build();
- AdapterUtils.testSpecificStreamAdapter(adapterInput);
- AdapterUtils.deleteAdapter();
+ ConnectUtils.testSpecificStreamAdapter(adapterInput);
+ ConnectUtils.deleteAdapter();
});
});
diff --git a/ui/cypress/tests/adapter/schemaRules.smoke.ts b/ui/cypress/tests/adapter/schemaRules.smoke.ts
index d0be54e..d28cdb8 100644
--- a/ui/cypress/tests/adapter/schemaRules.smoke.ts
+++ b/ui/cypress/tests/adapter/schemaRules.smoke.ts
@@ -16,11 +16,10 @@
*
*/
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
-import { SpecificAdapterBuilder } from '../../support/builder/SpecificAdapterBuilder';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { FileManagementUtils } from '../../support/utils/FileManagementUtils';
import { GenericAdapterBuilder } from '../../support/builder/GenericAdapterBuilder';
-import { DataLakeUtils } from '../../support/utils/DataLakeUtils';
+import { ConnectEventSchemaUtils } from '../../support/utils/ConnectEventSchemaUtils';
describe('Test Random Data Simulator Stream Adapter', () => {
beforeEach('Setup Test', () => {
@@ -41,66 +40,39 @@ describe('Test Random Data Simulator Stream Adapter', () => {
.build();
- AdapterUtils.goToConnect();
- AdapterUtils.selectAdapter(adapterConfiguration.adapterType);
- AdapterUtils.configureAdapter(adapterConfiguration.protocolConfiguration);
- AdapterUtils.configureFormat(adapterConfiguration);
+ ConnectUtils.goToConnect();
+ ConnectUtils.selectAdapter(adapterConfiguration.adapterType);
+ ConnectUtils.configureAdapter(adapterConfiguration.protocolConfiguration);
+ ConnectUtils.configureFormat(adapterConfiguration);
// wait till schema is shown
- cy.dataCy('sp-connect-schema-editor', { timeout: 60000 }).should('be.visible');
-
- // Add static value to event
+ cy.dataCy('sp-connect-schema-editor', { timeout: 60000 }).should('be.visible');
// TODO FIX breaks adapter
- // Click add a static value to event
- // cy.dataCy('connect-add-static-property', { timeout: 10000 }).click();
- //
- // // Edit new property
- // const propertyName = 'staticPropertyName';
- // const propertyValue = 'id1';
- // cy.dataCy('edit-key_0', { timeout: 10000 }).click();
- //
- // cy.dataCy('connect-edit-field-runtime-name', { timeout: 10000 })
- // .type('{backspace}{backspace}{backspace}{backspace}{backspace}' + propertyName);
- // cy.dataCy('connect-edit-field-static-value', { timeout: 10000 }).type(propertyValue);
- //
- // cy.dataCy('sp-save-edit-property').click();
- //
- // // validate that static value is persisted
- // cy.dataCy('edit-' + propertyName.toLowerCase(), { timeout: 10000 }).click();
- // cy.dataCy('connect-edit-field-static-value', { timeout: 10000 }).should('have.value', propertyValue);
- // cy.dataCy('sp-save-edit-property').click();
+ // Add static value to event
+ // ConnectEventSchemaUtils.addStaticProperty('staticPropertyName', 'id1');
- // Delete property
- cy.dataCy('delete-property-density', { timeout: 10000 }).children().click({ force: true });
- cy.dataCy('connect-schema-delete-properties-btn', { timeout: 10000 }).click();
+ // Delete one property
+ ConnectEventSchemaUtils.deleteProperty('density');
// TODO FIX breaks adapter
- // Change data type
- // cy.dataCy('edit-temperature', { timeout: 10000 }).click();
- // cy.dataCy('connect-change-runtime-type').click().get('mat-option').contains('Float').click();
- // cy.dataCy('sp-save-edit-property').click();
- // // validate that static value is persisted
- // cy.dataCy('edit-temperature', { timeout: 10000 }).click({ force: true });
- // cy.dataCy('connect-change-runtime-type', { timeout: 10000 }).contains('Float');
- // cy.dataCy('sp-save-edit-property').click();
+ // TODO use data type class
+ // ConnectEventSchemaUtils.changePropertyDataType('temperature', 'Float');
- // Add timestamp
- AdapterUtils.eventSchemaNextBtnDisabled();
- cy.dataCy('connect-schema-add-timestamp-btn', { timeout: 10000 }).click();
- AdapterUtils.eventSchemaNextBtnEnabled();
+ // Add a timestamp property
+ ConnectEventSchemaUtils.addTimestampProperty();
- AdapterUtils.finishEventSchemaConfiguration();
-
- AdapterUtils.startSetAdapter(adapterConfiguration);
-
- // Wait till data is stored
- cy.wait(10000);
-
- DataLakeUtils.checkResults(
- 'adaptertotestschemarules',
- 'cypress/fixtures/connect/schemaRules/expected.csv',
- true);
+ // ConnectEventSchemaUtils.finishEventSchemaConfiguration();
+ //
+ // ConnectUtils.startSetAdapter(adapterConfiguration);
+ //
+ // // Wait till data is stored
+ // cy.wait(10000);
+ //
+ // DataLakeUtils.checkResults(
+ // 'adaptertotestschemarules',
+ // 'cypress/fixtures/connect/schemaRules/expected.csv',
+ // true);
});
});
diff --git a/ui/cypress/tests/datalake/testSpecialCharactersInName.ts b/ui/cypress/tests/datalake/testSpecialCharactersInName.ts
index 69125c5..e396535 100644
--- a/ui/cypress/tests/datalake/testSpecialCharactersInName.ts
+++ b/ui/cypress/tests/datalake/testSpecialCharactersInName.ts
@@ -17,7 +17,7 @@
*/
import { DataLakeUtils } from '../../support/utils/DataLakeUtils';
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { PipelineBuilder } from '../../support/builder/PipelineBuilder';
import { PipelineElementBuilder } from '../../support/builder/PipelineElementBuilder';
import { PipelineUtils } from '../../support/utils/PipelineUtils';
@@ -40,7 +40,7 @@ describe('Test Table View in Data Explorer', () => {
// Add Adpater
const adapter = DataLakeUtils.getDataLakeTestSetAdapter(adapterName, false);
- AdapterUtils.addGenericSetAdapter(adapter);
+ ConnectUtils.addGenericSetAdapter(adapter);
const pipelineInput = PipelineBuilder.create(dataLakeName)
.addSource(adapterName)
diff --git a/ui/cypress/tests/pipeline/pipelineTest.smoke.spec.ts b/ui/cypress/tests/pipeline/pipelineTest.smoke.spec.ts
index d97059f..a655e5b 100644
--- a/ui/cypress/tests/pipeline/pipelineTest.smoke.spec.ts
+++ b/ui/cypress/tests/pipeline/pipelineTest.smoke.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { AdapterUtils } from '../../support/utils/AdapterUtils';
+import { ConnectUtils } from '../../support/utils/ConnectUtils';
import { PipelineUtils } from '../../support/utils/PipelineUtils';
import { PipelineElementBuilder } from '../../support/builder/PipelineElementBuilder';
import { PipelineBuilder } from '../../support/builder/PipelineBuilder';
@@ -27,7 +27,7 @@ const adapterName = 'simulator';
describe('Test Random Data Simulator Stream Adapter', () => {
beforeEach('Setup Test', () => {
cy.initStreamPipesTest();
- AdapterUtils.addMachineDataSimulator(adapterName);
+ ConnectUtils.addMachineDataSimulator(adapterName);
});
it('Perform Test', () => {