Skip to content

Commit

Permalink
Rename to assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
@qn895
qn895 committed Feb 14, 2023
1 parent 27323ff commit 69d124f
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 70 deletions.
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export default function ({ getService }: FtrProviderContext) {
for (const { fieldName, type: fieldType } of testData.fieldStatsEntries.filter(
(e) => e.isDependentVariableInput
)) {
await ml.dataFrameAnalyticsCreation.clickDependentVariableInputFieldStatTrigger(
await ml.dataFrameAnalyticsCreation.assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
fieldName,
fieldType
);
Expand Down
34 changes: 10 additions & 24 deletions x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,20 +330,13 @@ export default function ({ getService }: FtrProviderContext) {
for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
(e) => e.isDependentVariableInput
)) {
await ml.dataFrameAnalyticsCreation.clickDependentVariableInputFieldStatTrigger(
await ml.dataFrameAnalyticsCreation.assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
fieldName,
fieldType
fieldType,
testData.expected.fieldStatsValues && fieldName in testData.expected.fieldStatsValues
? (testData.expected.fieldStatsValues[fieldName] as string[])
: undefined
);
if (
testData.expected.fieldStatsValues &&
fieldName in testData.expected.fieldStatsValues
) {
await ml.dataFrameAnalyticsCreation.assertFieldStatTopValuesContent(
fieldName,
fieldType,
testData.expected.fieldStatsValues[fieldName] as string[]
);
}
}

await ml.testExecution.logTestStep('inputs the dependent variable');
Expand All @@ -363,20 +356,13 @@ export default function ({ getService }: FtrProviderContext) {
for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
(e) => e.isIncludeFieldInput
)) {
await ml.dataFrameAnalyticsCreation.clickIncludeFieldsInputFieldStatTrigger(
await ml.dataFrameAnalyticsCreation.assertFieldStatFlyoutContentFromIncludeFieldTrigger(
fieldName,
fieldType
fieldType,
testData.expected.fieldStatsValues && fieldName in testData.expected.fieldStatsValues
? (testData.expected.fieldStatsValues[fieldName] as string[])
: undefined
);
if (
testData.expected.fieldStatsValues &&
fieldName in testData.expected.fieldStatsValues
) {
await ml.dataFrameAnalyticsCreation.assertFieldStatTopValuesContent(
fieldName,
fieldType,
testData.expected.fieldStatsValues[fieldName] as string[]
);
}
}

await ml.testExecution.logTestStep('continues to the additional options step');
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export default function ({ getService }: FtrProviderContext) {
for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
(e) => e.isIncludeFieldInput
)) {
await ml.dataFrameAnalyticsCreation.clickIncludeFieldsInputFieldStatTrigger(
await ml.dataFrameAnalyticsCreation.assertFieldStatFlyoutContentFromIncludeFieldTrigger(
fieldName,
fieldType
);
Expand Down
6 changes: 3 additions & 3 deletions x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
isIncludeFieldInput: true,
},
{
fieldName: 'p3',
fieldName: 'g2',
type: 'number' as FieldStatsType,
isIncludeFieldInput: true,
},
Expand Down Expand Up @@ -155,7 +155,7 @@ export default function ({ getService }: FtrProviderContext) {
for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
(e) => e.isDependentVariableInput
)) {
await ml.dataFrameAnalyticsCreation.clickDependentVariableInputFieldStatTrigger(
await ml.dataFrameAnalyticsCreation.assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
fieldName,
fieldType
);
Expand All @@ -178,7 +178,7 @@ export default function ({ getService }: FtrProviderContext) {
for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
(e) => e.isIncludeFieldInput
)) {
await ml.dataFrameAnalyticsCreation.clickIncludeFieldsInputFieldStatTrigger(
await ml.dataFrameAnalyticsCreation.assertFieldStatFlyoutContentFromIncludeFieldTrigger(
fieldName,
fieldType
);
Expand Down
20 changes: 16 additions & 4 deletions x-pack/test/functional/apps/transform/creation/index_pattern/creation_index_pattern.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
: [];

for (const { fieldName, type } of groupByFieldStatsEntries) {
await transform.wizard.clickGroupByInputFieldStatTrigger(fieldName, type);
await transform.wizard.assertFieldStatFlyoutContentFromGroupByInputTrigger(
fieldName,
type
);
}

for (const [index, entry] of testData.groupByEntries.entries()) {
Expand All @@ -626,7 +629,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
: [];

for (const { fieldName, type } of aggInputFieldStatsEntries) {
await transform.wizard.clickAggInputFieldStatTrigger(fieldName, type);
await transform.wizard.assertFieldStatFlyoutContentFromAggInputTrigger(
fieldName,
type
);
}

await transform.testExecution.logTestStep('adds the aggregation entries');
Expand Down Expand Up @@ -655,7 +661,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
: [];

for (const { fieldName, type } of uniqueKeyInputFieldStatsEntries) {
await transform.wizard.clickUniqueKeysInputFieldStatTrigger(fieldName, type);
await transform.wizard.assertFieldStatsFlyoutContentFromUniqueKeysInputTrigger(
fieldName,
type
);
}

await transform.testExecution.logTestStep('adds unique keys');
Expand All @@ -673,7 +682,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
: [];

for (const { fieldName, type } of sortFieldInputFieldStatsEntries) {
await transform.wizard.clickSortFieldInputFieldStatTrigger(fieldName, type);
await transform.wizard.assertFieldStatFlyoutContentFromSortFieldInputTrigger(
fieldName,
type
);
}

await transform.testExecution.logTestStep('sets the sort field');
Expand Down
27 changes: 13 additions & 14 deletions x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,16 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
});
},

