From 9c55fc0f138cfd1c6fd632ba58211899cbb3dd46 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 16 Jan 2020 12:23:36 +0100
Subject: [PATCH] test: disambiguate e2e and perf spec files (#34753)

Currently, based on the file names it's not quite clear whether
a given `.spec.ts` file runs benchmark perf or benchmark e2e
functionality tests. To disambiguate these, we use new file
suffixs. i.e. `e2e-spec.ts` and `perf-spec.ts`.

PR Close #34753
---
 modules/benchmarks/src/class_bindings/BUILD.bazel         | 4 ++--
 ...benchmark_perf.spec.ts => class_bindings.perf-spec.ts} | 2 +-
 modules/benchmarks/src/expanding_rows/BUILD.bazel         | 4 ++--
 ...benchmark_perf.spec.ts => expanding_rows.perf-spec.ts} | 0
 modules/benchmarks/src/js-web-frameworks/BUILD.bazel      | 2 +-
 .../{perf.spec.ts => js-web-frameworks.perf-spec.ts}      | 0
 modules/benchmarks/src/largeform/BUILD.bazel              | 4 ++--
 .../{largeform.spec.ts => largeform.e2e-spec.ts}          | 0
 .../{largeform_perf.spec.ts => largeform.perf-spec.ts}    | 0
 modules/benchmarks/src/largetable/BUILD.bazel             | 4 ++--
 .../{largetable.spec.ts => largetable.e2e-spec.ts}        | 0
 .../{largetable_perf.spec.ts => largetable.perf-spec.ts}  | 0
 modules/benchmarks/src/tree/BUILD.bazel                   | 8 ++++----
 .../src/tree/{tree.spec.ts => tree.e2e-spec.ts}           | 0
 .../src/tree/{tree_perf.spec.ts => tree.perf-spec.ts}     | 0
 ...ct_changes.spec.ts => tree_detect_changes.e2e-spec.ts} | 0
 ...t_changes.spec.ts => tree_detect_changes.perf-spec.ts} | 0
 17 files changed, 14 insertions(+), 14 deletions(-)
 rename modules/benchmarks/src/class_bindings/{benchmark_perf.spec.ts => class_bindings.perf-spec.ts} (95%)
 rename modules/benchmarks/src/expanding_rows/{benchmark_perf.spec.ts => expanding_rows.perf-spec.ts} (100%)
 rename modules/benchmarks/src/js-web-frameworks/{perf.spec.ts => js-web-frameworks.perf-spec.ts} (100%)
 rename modules/benchmarks/src/largeform/{largeform.spec.ts => largeform.e2e-spec.ts} (100%)
 rename modules/benchmarks/src/largeform/{largeform_perf.spec.ts => largeform.perf-spec.ts} (100%)
 rename modules/benchmarks/src/largetable/{largetable.spec.ts => largetable.e2e-spec.ts} (100%)
 rename modules/benchmarks/src/largetable/{largetable_perf.spec.ts => largetable.perf-spec.ts} (100%)
 rename modules/benchmarks/src/tree/{tree.spec.ts => tree.e2e-spec.ts} (100%)
 rename modules/benchmarks/src/tree/{tree_perf.spec.ts => tree.perf-spec.ts} (100%)
 rename modules/benchmarks/src/tree/{tree_detect_changes.spec.ts => tree_detect_changes.e2e-spec.ts} (100%)
 rename modules/benchmarks/src/tree/{tree_perf_detect_changes.spec.ts => tree_detect_changes.perf-spec.ts} (100%)

