refactor test support dependencies

fixes jhipster#25384
dwarakaprasad · Mar 8, 2024 · aa66ad9 · aa66ad9
1 parent 4fce91d
commit aa66ad9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/generators/docker/generator.spec.ts b/generators/docker/generator.spec.ts
@@ -22,13 +22,18 @@ import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
 import Generator from './index.js';
-import { buildSamplesFromMatrix, extendFilteredMatrix, extendMatrix } from '../../test/support/matrix-utils.js';
-import { defaultHelpers as helpers, runResult } from '../../testi/support/index.js';
+import {
+  buildSamplesFromMatrix,
+  extendFilteredMatrix,
+  extendMatrix,
+  defaultHelpers as helpers,
+  runResult,
+  buildServerMatrix,
+} from '../../testing/index.js';
 import { matchElasticSearchDocker } from '../spring-data-elasticsearch/__test-support/elastic-search-matcher.js';
 import { matchConsul, matchEureka } from './__test-support/service-discovery-matcher.js';
 
 import { databaseTypes, searchEngineTypes, serviceDiscoveryTypes, cacheTypes } from '../../jdl/jhipster/index.js';
-import { buildServerMatrix } from '../../test/support/server-samples.js';
 import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../server/options/message-broker.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 

diff --git a/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.ts b/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.ts
@@ -3,7 +3,7 @@ import type BaseApplicationGenerator from '../../base-application/index.js';
 import type { SpringBootApplication } from '../../server/types.js';
 
 import { SERVER_MAIN_SRC_DIR, JAVA_DOCKER_DIR } from '../../generator-constants.js';
-import { matchWrittenConfig, matchWrittenFiles } from '../../../test/support/matcher.js';
+import { matchWrittenConfig, matchWrittenFiles } from '../../../testing/index.js';
 
 const expectedElasticsearchFiles = () => {
   return [`${JAVA_DOCKER_DIR}elasticsearch.yml`];

diff --git a/test/needle-api/needle-client-angular-generator.spec.ts b/test/needle-api/needle-client-angular-generator.spec.ts
@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { defaultHelpers as helpers, runResult } from '../support/index.js';
+import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
 
 import AngularGenerator from '../../generators/angular/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js';

diff --git a/test/needle-api/needle-client-angular.spec.ts b/test/needle-api/needle-client-angular.spec.ts
@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { basicHelpers as helpers, result as runResult, getGenerator } from '../support/index.js';
+import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 
 import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js';

diff --git a/test/needle-api/needle-client-react-generator.spec.ts b/test/needle-api/needle-client-react-generator.spec.ts
@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { basicHelpers as helpers, result as runResult, getGenerator } from '../support/index.js';
+import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import ReactGenerator from '../../generators/react/index.js';

diff --git a/test/needle-api/needle-client-react.spec.ts b/test/needle-api/needle-client-react.spec.ts
@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { basicHelpers as helpers, result as runResult, getGenerator } from '../support/index.js';
+import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import BaseApplicationGenerator from '../../generators/base-application/index.js';

diff --git a/test/needle-api/needle-client-vue-generator.spec.ts b/test/needle-api/needle-client-vue-generator.spec.ts
@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { basicHelpers as helpers, result as runResult, getGenerator } from '../support/index.js';
+import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 
 import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';

diff --git a/test/needle-api/needle-client-vue.spec.ts b/test/needle-api/needle-client-vue.spec.ts
@@ -1,5 +1,5 @@
 import { before, describe } from 'esmocha';
-import { basicHelpers as helpers, getGenerator } from '../support/index.js';
+import { basicHelpers as helpers, getGenerator } from '../../testing/index.js';
 
 import ClientGenerator from '../../generators/client/index.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';