[ML] Functional tests: Enable randomize query switch.

walterra · walterra · commit bf913231fc84 · 2021-04-02T10:16:48.000+02:00
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
@@ -341,6 +341,7 @@ export const ScatterplotMatrix: FC<ScatterplotMatrixProps> = ({
                 fullWidth
               >
                 <EuiSwitch
+                  data-test-subj={`mlScatterplotMatrixRandomizeQuerySwitch`}
                   name="mlScatterplotMatrixRandomizeQuery"
                   label={randomizeQuery ? TOGGLE_ON : TOGGLE_OFF}
                   checked={randomizeQuery}
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
@@ -105,6 +105,11 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testExecution.logTestStep('displays the include fields selection');
           await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists();
 
+          await ml.testExecution.logTestStep(
+            'sets the randomize query switch to true for the scatterplot matrix'
+          );
+          await ml.dataFrameAnalyticsCreation.setScatterplotMatrixRandomizeQueryCheckState(true);
+
           await ml.testExecution.logTestStep('displays the scatterplot matrix');
           await ml.dataFrameAnalyticsCreation.assertScatterplotMatrix(
             testData.expected.scatterplotMatrixColorStats
@@ -236,6 +241,12 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testExecution.logTestStep('displays the results view for created job');
           await ml.dataFrameAnalyticsTable.openResultsView(testData.jobId);
           await ml.dataFrameAnalyticsResults.assertClassificationEvaluatePanelElementsExists();
+          await ml.dataFrameAnalyticsResults.assertClassificationTablePanelExists();
+          await ml.dataFrameAnalyticsResults.assertResultsTableExists();
+          await ml.dataFrameAnalyticsResults.assertResultsTableTrainingFiltersExist();
+          await ml.dataFrameAnalyticsResults.assertResultsTableNotEmpty();
+
+          await ml.testExecution.logTestStep('displays the ROC curve chart');
           await ml.commonUI.assertColorsInCanvasElement(
             'mlDFAnalyticsClassificationExplorationRocCurveChart',
             testData.expected.rocCurveColorState,
@@ -246,10 +257,13 @@ export default function ({ getService }: FtrProviderContext) {
             // since the returned colors vary quite a bit on each run.
             20
           );
-          await ml.dataFrameAnalyticsResults.assertClassificationTablePanelExists();
-          await ml.dataFrameAnalyticsResults.assertResultsTableExists();
-          await ml.dataFrameAnalyticsResults.assertResultsTableTrainingFiltersExist();
-          await ml.dataFrameAnalyticsResults.assertResultsTableNotEmpty();
+
+          await ml.testExecution.logTestStep(
+            'sets the randomize query switch to true for the scatterplot matrix'
+          );
+          await ml.dataFrameAnalyticsResults.setScatterplotMatrixRandomizeQueryCheckState(true);
+
+          await ml.testExecution.logTestStep('displays the scatterplot matrix');
           await ml.dataFrameAnalyticsResults.assertScatterplotMatrix(
             testData.expected.scatterplotMatrixColorStats
           );
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
@@ -52,7 +52,7 @@ export default function ({ getService }: FtrProviderContext) {
           ],
           scatterplotMatrixColorsWizard: [
             // markers
-            { color: '#52B398', percentage: 25 },
+            { color: '#52B398', percentage: 15 },
             // grey boilerplate
             { color: '#6A717D', percentage: 30 },
           ],
@@ -62,9 +62,9 @@ export default function ({ getService }: FtrProviderContext) {
             // tick/grid/axis, grey markers
             { color: '#6A717D', percentage: 30 },
             { color: '#D3DAE6', percentage: 8 },
-            { color: '#98A1B3', percentage: 25 },
+            { color: '#98A1B3', percentage: 12 },
             // anti-aliasing
-            { color: '#F5F7FA', percentage: 27 },
+            { color: '#F5F7FA', percentage: 30 },
           ],
           row: {
             type: 'outlier_detection',
@@ -126,6 +126,11 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testExecution.logTestStep('displays the include fields selection');
           await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists();
 
+          await ml.testExecution.logTestStep(
+            'sets the randomize query switch to true for the scatterplot matrix'
+          );
+          await ml.dataFrameAnalyticsCreation.setScatterplotMatrixRandomizeQueryCheckState(true);
+
           await ml.testExecution.logTestStep('displays the scatterplot matrix');
           await ml.dataFrameAnalyticsCreation.assertScatterplotMatrix(
             testData.expected.scatterplotMatrixColorsWizard
@@ -255,6 +260,13 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.dataFrameAnalyticsResults.assertResultsTableExists();
           await ml.dataFrameAnalyticsResults.assertResultsTableNotEmpty();
           await ml.dataFrameAnalyticsResults.assertFeatureInfluenceCellNotEmpty();
+
+          await ml.testExecution.logTestStep(
+            'sets the randomize query switch to true for the scatterplot matrix'
+          );
+          await ml.dataFrameAnalyticsResults.setScatterplotMatrixRandomizeQueryCheckState(true);
+
+          await ml.testExecution.logTestStep('displays the scatterplot matrix');
           await ml.dataFrameAnalyticsResults.assertScatterplotMatrix(
             testData.expected.scatterplotMatrixColorStatsResults
           );
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
@@ -99,6 +99,11 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testExecution.logTestStep('displays the include fields selection');
           await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists();
 
+          await ml.testExecution.logTestStep(
+            'sets the randomize query switch to true for the scatterplot matrix'
+          );
+          await ml.dataFrameAnalyticsCreation.setScatterplotMatrixRandomizeQueryCheckState(true);
+
           await ml.testExecution.logTestStep('displays the scatterplot matrix');
           await ml.dataFrameAnalyticsCreation.assertScatterplotMatrix(
             testData.expected.scatterplotMatrixColorStats
@@ -229,6 +234,13 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.dataFrameAnalyticsResults.assertResultsTableExists();
           await ml.dataFrameAnalyticsResults.assertResultsTableTrainingFiltersExist();
           await ml.dataFrameAnalyticsResults.assertResultsTableNotEmpty();
+
+          await ml.testExecution.logTestStep(
+            'sets the randomize query switch to true for the scatterplot matrix'
+          );
+          await ml.dataFrameAnalyticsResults.setScatterplotMatrixRandomizeQueryCheckState(true);
+
+          await ml.testExecution.logTestStep('displays the scatterplot matrix');
           await ml.dataFrameAnalyticsResults.assertScatterplotMatrix(
             testData.expected.scatterplotMatrixColorStats
           );
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -274,6 +274,29 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
       );
     },
 
+    async getScatterplotMatrixRandomizeQuerySwitchCheckState(): Promise<boolean> {
+      const state = await testSubjects.getAttribute(
+        'mlScatterplotMatrixRandomizeQuerySwitch',
+        'aria-checked'
+      );
+      return state === 'true';
+    },
+
+    async assertScatterplotMatrixRandomizeQueryCheckState(expectedCheckState: boolean) {
+      const actualCheckState = await this.getScatterplotMatrixRandomizeQuerySwitchCheckState();
+      expect(actualCheckState).to.eql(
+        expectedCheckState,
+        `Randomize query check state should be '${expectedCheckState}' (got '${actualCheckState}')`
+      );
+    },
+
+    async setScatterplotMatrixRandomizeQueryCheckState(checkState: boolean) {
+      if ((await this.getScatterplotMatrixRandomizeQuerySwitchCheckState()) !== checkState) {
+        await testSubjects.click('mlScatterplotMatrixRandomizeQuerySwitch');
+      }
+      await this.assertScatterplotMatrixRandomizeQueryCheckState(checkState);
+    },
+
     async assertTrainingPercentInputExists() {
       await testSubjects.existOrFail('mlAnalyticsCreateJobWizardTrainingPercentSlider');
     },
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
@@ -85,14 +85,44 @@ export function MachineLearningDataFrameAnalyticsResultsProvider(
       });
     },
 
+    async getScatterplotMatrixRandomizeQuerySwitchCheckState(): Promise<boolean> {
+      const state = await testSubjects.getAttribute(
+        'mlScatterplotMatrixRandomizeQuerySwitch',
+        'aria-checked'
+      );
+      return state === 'true';
+    },
+
+    async assertScatterplotMatrixRandomizeQueryCheckState(expectedCheckState: boolean) {
+      const actualCheckState = await this.getScatterplotMatrixRandomizeQuerySwitchCheckState();
+      expect(actualCheckState).to.eql(
+        expectedCheckState,
+        `Randomize query check state should be '${expectedCheckState}' (got '${actualCheckState}')`
+      );
+    },
+
+    async setScatterplotMatrixRandomizeQueryCheckState(checkState: boolean) {
+      if ((await this.getScatterplotMatrixRandomizeQuerySwitchCheckState()) !== checkState) {
+        await testSubjects.click('mlScatterplotMatrixRandomizeQuerySwitch');
+      }
+      await this.assertScatterplotMatrixRandomizeQueryCheckState(checkState);
+    },
+
     async assertScatterplotMatrix(expectedValue: CanvasElementColorStats) {
       await testSubjects.existOrFail('mlDFExpandableSection-splom > mlScatterplotMatrix loaded', {
         timeout: 5000,
       });
       await testSubjects.scrollIntoView('mlDFExpandableSection-splom > mlScatterplotMatrix loaded');
-      await mlCommonUI.assertColorsInCanvasElement('mlDFExpandableSection-splom', expectedValue, [
-        '#000000',
-      ]);
+      await mlCommonUI.assertColorsInCanvasElement(
+        'mlDFExpandableSection-splom',
+        expectedValue,
+        ['#000000'],
+        undefined,
+        undefined,
+        // increased tolerance up from 10 to 20
+        // since the returned randomized colors vary quite a bit on each run.
+        20
+      );
     },
 
     async assertFeatureImportanceDecisionPathChartElementsExists() {

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,7 @@ export const ScatterplotMatrix: FC<ScatterplotMatrixProps> = ({`
`341`	`341`	`fullWidth`
`342`	`342`	`>`
`343`	`343`	`<EuiSwitch`
	`344`	+ data-test-subj={`mlScatterplotMatrixRandomizeQuerySwitch`}
`344`	`345`	`name="mlScatterplotMatrixRandomizeQuery"`
`345`	`346`	`label={randomizeQuery ? TOGGLE_ON : TOGGLE_OFF}`
`346`	`347`	`checked={randomizeQuery}`