Update unit/core tests

Author: rosahbruno

glean/tests/unit/core/context.spec.ts

@@ -5,51 +5,39 @@
 import assert from "assert";
 
 import { Context } from "../../../src/core/context";
-import Dispatcher from "../../../src/core/dispatcher";
-import Glean from "../../../src/core/glean/async";
-import MetricsDatabase from "../../../src/core/metrics/database/async";
-import EventsDatabase from "../../../src/core/metrics/events_database/async";
-import PingsDatabase from "../../../src/core/pings/database/async";
+import Glean from "../../../src/core/glean";
+import MetricsDatabase from "../../../src/core/metrics/database";
+import EventsDatabase from "../../../src/core/metrics/events_database";
+import PingsDatabase from "../../../src/core/pings/database";
 import { testResetGlean } from "../../../src/core/testing";
 import { testUninitializeGlean } from "../../../src/core/testing/utils";
 import { sanitizeApplicationId } from "../../../src/core/utils";
 
 describe("Context", function() {
   const testAppId = `gleanjs.test.${this.title}`;
 
-  beforeEach(async function () {
-    await testResetGlean(testAppId);
+  beforeEach(function () {
+    testResetGlean(testAppId);
   });
 
-  it("dispatcher contains the expected value", async function () {
-    assert.notStrictEqual(Context.dispatcher, undefined);
-    assert.ok(Context.dispatcher instanceof Dispatcher);
-
-    await testUninitializeGlean();
-    // Dispatcher should be available when Glean is uninitialized too.
-    assert.notStrictEqual(Context.dispatcher, undefined);
-    assert.ok((Context.dispatcher as unknown) instanceof Dispatcher);
-  });
-
-  it("uploadEnabled contains the expected value", async function () {
+  it("uploadEnabled contains the expected value", function () {
     assert.strictEqual(Context.uploadEnabled, true);
 
     Glean.setUploadEnabled(false);
-    await Context.dispatcher.testBlockOnQueue();
     assert.strictEqual(Context.uploadEnabled, false);
   });
 
-  it("appId contains the expected value", async function () {
+  it("appId contains the expected value", function () {
     assert.strictEqual(Context.applicationId, sanitizeApplicationId(testAppId));
 
-    await testResetGlean("new-id");
+    testResetGlean("new-id");
     assert.strictEqual(Context.applicationId, sanitizeApplicationId("new-id"));
   });
 
-  it("initialized contains the expected value", async function () {
+  it("initialized contains the expected value", function () {
     assert.strictEqual(Context.initialized, true);
 
-    await testUninitializeGlean();
+    testUninitializeGlean();
     assert.strictEqual(Context.initialized, false);
   });
 
@@ -63,20 +51,4 @@ describe("Context", function() {
     assert.notStrictEqual(Context.pingsDatabase, undefined);
     assert.ok(Context.pingsDatabase instanceof PingsDatabase);
   });
-
-  it("the dispatcher is always available", function () {
-    const originalDispatcher = Context.dispatcher;
-    assert.notStrictEqual(originalDispatcher, null);
-
-    Context.testUninitialize();
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    assert.strictEqual(Context._instance?._dispatcher, undefined);
-
-    // Trying to access the dispatcher will instantiate a new one.
-    const newDispatcher = Context.instance;
-    assert.notStrictEqual(newDispatcher, null);
-    assert.notStrictEqual(newDispatcher, originalDispatcher);
-  });
 });

glean/tests/unit/core/error_recording.spec.ts

@@ -14,11 +14,11 @@ import { combineIdentifierAndLabel } from "../../../src/core/metrics/types/label
 describe("error_recording", function() {
   const testAppId = `gleanjs.test.${this.title}`;
 
-  beforeEach(async function() {
-    await testResetGlean(testAppId);
+  beforeEach(function() {
+    testResetGlean(testAppId);
   });
 
-  it("records error types correctly", async function () {
+  it("records error types correctly", function () {
     const metric = new StringMetricType({
       category: "aCategory",
       name: "aStringMetric",
@@ -27,14 +27,14 @@ describe("error_recording", function() {
       disabled: false
     });
 
-    await Context.errorManager.record(metric, ErrorType.InvalidValue, "Invalid value");
-    await Context.errorManager.record(metric, ErrorType.InvalidLabel, "Invalid label", 10);
+    Context.errorManager.record(metric, ErrorType.InvalidValue, "Invalid value");
+    Context.errorManager.record(metric, ErrorType.InvalidLabel, "Invalid label", 10);
 
-    assert.strictEqual(await Context.errorManager.testGetNumRecordedErrors(metric, ErrorType.InvalidValue), 1);
-    assert.strictEqual(await Context.errorManager.testGetNumRecordedErrors(metric, ErrorType.InvalidLabel), 10);
+    assert.strictEqual(Context.errorManager.testGetNumRecordedErrors(metric, ErrorType.InvalidValue), 1);
+    assert.strictEqual(Context.errorManager.testGetNumRecordedErrors(metric, ErrorType.InvalidLabel), 10);
   });
 
-  it("strips label when recording error to metric that contains label in it's name", async function () {
+  it("strips label when recording error to metric that contains label in it's name", function () {
     // Cannot use the LabeledMetricType here,
     // because it does not expose the internal metric types.
     const metric: Record<string, StringMetricType> = {
@@ -70,10 +70,10 @@ describe("error_recording", function() {
 
     // When the metric is created from a static label, it will contain the label in it's name,
     // otherwise the label stays underd the `dynamicLabel` property.
-    await Context.errorManager.record(metric.oneLabel, ErrorType.InvalidValue, "Invalid value");
-    await Context.errorManager.record(metric.anotherLabel, ErrorType.InvalidLabel, "Invalid label", 10);
+    Context.errorManager.record(metric.oneLabel, ErrorType.InvalidValue, "Invalid value");
+    Context.errorManager.record(metric.anotherLabel, ErrorType.InvalidLabel, "Invalid label", 10);
 
-    assert.strictEqual(await Context.errorManager.testGetNumRecordedErrors(metric.dynamicLabel, ErrorType.InvalidValue), 1);
-    assert.strictEqual(await Context.errorManager.testGetNumRecordedErrors(metric.dynamicLabel, ErrorType.InvalidLabel), 10);
+    assert.strictEqual(Context.errorManager.testGetNumRecordedErrors(metric.dynamicLabel, ErrorType.InvalidValue), 1);
+    assert.strictEqual(Context.errorManager.testGetNumRecordedErrors(metric.dynamicLabel, ErrorType.InvalidLabel), 10);
   });
 });