async clickIncludeFieldsInputFieldStatTrigger(
async assertFieldStatFlyoutContentFromIncludeFieldTrigger(
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number',
expectedContent?: string[]
) {
await mlFieldStatsFlyout.clickFieldStatTrigger(
await mlFieldStatsFlyout.assertFieldStatFlyoutContentFromTrigger(
'mlAnalyticsCreateJobWizardIncludesSelect',
fieldName,
fieldType
fieldType,
expectedContent
);
},

Expand Down Expand Up @@ -268,14 +270,16 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
});
},

async clickDependentVariableInputFieldStatTrigger(
async assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number',
expectedContent?: string[]
) {
await mlFieldStatsFlyout.clickFieldStatComboBoxTrigger(
await mlFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
'mlAnalyticsCreateJobWizardDependentVariableSelect loaded',
fieldName,
fieldType
fieldType,
expectedContent
);
},

Expand All @@ -284,12 +288,7 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
fieldType: 'keyword' | 'date' | 'number',
expectedContent: string[]
) {
await mlFieldStatsFlyout.assertTopValuesContent(
'mlAnalyticsCreateJobWizardDependentVariableSelect loaded',
fieldName,
fieldType,
expectedContent
);
await mlFieldStatsFlyout.assertTopValuesContent(fieldName, fieldType, expectedContent);
},

async assertDependentVariableInputMissing() {
Expand Down
28 changes: 17 additions & 11 deletions x-pack/test/functional/services/ml/field_stats_flyout.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function MachineLearningFieldStatsFlyoutProvider({ getService }: FtrProvi
async assertFieldStatContentByType(
testSubj: string,
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number'
) {
await retry.tryForTime(2000, async () => {
// escape popover
Expand Down Expand Up @@ -62,10 +62,11 @@ export function MachineLearningFieldStatsFlyoutProvider({ getService }: FtrProvi
});
},

async clickFieldStatTrigger(
async assertFieldStatFlyoutContentFromTrigger(
testSubj: string,
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number',
expectedTopValuesContent?: string[]
) {
const selector = `~${testSubj} > ~mlInspectFieldStatsButton-${fieldName}`;

Expand All @@ -76,11 +77,17 @@ export function MachineLearningFieldStatsFlyoutProvider({ getService }: FtrProvi
await testSubjects.existOrFail(`mlFieldStatsFlyoutContent ${fieldName}-title`);
});
await this.assertFieldStatContentByType(testSubj, fieldName, fieldType);
if (Array.isArray(expectedTopValuesContent)) {
await this.assertTopValuesContent(fieldName, fieldType, expectedTopValuesContent);
}
await this.ensureFieldStatsFlyoutClosed();
},
async clickFieldStatComboBoxTrigger(

async assertFieldStatFlyoutContentFromComboBoxTrigger(
parentComboBoxSelector: string,
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number',
expectedTopValuesContent?: string[]
) {
const selector = `mlInspectFieldStatsButton-${fieldName}`;

Expand All @@ -95,16 +102,15 @@ export function MachineLearningFieldStatsFlyoutProvider({ getService }: FtrProvi
await testSubjects.existOrFail(`mlFieldStatsFlyoutContent ${fieldName}-title`);

await this.assertFieldStatContentByType(parentComboBoxSelector, fieldName, fieldType);

if (Array.isArray(expectedTopValuesContent)) {
await this.assertTopValuesContent(fieldName, fieldType, expectedTopValuesContent);
}
await this.ensureFieldStatsFlyoutClosed();
});
},

async assertTopValuesContent(
parentComboBoxSelector: string,
fieldName: string,
fieldType: string,
expectedValues: string[]
) {
async assertTopValuesContent(fieldName: string, fieldType: string, expectedValues: string[]) {
await retry.tryForTime(2000, async () => {
// check for top values rows
await testSubjects.existOrFail(`mlFieldStatsFlyoutContent ${fieldName}-topValues`);
Expand Down
24 changes: 12 additions & 12 deletions x-pack/test/functional/services/transform/wizard.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
await this.assertSelectedTransformFunction(transformFunction);
},

async clickUniqueKeysInputFieldStatTrigger(
async assertFieldStatsFlyoutContentFromUniqueKeysInputTrigger(
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number'
) {
await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
'transformWizardUniqueKeysSelector',
fieldName,
fieldType
Expand Down Expand Up @@ -416,11 +416,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
]);
},

async clickSortFieldInputFieldStatTrigger(
async assertFieldStatFlyoutContentFromSortFieldInputTrigger(
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number'
) {
await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
'transformWizardSortFieldSelector',
fieldName,
fieldType
Expand Down Expand Up @@ -448,11 +448,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
await this.assertSortFieldInputValue(identificator);
},

async clickGroupByInputFieldStatTrigger(
async assertFieldStatFlyoutContentFromGroupByInputTrigger(
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number'
) {
await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
'transformGroupBySelection',
fieldName,
fieldType
Expand Down Expand Up @@ -518,11 +518,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
} > comboBoxInput`;
},

async clickAggInputFieldStatTrigger(
async assertFieldStatFlyoutContentFromAggInputTrigger(
fieldName: string,
fieldType?: 'keyword' | 'date' | 'number'
fieldType: 'keyword' | 'date' | 'number'
) {
await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
'transformAggregationSelection',
fieldName,
fieldType
Expand Down

0 comments on commit 69d124f

Please sign in to comment.