Rename test/functional dir to test/unit (#20185)

* Rename test/functional dir to test/unit * Update unit test dir in ads/README.md
ampproject · Jan 8, 2019 · d511ba3 · d511ba3
1 parent 7400700
commit d511ba3
Show file tree

Hide file tree

Showing 160 changed files with 10 additions and 10 deletions.
diff --git a/ads/README.md b/ads/README.md
@@ -343,7 +343,7 @@ gulp test --watch --nobuild --files=test/functional/{test-ads-config.js,test-int
 
 ```
 
-If you have non-trivial logic in `/ads/yournetwork.js`, adding a unit test at `/test/functional/ads/test-yournetwork.js` is highly recommended.
+If you have non-trivial logic in `/ads/yournetwork.js`, adding a unit test at `/test/unit/ads/test-yournetwork.js` is highly recommended.
 
 ### Lint and type-check
 

diff --git a/build-system/config.js b/build-system/config.js
@@ -78,19 +78,19 @@ const chaiAsPromised = [
 ];
 
 const unitTestPaths = [
-  'test/functional/**/*.js',
+  'test/unit/**/*.js',
   'ads/**/test/test-*.js',
   'extensions/**/test/*.js',
 ];
 
 const unitTestOnSaucePaths = [
-  'test/functional/**/*.js',
+  'test/unit/**/*.js',
   'ads/**/test/test-*.js',
 ];
 
 const integrationTestPaths = [
   'test/integration/**/*.js',
-  'test/functional/test-error.js',
+  'test/unit/test-error.js',
   'extensions/**/test/integration/**/*.js',
 ];
 

diff --git a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
@@ -311,7 +311,7 @@ describes.realWin('amp-ad-network-adsense-impl', {
             exp ? '' : 'immediate');
         expect(impl.ampAnalyticsElement_).to.be.ok;
         // Exact format of amp-analytics element covered in
-        // test/functional/test-analytics.js.
+        // test/unit/test-analytics.js.
         // Just ensure extensions is loaded, and analytics element appended.
       });
     });

diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
@@ -383,7 +383,7 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
             exp ? '' : 'immediate');
         expect(impl.ampAnalyticsElement_).to.be.ok;
         // Exact format of amp-analytics element covered in
-        // test/functional/test-analytics.js.
+        // test/unit/test-analytics.js.
         // Just ensure extensions is loaded, and analytics element appended.
       });
     });

diff --git a/test/functional/3p/test-3p-messaging.js → test/unit/3p/test-3p-messaging.js b/test/functional/3p/test-3p-messaging.js → test/unit/3p/test-3p-messaging.js
diff --git a/...ctional/3p/test-ampcontext-integration.js → test/unit/3p/test-ampcontext-integration.js b/...ctional/3p/test-ampcontext-integration.js → test/unit/3p/test-ampcontext-integration.js
diff --git a/...tional/3p/test-iframe-messaging-client.js → test/unit/3p/test-iframe-messaging-client.js b/...tional/3p/test-iframe-messaging-client.js → test/unit/3p/test-iframe-messaging-client.js
diff --git a/test/functional/3p/test-recaptcha.js → test/unit/3p/test-recaptcha.js b/test/functional/3p/test-recaptcha.js → test/unit/3p/test-recaptcha.js
diff --git a/test/functional/ads/test-adplugg.js → test/unit/ads/test-adplugg.js b/test/functional/ads/test-adplugg.js → test/unit/ads/test-adplugg.js
diff --git a/test/functional/ads/test-csa.js → test/unit/ads/test-csa.js b/test/functional/ads/test-csa.js → test/unit/ads/test-csa.js
diff --git a/test/functional/ads/test-unruly.js → test/unit/ads/test-unruly.js b/test/functional/ads/test-unruly.js → test/unit/ads/test-unruly.js
diff --git a/...abox/test-inabox-frame-overlay-manager.js → ...abox/test-inabox-frame-overlay-manager.js b/...abox/test-inabox-frame-overlay-manager.js → ...abox/test-inabox-frame-overlay-manager.js
diff --git a/test/functional/inabox/test-inabox-host.js → test/unit/inabox/test-inabox-host.js b/test/functional/inabox/test-inabox-host.js → test/unit/inabox/test-inabox-host.js
diff --git a/...onal/inabox/test-inabox-messaging-host.js → ...unit/inabox/test-inabox-messaging-host.js b/...onal/inabox/test-inabox-messaging-host.js → ...unit/inabox/test-inabox-messaging-host.js
diff --git a/...functional/inabox/test-inabox-viewport.js → test/unit/inabox/test-inabox-viewport.js b/...functional/inabox/test-inabox-viewport.js → test/unit/inabox/test-inabox-viewport.js
diff --git a/...nctional/inabox/test-position-observer.js → test/unit/inabox/test-position-observer.js b/...nctional/inabox/test-position-observer.js → test/unit/inabox/test-position-observer.js
diff --git a/test/functional/inabox/test-utils.js → test/unit/inabox/test-utils.js b/test/functional/inabox/test-utils.js → test/unit/inabox/test-utils.js
diff --git a/test/functional/test-3p-environment.js → test/unit/test-3p-environment.js b/test/functional/test-3p-environment.js → test/unit/test-3p-environment.js
diff --git a/test/functional/test-3p.js → test/unit/test-3p.js b/test/functional/test-3p.js → test/unit/test-3p.js
@@ -248,7 +248,7 @@ describe('3p', () => {
     });
 
     it('should handle onSuccess callback', done => {
-      loadScript(window, 'http://localhost:9876/test/functional/test-3p.js', () => {
+      loadScript(window, 'http://localhost:9876/test/unit/test-3p.js', () => {
         done();
       }, () => {
         done('onError should not be called!');

diff --git a/test/functional/test-action.js → test/unit/test-action.js b/test/functional/test-action.js → test/unit/test-action.js
diff --git a/test/functional/test-activity.js → test/unit/test-activity.js b/test/functional/test-activity.js → test/unit/test-activity.js
diff --git a/test/functional/test-ad-cid.js → test/unit/test-ad-cid.js b/test/functional/test-ad-cid.js → test/unit/test-ad-cid.js
diff --git a/test/functional/test-ad-helper.js → test/unit/test-ad-helper.js b/test/functional/test-ad-helper.js → test/unit/test-ad-helper.js
diff --git a/test/functional/test-ads-config.js → test/unit/test-ads-config.js b/test/functional/test-ads-config.js → test/unit/test-ads-config.js
diff --git a/test/functional/test-alp-handler.js → test/unit/test-alp-handler.js b/test/functional/test-alp-handler.js → test/unit/test-alp-handler.js
diff --git a/test/functional/test-amp-context.js → test/unit/test-amp-context.js b/test/functional/test-amp-context.js → test/unit/test-amp-context.js
diff --git a/test/functional/test-amp-img.js → test/unit/test-amp-img.js b/test/functional/test-amp-img.js → test/unit/test-amp-img.js
diff --git a/test/functional/test-amp-pixel.js → test/unit/test-amp-pixel.js b/test/functional/test-amp-pixel.js → test/unit/test-amp-pixel.js
diff --git a/test/functional/test-ampdoc.js → test/unit/test-ampdoc.js b/test/functional/test-ampdoc.js → test/unit/test-ampdoc.js
diff --git a/test/functional/test-analytics.js → test/unit/test-analytics.js b/test/functional/test-analytics.js → test/unit/test-analytics.js
diff --git a/test/functional/test-animation.js → test/unit/test-animation.js b/test/functional/test-animation.js → test/unit/test-animation.js
diff --git a/test/functional/test-base-element.js → test/unit/test-base-element.js b/test/functional/test-base-element.js → test/unit/test-base-element.js
diff --git a/test/functional/test-batched-json.js → test/unit/test-batched-json.js b/test/functional/test-batched-json.js → test/unit/test-batched-json.js
diff --git a/test/functional/test-batched-xhr.js → test/unit/test-batched-xhr.js b/test/functional/test-batched-xhr.js → test/unit/test-batched-xhr.js
diff --git a/test/functional/test-cache-cid-api.js → test/unit/test-cache-cid-api.js b/test/functional/test-cache-cid-api.js → test/unit/test-cache-cid-api.js
diff --git a/test/functional/test-chunk.js → test/unit/test-chunk.js b/test/functional/test-chunk.js → test/unit/test-chunk.js
diff --git a/test/functional/test-cid-api.js → test/unit/test-cid-api.js b/test/functional/test-cid-api.js → test/unit/test-cid-api.js
diff --git a/test/functional/test-cid.js → test/unit/test-cid.js b/test/functional/test-cid.js → test/unit/test-cid.js
diff --git a/test/functional/test-cookies.js → test/unit/test-cookies.js b/test/functional/test-cookies.js → test/unit/test-cookies.js
diff --git a/test/functional/test-crypto.js → test/unit/test-crypto.js b/test/functional/test-crypto.js → test/unit/test-crypto.js
diff --git a/test/functional/test-curve.js → test/unit/test-curve.js b/test/functional/test-curve.js → test/unit/test-curve.js
diff --git a/...unctional/test-custom-element-registry.js → test/unit/test-custom-element-registry.js b/...unctional/test-custom-element-registry.js → test/unit/test-custom-element-registry.js
diff --git a/test/functional/test-custom-element.js → test/unit/test-custom-element.js b/test/functional/test-custom-element.js → test/unit/test-custom-element.js
diff --git a/test/functional/test-describes.js → test/unit/test-describes.js b/test/functional/test-describes.js → test/unit/test-describes.js
diff --git a/test/functional/test-document-info.js → test/unit/test-document-info.js b/test/functional/test-document-info.js → test/unit/test-document-info.js
diff --git a/test/functional/test-document-ready.js → test/unit/test-document-ready.js b/test/functional/test-document-ready.js → test/unit/test-document-ready.js
diff --git a/test/functional/test-document-state.js → test/unit/test-document-state.js b/test/functional/test-document-state.js → test/unit/test-document-state.js
diff --git a/test/functional/test-document-submit.js → test/unit/test-document-submit.js b/test/functional/test-document-submit.js → test/unit/test-document-submit.js
diff --git a/test/functional/test-dom.js → test/unit/test-dom.js b/test/functional/test-dom.js → test/unit/test-dom.js
diff --git a/test/functional/test-element-service.js → test/unit/test-element-service.js b/test/functional/test-element-service.js → test/unit/test-element-service.js
diff --git a/test/functional/test-error.js → test/unit/test-error.js b/test/functional/test-error.js → test/unit/test-error.js
diff --git a/test/functional/test-event-helper.js → test/unit/test-event-helper.js b/test/functional/test-event-helper.js → test/unit/test-event-helper.js
diff --git a/test/functional/test-experiments.js → test/unit/test-experiments.js b/test/functional/test-experiments.js → test/unit/test-experiments.js
diff --git a/test/functional/test-exponential-backoff.js → test/unit/test-exponential-backoff.js b/test/functional/test-exponential-backoff.js → test/unit/test-exponential-backoff.js
diff --git a/test/functional/test-extension-analytics.js → test/unit/test-extension-analytics.js b/test/functional/test-extension-analytics.js → test/unit/test-extension-analytics.js
diff --git a/test/functional/test-extension-location.js → test/unit/test-extension-location.js b/test/functional/test-extension-location.js → test/unit/test-extension-location.js
diff --git a/test/functional/test-extensions.js → test/unit/test-extensions.js b/test/functional/test-extensions.js → test/unit/test-extensions.js
diff --git a/test/functional/test-finite-state-machine.js → test/unit/test-finite-state-machine.js b/test/functional/test-finite-state-machine.js → test/unit/test-finite-state-machine.js
diff --git a/test/functional/test-fixed-layer.js → test/unit/test-fixed-layer.js b/test/functional/test-fixed-layer.js → test/unit/test-fixed-layer.js
diff --git a/test/functional/test-focus-history.js → test/unit/test-focus-history.js b/test/functional/test-focus-history.js → test/unit/test-focus-history.js
diff --git a/...unctional/test-font-stylesheet-timeout.js → test/unit/test-font-stylesheet-timeout.js b/...unctional/test-font-stylesheet-timeout.js → test/unit/test-font-stylesheet-timeout.js
diff --git a/test/functional/test-form-data-wrapper.js → test/unit/test-form-data-wrapper.js b/test/functional/test-form-data-wrapper.js → test/unit/test-form-data-wrapper.js
diff --git a/test/functional/test-form.js → test/unit/test-form.js b/test/functional/test-form.js → test/unit/test-form.js
diff --git a/.../functional/test-friendly-iframe-embed.js → test/unit/test-friendly-iframe-embed.js b/.../functional/test-friendly-iframe-embed.js → test/unit/test-friendly-iframe-embed.js
diff --git a/test/functional/test-gesture-recognizers.js → test/unit/test-gesture-recognizers.js b/test/functional/test-gesture-recognizers.js → test/unit/test-gesture-recognizers.js
diff --git a/test/functional/test-gesture.js → test/unit/test-gesture.js b/test/functional/test-gesture.js → test/unit/test-gesture.js
diff --git a/test/functional/test-get-html.js → test/unit/test-get-html.js b/test/functional/test-get-html.js → test/unit/test-get-html.js
diff --git a/test/functional/test-history.js → test/unit/test-history.js b/test/functional/test-history.js → test/unit/test-history.js
diff --git a/test/functional/test-ie-media-bug.js → test/unit/test-ie-media-bug.js b/test/functional/test-ie-media-bug.js → test/unit/test-ie-media-bug.js
diff --git a/test/functional/test-iframe-helper.js → test/unit/test-iframe-helper.js b/test/functional/test-iframe-helper.js → test/unit/test-iframe-helper.js
diff --git a/test/functional/test-iframe-stub.js → test/unit/test-iframe-stub.js b/test/functional/test-iframe-stub.js → test/unit/test-iframe-stub.js
diff --git a/test/functional/test-impression.js → test/unit/test-impression.js b/test/functional/test-impression.js → test/unit/test-impression.js
diff --git a/test/functional/test-input.js → test/unit/test-input.js b/test/functional/test-input.js → test/unit/test-input.js
diff --git a/test/functional/test-integration.js → test/unit/test-integration.js b/test/functional/test-integration.js → test/unit/test-integration.js
diff --git a/...al/test-intersection-observer-polyfill.js → ...it/test-intersection-observer-polyfill.js b/...al/test-intersection-observer-polyfill.js → ...it/test-intersection-observer-polyfill.js
diff --git a/.../functional/test-intersection-observer.js → test/unit/test-intersection-observer.js b/.../functional/test-intersection-observer.js → test/unit/test-intersection-observer.js
diff --git a/test/functional/test-jank-meter.js → test/unit/test-jank-meter.js b/test/functional/test-jank-meter.js → test/unit/test-jank-meter.js
diff --git a/test/functional/test-json.js → test/unit/test-json.js b/test/functional/test-json.js → test/unit/test-json.js
diff --git a/test/functional/test-layers.js → test/unit/test-layers.js b/test/functional/test-layers.js → test/unit/test-layers.js
diff --git a/test/functional/test-layout-delay-meter.js → test/unit/test-layout-delay-meter.js b/test/functional/test-layout-delay-meter.js → test/unit/test-layout-delay-meter.js
diff --git a/test/functional/test-layout-rect.js → test/unit/test-layout-rect.js b/test/functional/test-layout-rect.js → test/unit/test-layout-rect.js
diff --git a/test/functional/test-layout.js → test/unit/test-layout.js b/test/functional/test-layout.js → test/unit/test-layout.js
diff --git a/test/functional/test-log.js → test/unit/test-log.js b/test/functional/test-log.js → test/unit/test-log.js
diff --git a/test/functional/test-mediasession-helper.js → test/unit/test-mediasession-helper.js b/test/functional/test-mediasession-helper.js → test/unit/test-mediasession-helper.js
diff --git a/test/functional/test-mode.js → test/unit/test-mode.js b/test/functional/test-mode.js → test/unit/test-mode.js
diff --git a/test/functional/test-motion.js → test/unit/test-motion.js b/test/functional/test-motion.js → test/unit/test-motion.js
diff --git a/test/functional/test-mustache.js → test/unit/test-mustache.js b/test/functional/test-mustache.js → test/unit/test-mustache.js
diff --git a/test/functional/test-navigation.js → test/unit/test-navigation.js b/test/functional/test-navigation.js → test/unit/test-navigation.js
diff --git a/...unctional/test-notification-ui-manager.js → test/unit/test-notification-ui-manager.js b/...unctional/test-notification-ui-manager.js → test/unit/test-notification-ui-manager.js
diff --git a/test/functional/test-object.js → test/unit/test-object.js b/test/functional/test-object.js → test/unit/test-object.js
diff --git a/test/functional/test-observable.js → test/unit/test-observable.js b/test/functional/test-observable.js → test/unit/test-observable.js
diff --git a/test/functional/test-pass.js → test/unit/test-pass.js b/test/functional/test-pass.js → test/unit/test-pass.js
diff --git a/test/functional/test-performance.js → test/unit/test-performance.js b/test/functional/test-performance.js → test/unit/test-performance.js
diff --git a/test/functional/test-platform.js → test/unit/test-platform.js b/test/functional/test-platform.js → test/unit/test-platform.js
diff --git a/...unctional/test-polyfill-array-includes.js → test/unit/test-polyfill-array-includes.js b/...unctional/test-polyfill-array-includes.js → test/unit/test-polyfill-array-includes.js
diff --git a/...tional/test-polyfill-document-contains.js → test/unit/test-polyfill-document-contains.js b/...tional/test-polyfill-document-contains.js → test/unit/test-polyfill-document-contains.js
diff --git a/...onal/test-polyfill-domtokenlist-toggle.js → ...unit/test-polyfill-domtokenlist-toggle.js b/...onal/test-polyfill-domtokenlist-toggle.js → ...unit/test-polyfill-domtokenlist-toggle.js
diff --git a/test/functional/test-polyfill-math-sign.js → test/unit/test-polyfill-math-sign.js b/test/functional/test-polyfill-math-sign.js → test/unit/test-polyfill-math-sign.js
diff --git a/...functional/test-polyfill-object-assign.js → test/unit/test-polyfill-object-assign.js b/...functional/test-polyfill-object-assign.js → test/unit/test-polyfill-object-assign.js
diff --git a/...functional/test-polyfill-object-values.js → test/unit/test-polyfill-object-values.js b/...functional/test-polyfill-object-values.js → test/unit/test-polyfill-object-values.js
diff --git a/test/functional/test-position-observer.js → test/unit/test-position-observer.js b/test/functional/test-position-observer.js → test/unit/test-position-observer.js
diff --git a/test/functional/test-preconnect.js → test/unit/test-preconnect.js b/test/functional/test-preconnect.js → test/unit/test-preconnect.js
diff --git a/test/functional/test-pull-to-refresh.js → test/unit/test-pull-to-refresh.js b/test/functional/test-pull-to-refresh.js → test/unit/test-pull-to-refresh.js
diff --git a/test/functional/test-purifier.js → test/unit/test-purifier.js b/test/functional/test-purifier.js → test/unit/test-purifier.js
diff --git a/...nctional/test-render-delaying-services.js → test/unit/test-render-delaying-services.js b/...nctional/test-render-delaying-services.js → test/unit/test-render-delaying-services.js
diff --git a/test/functional/test-resource.js → test/unit/test-resource.js b/test/functional/test-resource.js → test/unit/test-resource.js
diff --git a/test/functional/test-resources.js → test/unit/test-resources.js b/test/functional/test-resources.js → test/unit/test-resources.js
diff --git a/test/functional/test-runtime.js → test/unit/test-runtime.js b/test/functional/test-runtime.js → test/unit/test-runtime.js
diff --git a/test/functional/test-sanitizer.js → test/unit/test-sanitizer.js b/test/functional/test-sanitizer.js → test/unit/test-sanitizer.js
diff --git a/test/functional/test-service.js → test/unit/test-service.js b/test/functional/test-service.js → test/unit/test-service.js
diff --git a/test/functional/test-shadow-embed.js → test/unit/test-shadow-embed.js b/test/functional/test-shadow-embed.js → test/unit/test-shadow-embed.js
diff --git a/test/functional/test-size-list.js → test/unit/test-size-list.js b/test/functional/test-size-list.js → test/unit/test-size-list.js
diff --git a/test/functional/test-srcset.js → test/unit/test-srcset.js b/test/functional/test-srcset.js → test/unit/test-srcset.js
diff --git a/test/functional/test-ssr-template-helper.js → test/unit/test-ssr-template-helper.js b/test/functional/test-ssr-template-helper.js → test/unit/test-ssr-template-helper.js
diff --git a/test/functional/test-standard-actions.js → test/unit/test-standard-actions.js b/test/functional/test-standard-actions.js → test/unit/test-standard-actions.js
diff --git a/test/functional/test-static-template.js → test/unit/test-static-template.js b/test/functional/test-static-template.js → test/unit/test-static-template.js
diff --git a/test/functional/test-storage.js → test/unit/test-storage.js b/test/functional/test-storage.js → test/unit/test-storage.js
diff --git a/test/functional/test-string.js → test/unit/test-string.js b/test/functional/test-string.js → test/unit/test-string.js
diff --git a/test/functional/test-style-installer.js → test/unit/test-style-installer.js b/test/functional/test-style-installer.js → test/unit/test-style-installer.js
diff --git a/test/functional/test-style.js → test/unit/test-style.js b/test/functional/test-style.js → test/unit/test-style.js
diff --git a/test/functional/test-task-queue.js → test/unit/test-task-queue.js b/test/functional/test-task-queue.js → test/unit/test-task-queue.js
diff --git a/test/functional/test-template.js → test/unit/test-template.js b/test/functional/test-template.js → test/unit/test-template.js
diff --git a/test/functional/test-timer.js → test/unit/test-timer.js b/test/functional/test-timer.js → test/unit/test-timer.js
diff --git a/test/functional/test-transition.js → test/unit/test-transition.js b/test/functional/test-transition.js → test/unit/test-transition.js
diff --git a/test/functional/test-types.js → test/unit/test-types.js b/test/functional/test-types.js → test/unit/test-types.js
diff --git a/test/functional/test-url-replacements.js → test/unit/test-url-replacements.js b/test/functional/test-url-replacements.js → test/unit/test-url-replacements.js
diff --git a/test/functional/test-url.js → test/unit/test-url.js b/test/functional/test-url.js → test/unit/test-url.js
diff --git a/.../functional/test-validator-integration.js → test/unit/test-validator-integration.js b/.../functional/test-validator-integration.js → test/unit/test-validator-integration.js
diff --git a/test/functional/test-variable-source.js → test/unit/test-variable-source.js b/test/functional/test-variable-source.js → test/unit/test-variable-source.js
diff --git a/...est-video-analytics-percentage-tracker.js → ...est-video-analytics-percentage-tracker.js b/...est-video-analytics-percentage-tracker.js → ...est-video-analytics-percentage-tracker.js
diff --git a/test/functional/test-video-autoplay.js → test/unit/test-video-autoplay.js b/test/functional/test-video-autoplay.js → test/unit/test-video-autoplay.js
diff --git a/...nctional/test-video-iframe-integration.js → test/unit/test-video-iframe-integration.js b/...nctional/test-video-iframe-integration.js → test/unit/test-video-iframe-integration.js
diff --git a/...tional/test-video-rotate-to-fullscreen.js → test/unit/test-video-rotate-to-fullscreen.js b/...tional/test-video-rotate-to-fullscreen.js → test/unit/test-video-rotate-to-fullscreen.js
diff --git a/.../functional/test-video-session-manager.js → test/unit/test-video-session-manager.js b/.../functional/test-video-session-manager.js → test/unit/test-video-session-manager.js
diff --git a/test/functional/test-viewer-cid-api.js → test/unit/test-viewer-cid-api.js b/test/functional/test-viewer-cid-api.js → test/unit/test-viewer-cid-api.js
diff --git a/test/functional/test-viewer.js → test/unit/test-viewer.js b/test/functional/test-viewer.js → test/unit/test-viewer.js
diff --git a/test/functional/test-viewport-binding.js → test/unit/test-viewport-binding.js b/test/functional/test-viewport-binding.js → test/unit/test-viewport-binding.js
diff --git a/test/functional/test-viewport.js → test/unit/test-viewport.js b/test/functional/test-viewport.js → test/unit/test-viewport.js
diff --git a/test/functional/test-vsync.js → test/unit/test-vsync.js b/test/functional/test-vsync.js → test/unit/test-vsync.js
diff --git a/test/functional/test-web-components.js → test/unit/test-web-components.js b/test/functional/test-web-components.js → test/unit/test-web-components.js
diff --git a/test/functional/test-xhr-document-fetcher.js → test/unit/test-xhr-document-fetcher.js b/test/functional/test-xhr-document-fetcher.js → test/unit/test-xhr-document-fetcher.js
diff --git a/test/functional/test-xhr-fetch-polyfill.js → test/unit/test-xhr-fetch-polyfill.js b/test/functional/test-xhr-fetch-polyfill.js → test/unit/test-xhr-fetch-polyfill.js
diff --git a/test/functional/test-xhr.js → test/unit/test-xhr.js b/test/functional/test-xhr.js → test/unit/test-xhr.js
diff --git a/test/functional/test-yield.js → test/unit/test-yield.js b/test/functional/test-yield.js → test/unit/test-yield.js
diff --git a/.../functional/url-expander/test-expander.js → test/unit/url-expander/test-expander.js b/.../functional/url-expander/test-expander.js → test/unit/url-expander/test-expander.js
diff --git a/test/functional/utils/test-array.js → test/unit/utils/test-array.js b/test/functional/utils/test-array.js → test/unit/utils/test-array.js
diff --git a/test/functional/utils/test-base64.js → test/unit/utils/test-base64.js b/test/functional/utils/test-base64.js → test/unit/utils/test-base64.js
diff --git a/test/functional/utils/test-bytes.js → test/unit/utils/test-bytes.js b/test/functional/utils/test-bytes.js → test/unit/utils/test-bytes.js
diff --git a/.../functional/utils/test-dom-fingerprint.js → test/unit/utils/test-dom-fingerprint.js b/.../functional/utils/test-dom-fingerprint.js → test/unit/utils/test-dom-fingerprint.js
diff --git a/test/functional/utils/test-lru-cache.js → test/unit/utils/test-lru-cache.js b/test/functional/utils/test-lru-cache.js → test/unit/utils/test-lru-cache.js
diff --git a/test/functional/utils/test-math.js → test/unit/utils/test-math.js b/test/functional/utils/test-math.js → test/unit/utils/test-math.js
diff --git a/test/functional/utils/test-pem.js → test/unit/utils/test-pem.js b/test/functional/utils/test-pem.js → test/unit/utils/test-pem.js
diff --git a/test/functional/utils/test-priority-queue.js → test/unit/utils/test-priority-queue.js b/test/functional/utils/test-priority-queue.js → test/unit/utils/test-priority-queue.js
diff --git a/test/functional/utils/test-promise.js → test/unit/utils/test-promise.js b/test/functional/utils/test-promise.js → test/unit/utils/test-promise.js
diff --git a/test/functional/utils/test-rate-limit.js → test/unit/utils/test-rate-limit.js b/test/functional/utils/test-rate-limit.js → test/unit/utils/test-rate-limit.js
diff --git a/test/functional/utils/test-signals.js → test/unit/utils/test-signals.js b/test/functional/utils/test-signals.js → test/unit/utils/test-signals.js
diff --git a/.../functional/web-worker/test-amp-worker.js → test/unit/web-worker/test-amp-worker.js b/.../functional/web-worker/test-amp-worker.js → test/unit/web-worker/test-amp-worker.js
diff --git a/validator/engine/parse-srcset_test.js b/validator/engine/parse-srcset_test.js
@@ -16,7 +16,7 @@
  *
  *  Credits:
  *    Original version of this file was derived from
- *    https://github.com/ampproject/amphtml/blob/master/test/functional/test-srcset.js
+ *    https://github.com/ampproject/amphtml/blob/master/test/unit/test-srcset.js
  */
 goog.provide('parse_srcset.ParseSrcsetTest');
 goog.require('parse_srcset.parseSrcset');

diff --git a/validator/testdata/feature_tests/amp_layouts.html b/validator/testdata/feature_tests/amp_layouts.html
@@ -15,7 +15,7 @@
 -->
 <!--
   Test Description:
-  This is a (partial) transcription from test/functional/test-layout.js.
+  This is a (partial) transcription from test/unit/test-layout.js.
 -->
 <!doctype html>
 <html ⚡>

diff --git a/validator/testdata/feature_tests/amp_layouts.out b/validator/testdata/feature_tests/amp_layouts.out
@@ -16,7 +16,7 @@ FAIL
 |  -->
 |  <!--
 |    Test Description:
-|    This is a (partial) transcription from test/functional/test-layout.js.
+|    This is a (partial) transcription from test/unit/test-layout.js.
 |  -->
 |  <!doctype html>
 |  <html ⚡>
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
-    If you have non-trivial logic in `/ads/yournetwork.js`, adding a unit test at `/test/functional/ads/test-yournetwork.js` is highly recommended.
+    If you have non-trivial logic in `/ads/yournetwork.js`, adding a unit test at `/test/unit/ads/test-yournetwork.js` is highly recommended.
     ### Lint and type-check
@@ Expand Down @@