test: clean up internal testing utilities (#42177)

We have some internal proxies for all of the Jasmine functions, as well as some other helpers. This code hasn't been touched in more than 5 years, it can lead to confusion and it isn't really necessary since the same can be achieved using Jasmine. These changes remove most of the code and clean up our existing unit tests. PR Close #42177
angular · May 28, 2021 · 38fbad1 · 38fbad1
1 parent 66b447a
commit 38fbad1
Show file tree

Hide file tree

Showing 81 changed files with 2,150 additions and 2,949 deletions.
diff --git a/packages/benchpress/test/metric/multi_metric_spec.ts b/packages/benchpress/test/metric/multi_metric_spec.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
-
 import {Injector, Metric, MultiMetric} from '../../index';
 
 (function() {
@@ -22,29 +20,27 @@ function createMetric(ids: any[]) {
 }
 
 describe('multi metric', () => {
-  it('should merge descriptions', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-       createMetric(['m1', 'm2']).then((m) => {
-         expect(m.describe()).toEqual({'m1': 'describe', 'm2': 'describe'});
-         async.done();
-       });
-     }));
+  it('should merge descriptions', done => {
+    createMetric(['m1', 'm2']).then((m) => {
+      expect(m.describe()).toEqual({'m1': 'describe', 'm2': 'describe'});
+      done();
+    });
+  });
 
-  it('should merge all beginMeasure calls',
-     inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-       createMetric(['m1', 'm2']).then((m) => m.beginMeasure()).then((values) => {
-         expect(values).toEqual(['m1_beginMeasure', 'm2_beginMeasure']);
-         async.done();
-       });
-     }));
+  it('should merge all beginMeasure calls', done => {
+    createMetric(['m1', 'm2']).then((m) => m.beginMeasure()).then((values) => {
+      expect(values).toEqual(['m1_beginMeasure', 'm2_beginMeasure']);
+      done();
+    });
+  });
 
   [false, true].forEach((restartFlag) => {
-    it(`should merge all endMeasure calls for restart=${restartFlag}`,
-       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         createMetric(['m1', 'm2']).then((m) => m.endMeasure(restartFlag)).then((values) => {
-           expect(values).toEqual({'m1': {'restart': restartFlag}, 'm2': {'restart': restartFlag}});
-           async.done();
-         });
-       }));
+    it(`should merge all endMeasure calls for restart=${restartFlag}`, done => {
+      createMetric(['m1', 'm2']).then((m) => m.endMeasure(restartFlag)).then((values) => {
+        expect(values).toEqual({'m1': {'restart': restartFlag}, 'm2': {'restart': restartFlag}});
+        done();
+      });
+    });
   });
 });
 })();