refactor: move testy-utils under testing folder

This is so that it is easier to exlude this when globbing.

Author: alan-agius4

packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts

@@ -11,7 +11,7 @@ import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core'
 import express from 'express'; // eslint-disable-line import/no-extraneous-dependencies
 import * as http from 'http';
 import { AddressInfo } from 'net';
-import { createArchitect, host } from '../test-utils';
+import { createArchitect, host } from '../testing/test-utils';
 
 describe('AppShell Builder', () => {
   const target = { project: 'app', target: 'app-shell' };

packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts

@@ -11,7 +11,7 @@ import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder allow js', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder AOT', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/base-href_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder base href', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/browser-support_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder browser support', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/build-optimizer_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder build optimizer', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/bundle-budgets_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder bundle budgets', () => {
   const cssExtensions = ['css', 'scss', 'less', 'styl'];

packages/angular_devkit/build_angular/src/browser/specs/cross-origin_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput, CrossOrigin } from '@angular-devkit/build-angular';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder crossOrigin', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/deploy-url_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder deploy url', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { PathFragment } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 const TEST_TIMEOUT = 8 * 60 * 1000;
 

packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder errors', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/font-optimization_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder font optimization', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/index_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, tags, virtualFs, workspaces } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder index HTML processing', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts

@@ -16,7 +16,7 @@ import {
   host,
   lazyModuleFiles,
   lazyModuleFnImport,
-} from '../../test-utils';
+} from '../../testing/test-utils';
 
 describe('Browser Builder lazy modules', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/no-entry-module_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder no entry module', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder optimization level', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/output-path_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { getSystemPath, join, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder output path', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/poll_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder poll', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts

@@ -15,7 +15,7 @@ import {
   lazyModuleFiles,
   lazyModuleFnImport,
   outputPath,
-} from '../../test-utils';
+} from '../../testing/test-utils';
 
 describe('Browser Builder rebuilds', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/replacements_spec.ts

@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect';
 import { logging, normalize, virtualFs } from '@angular-devkit/core';
 import { of, race } from 'rxjs';
 import { delay, filter, map, take, takeUntil, takeWhile, tap, timeout } from 'rxjs/operators';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder file replacements', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { join, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { createArchitect, host, outputPath } from '../../test-utils';
+import { createArchitect, host, outputPath } from '../../testing/test-utils';
 
 describe('Browser Builder resolve json module', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/resources-output-path_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder styles resources output path', () => {
   const imgSvg = `

packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder scripts array', () => {
   const scripts: { [path: string]: string } = {

packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder service worker', () => {
   const manifest = {

packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { OutputHashing } from '@angular-devkit/build-angular';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder source map', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/stats-json_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder stats json', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { normalize, tags } from '@angular-devkit/core';
 import { dirname } from 'path';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder styles', () => {
   const extensionsWithImportSupport = ['css', 'scss', 'less', 'styl'];

packages/angular_devkit/build_angular/src/browser/specs/svg_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host, outputPath } from '../../test-utils';
+import { createArchitect, host, outputPath } from '../../testing/test-utils';
 
 describe('Browser Builder allow svg', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder tsconfig paths', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/unused-files-warning_spec.ts

@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { logging } from '@angular-devkit/core';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder unused files warnings', () => {
   const warningMessageSuffix = `is part of the TypeScript compilation but it's unused`;

packages/angular_devkit/build_angular/src/browser/specs/vendor-chunk_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder vendor chunk', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../testing/test-utils';
 
 describe('Browser Builder external source map', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts

@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect';
 import { join, logging, virtualFs } from '@angular-devkit/core';
 import { timer } from 'rxjs';
 import { debounceTime, map, switchMap, takeWhile, tap } from 'rxjs/operators';
-import { browserBuild, createArchitect, host, outputPath } from '../../test-utils';
+import { browserBuild, createArchitect, host, outputPath } from '../../testing/test-utils';
 
 describe('Browser Builder Web Worker support', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts

@@ -13,7 +13,7 @@ import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page';
 import puppeteer from 'puppeteer/lib/cjs/puppeteer/node';
 /* eslint-enable import/no-extraneous-dependencies */
 import { debounceTime, switchMap, take } from 'rxjs/operators';
-import { createArchitect, host } from '../test-utils';
+import { createArchitect, host } from '../testing/test-utils';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 declare const document: any;

packages/angular_devkit/build_angular/src/dev-server/index_spec.ts

@@ -9,7 +9,7 @@
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { workspaces } from '@angular-devkit/core';
 import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
-import { createArchitect, host } from '../test-utils';
+import { createArchitect, host } from '../testing/test-utils';
 
 describe('Dev Server Builder index', () => {
   const targetSpec = { project: 'app', target: 'serve' };

packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts

@@ -15,7 +15,7 @@ import { Browser } from 'puppeteer/lib/cjs/puppeteer/common/Browser';
 import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page';
 import puppeteer from 'puppeteer/lib/cjs/puppeteer/node';
 import { debounceTime, switchMap, take } from 'rxjs/operators';
-import { createArchitect, host } from '../test-utils';
+import { createArchitect, host } from '../testing/test-utils';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare const document: any;

packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts

@@ -11,7 +11,7 @@ import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { tags } from '@angular-devkit/core';
 import * as https from 'https';
 import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
-import { createArchitect, host } from '../test-utils';
+import { createArchitect, host } from '../testing/test-utils';
 
 describe('Dev Server Builder ssl', () => {
   const target = { project: 'app', target: 'serve' };

packages/angular_devkit/build_angular/src/dev-server/works_spec.ts

@@ -10,7 +10,7 @@ import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
-import { createArchitect, host } from '../test-utils';
+import { createArchitect, host } from '../testing/test-utils';
 
 describe('Dev Server Builder', () => {
   const target = { project: 'app', target: 'serve' };

packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, extractI18nTargetSpec, host } from '../test-utils';
+import { createArchitect, extractI18nTargetSpec, host } from '../testing/test-utils';
 
 describe('Extract i18n Target', () => {
   const extractionFile = join(normalize('src'), 'messages.xlf');

packages/angular_devkit/build_angular/src/protractor/works_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { JsonObject, normalize } from '@angular-devkit/core';
-import { createArchitect, host, protractorTargetSpec } from '../test-utils';
+import { createArchitect, host, protractorTargetSpec } from '../testing/test-utils';
 
 describe('Protractor Builder', () => {
   let architect: Architect;
@@ -29,7 +29,7 @@ describe('Protractor Builder', () => {
   });
 
   it('fails with no devServerTarget and no standalone server', async () => {
-    const overrides = ({ devServerTarget: undefined } as unknown) as JsonObject;
+    const overrides = { devServerTarget: undefined } as unknown as JsonObject;
     const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
 
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));

packages/angular_devkit/build_angular/src/testing/jasmine-helpers.ts

@@ -9,8 +9,8 @@
 import { BuilderHandlerFn } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
-import { host } from '../test-utils';
 import { BuilderHarness } from './builder-harness';
+import { host } from './test-utils';
 
 const optionSchemaCache = new Map<string, json.schema.JsonSchema>();