diff --git a/modules/benchmarks/src/class_bindings/BUILD.bazel b/modules/benchmarks/src/class_bindings/BUILD.bazel
index 7e7241c655..da310ba857 100644
--- a/modules/benchmarks/src/class_bindings/BUILD.bazel
+++ b/modules/benchmarks/src/class_bindings/BUILD.bazel
@@ -7,7 +7,7 @@ ng_module(
     name = "application_lib",
     srcs = glob(
         ["**/*.ts"],
-        exclude = ["**/*.spec.ts"],
+        exclude = ["**/*.perf-spec.ts"],
     ),
     generate_ve_shims = True,
     deps = [
@@ -22,7 +22,7 @@ ng_module(
 ts_library(
     name = "perf_lib",
     testonly = 1,
-    srcs = ["benchmark_perf.spec.ts"],
+    srcs = ["class_bindings.perf-spec.ts"],
     deps = [
         "//modules/e2e_util",
         "@npm//protractor",
diff --git a/modules/benchmarks/src/class_bindings/benchmark_perf.spec.ts b/modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts
similarity index 95%
rename from modules/benchmarks/src/class_bindings/benchmark_perf.spec.ts
rename to modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts
index 4dba88ccc2..f4c5991b01 100644
--- a/modules/benchmarks/src/class_bindings/benchmark_perf.spec.ts
+++ b/modules/benchmarks/src/class_bindings/class_bindings.perf-spec.ts
@@ -9,7 +9,7 @@
 import {$, browser} from 'protractor';
 import {runBenchmark} from '../../../e2e_util/perf_util';
 
-describe('benchmarks', () => {
+describe('class bindings perf', () => {
 
   it('should work for update', done => {
     browser.rootEl = '#root';
diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
index 68bc4a9b4a..20f72503e8 100644
--- a/modules/benchmarks/src/expanding_rows/BUILD.bazel
+++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -7,7 +7,7 @@ ng_module(
     name = "application_lib",
     srcs = glob(
         ["**/*.ts"],
-        exclude = ["**/*.spec.ts"],
+        exclude = ["**/*.perf-spec.ts"],
     ),
     generate_ve_shims = True,
     deps = [
@@ -23,7 +23,7 @@ ng_module(
 ts_library(
     name = "perf_lib",
     testonly = 1,
-    srcs = ["benchmark_perf.spec.ts"],
+    srcs = ["expanding_rows.perf-spec.ts"],
     deps = [
         "//modules/e2e_util",
         "@npm//protractor",
diff --git a/modules/benchmarks/src/expanding_rows/benchmark_perf.spec.ts b/modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.ts
similarity index 100%
rename from modules/benchmarks/src/expanding_rows/benchmark_perf.spec.ts
rename to modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.ts
diff --git a/modules/benchmarks/src/js-web-frameworks/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/BUILD.bazel
index d319d9b297..8ffae59af6 100644
--- a/modules/benchmarks/src/js-web-frameworks/BUILD.bazel
+++ b/modules/benchmarks/src/js-web-frameworks/BUILD.bazel
@@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"])
 ts_library(
     name = "perf_lib",
     testonly = True,
-    srcs = ["perf.spec.ts"],
+    srcs = ["js-web-frameworks.perf-spec.ts"],
     deps = [
         "//modules/e2e_util",
         "@npm//protractor",
diff --git a/modules/benchmarks/src/js-web-frameworks/perf.spec.ts b/modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts
similarity index 100%
rename from modules/benchmarks/src/js-web-frameworks/perf.spec.ts
rename to modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts
diff --git a/modules/benchmarks/src/largeform/BUILD.bazel b/modules/benchmarks/src/largeform/BUILD.bazel
index 082e0a219b..4c6b8332a4 100644
--- a/modules/benchmarks/src/largeform/BUILD.bazel
+++ b/modules/benchmarks/src/largeform/BUILD.bazel
@@ -5,7 +5,7 @@ load("//tools:defaults.bzl", "ts_library")
 ts_library(
     name = "perf_tests_lib",
     testonly = 1,
-    srcs = ["largeform_perf.spec.ts"],
+    srcs = ["largeform.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
         "//modules/e2e_util",
@@ -16,7 +16,7 @@ ts_library(
 ts_library(
     name = "e2e_tests_lib",
     testonly = 1,
-    srcs = ["largeform.spec.ts"],
+    srcs = ["largeform.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
         "//modules/e2e_util",
diff --git a/modules/benchmarks/src/largeform/largeform.spec.ts b/modules/benchmarks/src/largeform/largeform.e2e-spec.ts
similarity index 100%
rename from modules/benchmarks/src/largeform/largeform.spec.ts
rename to modules/benchmarks/src/largeform/largeform.e2e-spec.ts
diff --git a/modules/benchmarks/src/largeform/largeform_perf.spec.ts b/modules/benchmarks/src/largeform/largeform.perf-spec.ts
similarity index 100%
rename from modules/benchmarks/src/largeform/largeform_perf.spec.ts
rename to modules/benchmarks/src/largeform/largeform.perf-spec.ts
diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel
index dad5717e86..43be9bd533 100644
--- a/modules/benchmarks/src/largetable/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/BUILD.bazel
@@ -11,7 +11,7 @@ ts_library(
 ts_library(
     name = "perf_tests_lib",
     testonly = 1,
-    srcs = ["largetable_perf.spec.ts"],
+    srcs = ["largetable.perf-spec.ts"],
     deps = [
         "//modules/e2e_util",
         "@npm//protractor",
@@ -21,7 +21,7 @@ ts_library(
 ts_library(
     name = "e2e_tests_lib",
     testonly = 1,
-    srcs = ["largetable.spec.ts"],
+    srcs = ["largetable.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
         "//modules/e2e_util",
diff --git a/modules/benchmarks/src/largetable/largetable.spec.ts b/modules/benchmarks/src/largetable/largetable.e2e-spec.ts
similarity index 100%
rename from modules/benchmarks/src/largetable/largetable.spec.ts
rename to modules/benchmarks/src/largetable/largetable.e2e-spec.ts
diff --git a/modules/benchmarks/src/largetable/largetable_perf.spec.ts b/modules/benchmarks/src/largetable/largetable.perf-spec.ts
similarity index 100%
rename from modules/benchmarks/src/largetable/largetable_perf.spec.ts
rename to modules/benchmarks/src/largetable/largetable.perf-spec.ts
diff --git a/modules/benchmarks/src/tree/BUILD.bazel b/modules/benchmarks/src/tree/BUILD.bazel
index f7d87e038a..f8a0865772 100644
--- a/modules/benchmarks/src/tree/BUILD.bazel
+++ b/modules/benchmarks/src/tree/BUILD.bazel
@@ -21,7 +21,7 @@ ts_library(
 ts_library(
     name = "perf_tests_lib",
     testonly = 1,
-    srcs = ["tree_perf.spec.ts"],
+    srcs = ["tree.perf-spec.ts"],
     deps = [
         ":test_utils_lib",
         "@npm//protractor",
@@ -31,7 +31,7 @@ ts_library(
 ts_library(
     name = "e2e_tests_lib",
     testonly = 1,
-    srcs = ["tree.spec.ts"],
+    srcs = ["tree.e2e-spec.ts"],
     deps = [
         ":test_utils_lib",
         "@npm//protractor",
@@ -41,7 +41,7 @@ ts_library(
 ts_library(
     name = "detect_changes_perf_tests_lib",
     testonly = 1,
-    srcs = ["tree_perf_detect_changes.spec.ts"],
+    srcs = ["tree_detect_changes.perf-spec.ts"],
     deps = [
         ":test_utils_lib",
         "@npm//protractor",
@@ -51,7 +51,7 @@ ts_library(
 ts_library(
     name = "detect_changes_e2e_tests_lib",
     testonly = 1,
-    srcs = ["tree_detect_changes.spec.ts"],
+    srcs = ["tree_detect_changes.e2e-spec.ts"],
     deps = [
         ":test_utils_lib",
         "@npm//protractor",
diff --git a/modules/benchmarks/src/tree/tree.spec.ts b/modules/benchmarks/src/tree/tree.e2e-spec.ts
similarity index 100%
rename from modules/benchmarks/src/tree/tree.spec.ts
rename to modules/benchmarks/src/tree/tree.e2e-spec.ts
diff --git a/modules/benchmarks/src/tree/tree_perf.spec.ts b/modules/benchmarks/src/tree/tree.perf-spec.ts
similarity index 100%
rename from modules/benchmarks/src/tree/tree_perf.spec.ts
rename to modules/benchmarks/src/tree/tree.perf-spec.ts
diff --git a/modules/benchmarks/src/tree/tree_detect_changes.spec.ts b/modules/benchmarks/src/tree/tree_detect_changes.e2e-spec.ts
similarity index 100%
rename from modules/benchmarks/src/tree/tree_detect_changes.spec.ts
rename to modules/benchmarks/src/tree/tree_detect_changes.e2e-spec.ts
diff --git a/modules/benchmarks/src/tree/tree_perf_detect_changes.spec.ts b/modules/benchmarks/src/tree/tree_detect_changes.perf-spec.ts
similarity index 100%
rename from modules/benchmarks/src/tree/tree_perf_detect_changes.spec.ts
rename to modules/benchmarks/src/tree/tree_detect_changes.perf-spec.ts