diff --git a/modules/benchmarks/BUILD.bazel b/modules/benchmarks/BUILD.bazel
index aea00ace1e..4067818ff2 100644
--- a/modules/benchmarks/BUILD.bazel
+++ b/modules/benchmarks/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
exports_files([
"tsconfig-build.json",
+ "tsconfig-e2e.json",
"start-server.js",
])
diff --git a/modules/benchmarks/e2e_test/largeform_spec.ts b/modules/benchmarks/e2e_test/largeform_spec.ts
deleted file mode 100644
index 4a837dd492..0000000000
--- a/modules/benchmarks/e2e_test/largeform_spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {openBrowser, verifyNoBrowserErrors} from 'e2e_util/e2e_util';
-import {$, By, element} from 'protractor';
-
-describe('largeform benchmark spec', () => {
-
- afterEach(verifyNoBrowserErrors);
-
- it('should work for ng2', () => {
- testLargeformBenchmark({
- url: 'all/benchmarks/src/largeform/ng2/index.html',
- });
- });
-
- function testLargeformBenchmark(
- openConfig: {url: string, ignoreBrowserSynchronization?: boolean}) {
- openBrowser({
- url: openConfig.url,
- params: [{name: 'copies', value: 1}],
- ignoreBrowserSynchronization: openConfig.ignoreBrowserSynchronization,
- });
- $('#createDom').click();
- expect(element.all(By.css('input[name=value0]')).get(0).getAttribute('value'))
- .toBe('someValue0');
- $('#destroyDom').click();
- expect(element.all(By.css('input[name=value0]')).count()).toBe(0);
- }
-});
diff --git a/modules/benchmarks/src/largeform/BUILD.bazel b/modules/benchmarks/src/largeform/BUILD.bazel
new file mode 100644
index 0000000000..0bfbe75e36
--- /dev/null
+++ b/modules/benchmarks/src/largeform/BUILD.bazel
@@ -0,0 +1,15 @@
+package(default_visibility = ["//modules/benchmarks:__subpackages__"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+ name = "tests_lib",
+ testonly = 1,
+ srcs = ["largeform_perf.spec.ts"],
+ tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
+ deps = [
+ "//modules/e2e_util",
+ "@ngdeps//@types/jasminewd2",
+ "@ngdeps//protractor",
+ ],
+)
diff --git a/modules/benchmarks/e2e_test/largeform_perf.ts b/modules/benchmarks/src/largeform/largeform_perf.spec.ts
similarity index 54%
rename from modules/benchmarks/e2e_test/largeform_perf.ts
rename to modules/benchmarks/src/largeform/largeform_perf.spec.ts
index 42165a0358..1210745425 100644
--- a/modules/benchmarks/e2e_test/largeform_perf.ts
+++ b/modules/benchmarks/src/largeform/largeform_perf.spec.ts
@@ -6,8 +6,10 @@
* found in the LICENSE file at https://angular.io/license
*/
-import {runBenchmark, verifyNoBrowserErrors} from 'e2e_util/perf_util';
-import {$} from 'protractor';
+import {$, By, element} from 'protractor';
+
+import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
+import {runBenchmark} from '../../../e2e_util/perf_util';
interface Worker {
id: string;
@@ -15,7 +17,7 @@ interface Worker {
work(): void;
}
-const CreateAndDestroyWorker: Worker = {
+const CreateAndDestroyWorker = {
id: 'createDestroy',
work: () => {
$('#createDom').click();
@@ -23,18 +25,28 @@ const CreateAndDestroyWorker: Worker = {
}
};
-describe('largeform benchmark perf', () => {
+describe('largeform benchmark spec', () => {
afterEach(verifyNoBrowserErrors);
+ it('should work for ng2', () => {
+ openBrowser({
+ url: '/',
+ params: [{name: 'copies', value: 1}],
+ ignoreBrowserSynchronization: true,
+ });
+ $('#createDom').click();
+ expect(element.all(By.css('input[name=value0]')).get(0).getAttribute('value'))
+ .toBe('someValue0');
+ $('#destroyDom').click();
+ expect(element.all(By.css('input[name=value0]')).count()).toBe(0);
+ });
+
[CreateAndDestroyWorker].forEach((worker) => {
describe(worker.id, () => {
it('should run for ng2', done => {
- runLargeFormBenchmark({
- id: `largeform.ng2.${worker.id}`,
- url: 'all/benchmarks/src/largeform/ng2/index.html',
- worker: worker
- }).then(done, done.fail);
+ runLargeFormBenchmark({url: '/', id: `largeform.ng2.${worker.id}`, worker: worker})
+ .then(done, done.fail);
});
});
});
diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
new file mode 100644
index 0000000000..741b3cf264
--- /dev/null
+++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
@@ -0,0 +1,45 @@
+load("//tools:defaults.bzl", "ng_module")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
+
+package(default_visibility = ["//modules/benchmarks:__subpackages__"])
+
+# Note that this benchmark has been designed for Angular with ViewEngine, but once ViewEngine is
+# removed, we should keep this benchmark and run it with Ivy (potentially rename it to "render3")
+ng_module(
+ name = "ng2",
+ srcs = glob(["*.ts"]),
+ # FIXME-IVY(FW-998): ExpressionTranslatorVisitor#visitWriteKeyExpr is not implemented.
+ tags = ["fixme-ivy-aot"],
+ tsconfig = "//modules/benchmarks:tsconfig-build.json",
+ # TODO: FW-1004 Type checking is currently not complete.
+ type_check = False,
+ deps = [
+ "//modules/benchmarks/src:util_lib",
+ "//packages/core",
+ "//packages/forms",
+ "//packages/platform-browser",
+ "//packages/platform-browser-dynamic",
+ ],
+)
+
+ts_devserver(
+ name = "devserver",
+ entry_module = "angular/modules/benchmarks/src/largeform/ng2/index",
+ index_html = "index.html",
+ port = 4200,
+ scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+ static_files = [
+ "@ngdeps//node_modules/zone.js:dist/zone.js",
+ "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+ ],
+ tags = ["fixme-ivy-aot"],
+ deps = [":ng2"],
+)
+
+benchmark_test(
+ name = "perf",
+ server = ":devserver",
+ tags = ["fixme-ivy-aot"],
+ deps = ["//modules/benchmarks/src/largeform:tests_lib"],
+)
diff --git a/modules/benchmarks/src/largeform/ng2/index.html b/modules/benchmarks/src/largeform/ng2/index.html
index 02796b44c6..8e327a95d3 100644
--- a/modules/benchmarks/src/largeform/ng2/index.html
+++ b/modules/benchmarks/src/largeform/ng2/index.html
@@ -19,11 +19,5 @@
-
-