Skip to content

Commit

Permalink
[ML] Functional tests - directory names cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
pheyos committed May 26, 2020
1 parent 15cd658 commit 852438b
Show file tree
Hide file tree
Showing 85 changed files with 76 additions and 129 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

export default ({ getService }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
import { DeepPartial } from '../../../../../plugins/ml/common/types/common';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
import pkg from '../../../../../../package.json';

// eslint-disable-next-line import/no-default-export
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

const start = 1554463535770;
const end = 1574316073914;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG } from './common_jobs';

// eslint-disable-next-line import/no-default-export
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/api_integration/apis/ml/modules/get_module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

const moduleIds = [
'apache_ecs',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import expect from '@kbn/expect';

import { FtrProviderContext } from '../../../ftr_provider_context';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/api_integration/apis/ml/modules/setup_module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context';

import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
import { Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
import { USER } from '../../../../functional/services/ml/security_common';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';

// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import expect from '@kbn/expect';
import { USER } from '../../../../functional/services/machine_learning/security_common';
import { USER } from '../../../../functional/services/ml/security_common';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
Expand Down
8 changes: 3 additions & 5 deletions x-pack/test/api_integration/services/ml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@

import { FtrProviderContext } from '../../functional/ftr_provider_context';

import {
MachineLearningAPIProvider,
MachineLearningSecurityCommonProvider,
MachineLearningTestResourcesProvider,
} from '../../functional/services/machine_learning';
import { MachineLearningAPIProvider } from '../../functional/services/ml/api';
import { MachineLearningSecurityCommonProvider } from '../../functional/services/ml/security_common';
import { MachineLearningTestResourcesProvider } from '../../functional/services/ml/test_resources';

export function MachineLearningProvider(context: FtrProviderContext) {
const api = MachineLearningAPIProvider(context);
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion x-pack/test/functional/config.ie.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default async function ({ readConfigFile }) {
// require.resolve(__dirname, './apps/logstash'),
// require.resolve(__dirname, './apps/grok_debugger'),
// require.resolve(__dirname, './apps/infra'),
// require.resolve(__dirname, './apps/machine_learning'),
// require.resolve(__dirname, './apps/ml'),
// require.resolve(__dirname, './apps/rollup_job'),
// require.resolve(__dirname, './apps/maps'),
// require.resolve(__dirname, './apps/status_page'),
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default async function ({ readConfigFile }) {
resolve(__dirname, './apps/logstash'),
resolve(__dirname, './apps/grok_debugger'),
resolve(__dirname, './apps/infra'),
resolve(__dirname, './apps/machine_learning'),
resolve(__dirname, './apps/ml'),
resolve(__dirname, './apps/rollup_job'),
resolve(__dirname, './apps/maps'),
resolve(__dirname, './apps/status_page'),
Expand Down
33 changes: 0 additions & 33 deletions x-pack/test/functional/services/machine_learning/index.ts

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,35 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { FtrProviderContext } from '../ftr_provider_context';
import { FtrProviderContext } from '../../ftr_provider_context';

import {
MachineLearningAnomaliesTableProvider,
MachineLearningAnomalyExplorerProvider,
MachineLearningAPIProvider,
MachineLearningCommonProvider,
MachineLearningCustomUrlsProvider,
MachineLearningDataFrameAnalyticsProvider,
MachineLearningDataFrameAnalyticsCreationProvider,
MachineLearningDataFrameAnalyticsTableProvider,
MachineLearningDataVisualizerProvider,
MachineLearningDataVisualizerFileBasedProvider,
MachineLearningDataVisualizerIndexBasedProvider,
MachineLearningJobManagementProvider,
MachineLearningJobSelectionProvider,
MachineLearningJobSourceSelectionProvider,
MachineLearningJobTableProvider,
MachineLearningJobTypeSelectionProvider,
MachineLearningJobWizardAdvancedProvider,
MachineLearningJobWizardCategorizationProvider,
MachineLearningJobWizardCommonProvider,
MachineLearningJobWizardMultiMetricProvider,
MachineLearningJobWizardPopulationProvider,
MachineLearningNavigationProvider,
MachineLearningSecurityCommonProvider,
MachineLearningSecurityUIProvider,
MachineLearningSettingsProvider,
MachineLearningSingleMetricViewerProvider,
MachineLearningTestResourcesProvider,
} from './machine_learning';
import { MachineLearningAnomaliesTableProvider } from './anomalies_table';
import { MachineLearningAnomalyExplorerProvider } from './anomaly_explorer';
import { MachineLearningAPIProvider } from './api';
import { MachineLearningCommonProvider } from './common';
import { MachineLearningCustomUrlsProvider } from './custom_urls';
import { MachineLearningDataFrameAnalyticsProvider } from './data_frame_analytics';
import { MachineLearningDataFrameAnalyticsCreationProvider } from './data_frame_analytics_creation';
import { MachineLearningDataFrameAnalyticsTableProvider } from './data_frame_analytics_table';
import { MachineLearningDataVisualizerProvider } from './data_visualizer';
import { MachineLearningDataVisualizerFileBasedProvider } from './data_visualizer_file_based';
import { MachineLearningDataVisualizerIndexBasedProvider } from './data_visualizer_index_based';
import { MachineLearningJobManagementProvider } from './job_management';
import { MachineLearningJobSelectionProvider } from './job_selection';
import { MachineLearningJobSourceSelectionProvider } from './job_source_selection';
import { MachineLearningJobTableProvider } from './job_table';
import { MachineLearningJobTypeSelectionProvider } from './job_type_selection';
import { MachineLearningJobWizardAdvancedProvider } from './job_wizard_advanced';
import { MachineLearningJobWizardCommonProvider } from './job_wizard_common';
import { MachineLearningJobWizardCategorizationProvider } from './job_wizard_categorization';
import { MachineLearningJobWizardMultiMetricProvider } from './job_wizard_multi_metric';
import { MachineLearningJobWizardPopulationProvider } from './job_wizard_population';
import { MachineLearningNavigationProvider } from './navigation';
import { MachineLearningSecurityCommonProvider } from './security_common';
import { MachineLearningSecurityUIProvider } from './security_ui';
import { MachineLearningSettingsProvider } from './settings';
import { MachineLearningSingleMetricViewerProvider } from './single_metric_viewer';
import { MachineLearningTestResourcesProvider } from './test_resources';

export function MachineLearningProvider(context: FtrProviderContext) {
const common = MachineLearningCommonProvider(context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { FtrProviderContext } from '../ftr_provider_context';
import { FtrProviderContext } from '../../ftr_provider_context';

import {
TransformAPIProvider,
TransformManagementProvider,
TransformNavigationProvider,
TransformSecurityCommonProvider,
TransformSecurityUIProvider,
TransformSourceSelectionProvider,
TransformTableProvider,
TransformWizardProvider,
} from './transform_ui';
import { TransformAPIProvider } from './api';
import { TransformManagementProvider } from './management';
import { TransformNavigationProvider } from './navigation';
import { TransformSecurityCommonProvider } from './security_common';
import { TransformSecurityUIProvider } from './security_ui';
import { TransformSourceSelectionProvider } from './source_selection';
import { TransformTableProvider } from './transform_table';
import { TransformWizardProvider } from './wizard';

import { MachineLearningTestResourcesProvider } from './machine_learning';
import { MachineLearningTestResourcesProvider } from '../ml/test_resources';

export function TransformProvider(context: FtrProviderContext) {
const api = TransformAPIProvider(context);
Expand Down
14 changes: 0 additions & 14 deletions x-pack/test/functional/services/transform_ui/index.ts

This file was deleted.

0 comments on commit 852438b

Please sign in to comment.