expose test matrix through /testing folder (#25393)

cli/cli.spec.mts

@@ -9,7 +9,7 @@ import { BaseEnvironment } from '@yeoman/types';
 import { coerce } from 'semver';
 import quibble from 'quibble';
 
-import { defaultHelpers as helpers, createBlueprintFiles } from '../test/support/index.js';
+import { defaultHelpers as helpers, createBlueprintFiles } from '../testing/index.js';
 import { getCommand as actualGetCommonand } from './utils.mjs';
 import { createProgram } from './program.mjs';
 

cli/environment-builder.spec.mts

@@ -22,7 +22,7 @@ import fs from 'fs';
 import { expect } from 'chai';
 import sinon from 'sinon';
 import { before, it, describe, after, expect as jestExpect, beforeEach } from 'esmocha';
-import { defaultHelpers as helpers, createBlueprintFiles } from '../test/support/index.js';
+import { defaultHelpers as helpers, createBlueprintFiles } from '../testing/index.js';
 
 import EnvironmentBuilder from './environment-builder.mjs';
 

cli/program.spec.mts

@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import { describe, it, beforeEach } from 'esmocha';
 
 import { createProgram } from './program.mjs';
-import { defaultHelpers as helpers } from '../test/support/index.js';
+import { defaultHelpers as helpers } from '../testing/index.js';
 
 describe('cli - program', () => {
   beforeEach(async () => {

generators/angular/generator.spec.ts

@@ -8,7 +8,7 @@ import {
   checkEnforcements,
   entitiesClientSamples as entities,
   defaultHelpers as helpers,
-} from '../../test/support/index.js';
+} from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';

generators/app/composing.spec.ts

@@ -1,7 +1,7 @@
 import { before, it, describe } from 'esmocha';
 import assert from 'assert';
 
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { GENERATOR_APP } from '../generator-list.js';
 
 const allMockedComposedGenerators = [

generators/app/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
 import { getCommandHelpOutput, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers, runResult } from '../../test/support/index.js';
+import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
 import Generator from './index.js';
 
 const { snakeCase } = lodash;

generators/base-application/generator.spec.ts

@@ -25,7 +25,7 @@ import lodash from 'lodash';
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
 import Generator from './index.js';
 import type { BaseApplication } from '../base-application/types.js';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 
 const { snakeCase } = lodash;

generators/base-core/generator-core.spec.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-expressions */
 import { it, describe, expect as jestExpect, beforeEach } from 'esmocha';
-import { basicHelpers as helpers } from '../../test/support/index.js';
+import { basicHelpers as helpers } from '../../testing/index.js';
 
 import Base from './index.js';
 import { createJHipsterLogger } from '../base/support/logger.js';

generators/base/blueprints.spec.ts

@@ -3,7 +3,7 @@ import { before, it, describe, expect, esmocha } from 'esmocha';
 import { RunResult } from 'yeoman-test';
 import { toHaveBeenCalledAfter } from 'jest-extended';
 
-import { basicHelpers as helpers } from '../../test/support/index.js';
+import { basicHelpers as helpers } from '../../testing/index.js';
 import { packageJson } from '../../lib/index.js';
 import BaseGenerator from './index.js';
 

generators/base/generator.spec.ts

@@ -23,7 +23,7 @@ import lodash from 'lodash';
 
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
 import BaseGenerator from './index.js';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { getCommandHelpOutput, shouldSupportFeatures } from '../../test/support/tests.js';
 
 const { snakeCase } = lodash;

generators/bootstrap-application-base/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, it, describe, expect, beforeEach } from 'esmocha';
 import lodash from 'lodash';
 
 import Generator from './index.js';
-import { defaultHelpers as helpers, runResult } from '../../test/support/index.js';
+import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import { parseChangelog } from '../base/support/timestamp.ts';
 

generators/bootstrap-application-client/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
 import Generator from './index.js';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 
 const { snakeCase } = lodash;

generators/bootstrap-application-server/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
 import Generator from './index.js';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 
 const { snakeCase } = lodash;

generators/bootstrap-application/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
 import Generator from './index.js';
-import { defaultHelpers as helpers, result as runResult } from '../../test/support/index.js';
+import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js';
 import { fieldTypes } from '../../jdl/jhipster/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 

generators/bootstrap/support/auto-crlf-transform.spec.ts

@@ -1,6 +1,6 @@
 import { before, it, describe, expect } from 'esmocha';
 import { detectCrLf } from './auto-crlf-transform.js';
-import { defaultHelpers as helpers } from '../../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../../testing/index.js';
 
 describe('generator - bootstrap - utils', () => {
   describe('::detectCrLf', () => {

generators/ci-cd/ci-cd.spec.ts

@@ -1,6 +1,6 @@
 import { before, it, describe, expect } from 'esmocha';
 import { GENERATOR_CI_CD } from '../generator-list.js';
-import { dryRunHelpers as helpers } from '../../test/support/index.js';
+import { dryRunHelpers as helpers } from '../../testing/index.js';
 
 const expectedFiles = {
   travis: ['.travis.yml'],

generators/client/generator-needles.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { basicHelpers as helpers, result as runResult, getGenerator } from '../../test/support/index.js';
+import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 import ClientGenerator from './index.js';
 import { CLIENT_WEBPACK_DIR } from '../generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';

generators/client/generator.spec.ts

@@ -23,7 +23,7 @@ import lodash from 'lodash';
 import { before, it, describe, expect } from 'esmocha';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
-import { defaultHelpers as helpers, checkEnforcements, result } from '../../test/support/index.js';
+import { defaultHelpers as helpers, checkEnforcements, result } from '../../testing/index.js';
 import { testFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { GENERATOR_CLIENT } from '../generator-list.js';
 

generators/client/needle-client.spec.ts

@@ -1,7 +1,7 @@
 import { before, it, describe } from 'esmocha';
 import ClientGenerator from '../../generators/client/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
-import { dryRunHelpers as helpers, result as runResult, getGenerator } from '../../test/support/index.js';
+import { dryRunHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const mockBlueprintSubGen: any = class extends ClientGenerator {

generators/client/prompts.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import {
   applicationTypes,
   databaseTypes,

generators/common/generator.spec.js

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
-import { defaultHelpers as helpers, basicHelpers, runResult, checkEnforcements } from '../../test/support/index.js';
+import { defaultHelpers as helpers, basicHelpers, runResult, checkEnforcements } from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
 import { GENERATOR_COMMON } from '../generator-list.js';

generators/cucumber/generator.spec.ts

@@ -5,7 +5,7 @@ import lodash from 'lodash';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
-import { defaultHelpers as helpers, result } from '../../test/support/index.js';
+import { defaultHelpers as helpers, result } from '../../testing/index.js';
 
 import { GENERATOR_CUCUMBER } from '../generator-list.js';
 

generators/cypress/generator.spec.ts

@@ -21,13 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, it, describe, after, expect } from 'esmocha';
 import lodash from 'lodash';
 import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js';
-import {
-  fromMatrix,
-  extendMatrix,
-  AuthenticationTypeMatrix,
-  checkEnforcements,
-  defaultHelpers as helpers,
-} from '../../test/support/index.js';
+import { fromMatrix, extendMatrix, AuthenticationTypeMatrix, checkEnforcements, defaultHelpers as helpers } from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './generator.js';
 import { GENERATOR_CYPRESS } from '../generator-list.js';

generators/docker-compose/docker-compose.spec.ts

@@ -2,7 +2,7 @@ import { before, it, describe, expect } from 'esmocha';
 import monitoringTypes from '../../jdl/jhipster/monitoring-types.js';
 import applicationTypes from '../../jdl/jhipster/application-types.js';
 import { GENERATOR_DOCKER_COMPOSE } from '../generator-list.js';
-import { defaultHelpers as helpers, getGenerator, runResult } from '../../test/support/index.js';
+import { defaultHelpers as helpers, getGenerator, runResult } from '../../testing/index.js';
 
 const { PROMETHEUS } = monitoringTypes;
 const { MICROSERVICE, MONOLITH } = applicationTypes;

generators/docker/__test-support/service-discovery-matcher.ts

@@ -1,7 +1,7 @@
 import type { RunResult } from 'yeoman-test';
 
 import { JAVA_DOCKER_DIR } from '../../generator-constants.js';
-import { matchWrittenConfig, matchWrittenFiles } from '../../../test/support/matcher.js';
+import { matchWrittenConfig, matchWrittenFiles } from '../../../testing/index.js';
 
 const expectedEurekaFiles = () => {
   return [

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 '../../test/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';
 

generators/entities/generator.spec.ts

@@ -24,7 +24,7 @@ import lodash from 'lodash';
 import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './generator.js';
-import { skipPrettierHelpers as helpers, result as runResult } from '../../test/support/index.js';
+import { skipPrettierHelpers as helpers, result as runResult } from '../../testing/index.js';
 
 const { snakeCase } = lodash;
 const __filename = fileURLToPath(import.meta.url);

generators/entity/database-changelog.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { defaultHelpers as helpers, runResult, getGenerator } from '../../test/support/index.js';
+import { defaultHelpers as helpers, runResult, getGenerator } from '../../testing/index.js';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.js';
 import BaseApplicationGenerator from '../base-application/generator.js';
 

generators/entity/single-entity.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe, after, expect } from 'esmocha';
-import { skipPrettierHelpers as helpers, result as runResult } from '../../test/support/index.js';
+import { skipPrettierHelpers as helpers, result as runResult } from '../../testing/index.js';
 import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
 import BaseApplicationGenerator from '../base-application/generator.js';
 import { GENERATOR_ENTITY } from '../generator-list.js';

generators/export-jdl/export-jdl.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe, expect } from 'esmocha';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { GENERATOR_EXPORT_JDL } from '../generator-list.js';
 
 const files = {

generators/feign-client/generator.spec.ts

@@ -1,7 +1,7 @@
 import { basename, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { before, it, describe, expect } from 'esmocha';
-import { checkEnforcements, defaultHelpers as helpers, runResult } from '../../test/support/index.js';
+import { checkEnforcements, defaultHelpers as helpers, runResult } from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from '../server/index.js';
 

generators/gatling/generator.spec.ts

@@ -5,7 +5,7 @@ import lodash from 'lodash';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
-import { defaultHelpers as helpers, result } from '../../test/support/index.js';
+import { defaultHelpers as helpers, result } from '../../testing/index.js';
 
 import { GENERATOR_GATLING } from '../generator-list.js';
 

generators/generate-blueprint/generator.spec.js

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, it, describe, expect } from 'esmocha';
 import lodash from 'lodash';
 
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
 

generators/git/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { access } from 'fs/promises';
 import { before, it, describe, expect } from 'esmocha';
 import { testBlueprintSupport } from '../../test/support/tests.js';
-import { skipPrettierHelpers as helpers } from '../../test/support/index.js';
+import { skipPrettierHelpers as helpers } from '../../testing/index.js';
 import { GENERATOR_GIT } from '../generator-list.js';
 
 const __filename = fileURLToPath(import.meta.url);

generators/gradle/generator.spec.js

@@ -20,7 +20,7 @@ import { basename, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { before, it, describe, expect } from 'esmocha';
 import { testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { GENERATOR_JHIPSTER } from '../generator-constants.js';
 import { GENERATOR_GRADLE } from '../generator-list.js';
 

generators/gradle/needles.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { dryRunHelpers as helpers, result as runResult } from '../../test/support/index.js';
+import { dryRunHelpers as helpers, result as runResult } from '../../testing/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_SERVER } from '../generator-list.js';
 

generators/heroku/heroku.spec.ts

@@ -1,7 +1,7 @@
 import sinon, { SinonStub } from 'sinon';
 import { it, describe, expect, beforeEach } from 'esmocha';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.js';
-import { defaultHelpers as helpers, runResult } from '../../test/support/index.js';
+import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
 import { GENERATOR_HEROKU } from '../generator-list.js';
 
 const expectedFiles = {

generators/init/generator.spec.ts

@@ -20,7 +20,7 @@ import { basename, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { before, it, describe, expect } from 'esmocha';
 import { basicTests, getCommandHelpOutput, testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers } from '../../test/support/index.js';
+import { defaultHelpers as helpers } from '../../testing/index.js';
 import { defaultConfig, requiredConfig } from './config.js';
 import { GENERATOR_JHIPSTER } from '../generator-constants.js';
 import { GENERATOR_INIT } from '../generator-list.js';

generators/java/generator.spec.ts

@@ -5,7 +5,7 @@ import lodash from 'lodash';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
 import Generator from './index.js';
-import { defaultHelpers as helpers, result } from '../../test/support/index.js';
+import { defaultHelpers as helpers, result } from '../../testing/index.js';
 
 import { GENERATOR_JAVA } from '../generator-list.js';
 

generators/jdl/generator.spec.ts

@@ -25,7 +25,7 @@ import { SinonSpy } from 'sinon';
 import { RunResult } from 'yeoman-test';
 import Generator from './index.js';
 import { getCommandHelpOutput, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers, result as runResult } from '../../test/support/index.js';
+import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js';
 import * as GENERATORS from '../generator-list.js';
 import { GENERATOR_JDL } from '../generator-list.js';
 

generators/kubernetes-helm/kubernetes.helm.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe, expect } from 'esmocha';
-import { basicHelpers as helpers, getGenerator } from '../../test/support/index.js';
+import { basicHelpers as helpers, getGenerator } from '../../testing/index.js';
 import { GENERATOR_KUBERNETES_HELM } from '../generator-list.js';
 
 const expectedFiles = {

generators/kubernetes-knative/knative.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe, expect } from 'esmocha';
-import { dryRunHelpers as helpers, getGenerator } from '../../test/support/index.js';
+import { dryRunHelpers as helpers, getGenerator } from '../../testing/index.js';
 import { GENERATOR_KUBERNETES_KNATIVE } from '../generator-list.js';
 
 const expectedFiles = {

generators/kubernetes/kubernetes.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe, expect } from 'esmocha';
-import { basicHelpers as helpers, getGenerator, runResult } from '../../test/support/index.js';
+import { basicHelpers as helpers, getGenerator, runResult } from '../../testing/index.js';
 import { GENERATOR_KUBERNETES } from '../generator-list.js';
 
 const expectedFiles = {

generators/languages/generator-needles.spec.ts

@@ -1,5 +1,5 @@
 import { before, it, describe } from 'esmocha';
-import { defaultHelpers as helpers, result as runResult, getGenerator } from '../../test/support/index.js';
+import { defaultHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js';
 
 import LanguagesGenerator from './index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';