feedback

Author: Artmann

src/standalone/import-export/importTracker.unit.test.ts

@@ -17,9 +17,8 @@ import {
 } from '../../platform/common/constants';
 import { dispose } from '../../platform/common/utils/lifecycle';
 import { IDisposable } from '../../platform/common/types';
-import { getTelemetrySafeHashedString } from '../../platform/telemetry/helpers';
 import { ImportTracker } from './importTracker';
-import { ResourceTypeTelemetryProperty, getTelemetryReporter } from '../../telemetry';
+import { getTelemetryReporter } from '../../telemetry';
 import { createMockedNotebookDocument } from '../../test/datascience/editor-integration/helpers';
 import { mockedVSCodeNamespaces } from '../../test/vscode-mock';
 import { EmptyEvent } from '../../platform/common/utils/events';
@@ -32,15 +31,6 @@ suite(`Import Tracker`, async () => {
     let onDidOpenNbEvent: EventEmitter<NotebookDocument>;
     let onDidCloseNbEvent: EventEmitter<NotebookDocument>;
     let onDidSaveNbEvent: EventEmitter<NotebookDocument>;
-    let pandasHash: string;
-    let elephasHash: string;
-    let kerasHash: string;
-    let pysparkHash: string;
-    let sparkdlHash: string;
-    let numpyHash: string;
-    let scipyHash: string;
-    let sklearnHash: string;
-    let randomHash: string;
     let disposables: IDisposable[] = [];
     let clock: fakeTimers.InstalledClock;
 
@@ -50,11 +40,7 @@ suite(`Import Tracker`, async () => {
         public static measures: {}[] = [];
 
         // Telemetry is now disabled, so this method just ensures the tracker doesn't crash
-        public static async expectHashes(
-            when: 'onExecution' | 'onOpenCloseOrSave' = 'onOpenCloseOrSave',
-            resourceType: ResourceTypeTelemetryProperty['resourceType'] = undefined,
-            ...hashes: string[]
-        ) {
+        public static async expectHashes() {
             clock.tick(1);
             void clock.runAllAsync();
             // Telemetry verification removed as telemetry is now disabled
@@ -66,17 +52,6 @@ suite(`Import Tracker`, async () => {
             Reporter.measures.push(measures!);
         }
     }
-    suiteSetup(async () => {
-        pandasHash = await getTelemetrySafeHashedString('pandas');
-        elephasHash = await getTelemetrySafeHashedString('elephas');
-        kerasHash = await getTelemetrySafeHashedString('keras');
-        pysparkHash = await getTelemetrySafeHashedString('pyspark');
-        sparkdlHash = await getTelemetrySafeHashedString('sparkdl');
-        numpyHash = await getTelemetrySafeHashedString('numpy');
-        scipyHash = await getTelemetrySafeHashedString('scipy');
-        sklearnHash = await getTelemetrySafeHashedString('sklearn');
-        randomHash = await getTelemetrySafeHashedString('random');
-    });
     setup(() => {
         const reporter = getTelemetryReporter();
         sinon.stub(reporter, 'sendTelemetryEvent').callsFake((eventName: string, properties?: {}, measures?: {}) => {
@@ -125,21 +100,21 @@ suite(`Import Tracker`, async () => {
         const nb = createMockedNotebookDocument([{ kind: NotebookCellKind.Code, languageId: 'python', value: code }]);
         onDidOpenNbEvent.fire(nb);
 
-        await Reporter.expectHashes('onOpenCloseOrSave', 'notebook', pandasHash);
+        await Reporter.expectHashes();
     });
     test('Close document', async () => {
         const code = `import pandas\r\n`;
         const nb = createMockedNotebookDocument([{ kind: NotebookCellKind.Code, languageId: 'python', value: code }]);
         onDidCloseNbEvent.fire(nb);
 
-        await Reporter.expectHashes('onOpenCloseOrSave', 'notebook', pandasHash);
+        await Reporter.expectHashes();
     });
     test('Save document', async () => {
         const code = `import pandas\r\n`;
         const nb = createMockedNotebookDocument([{ kind: NotebookCellKind.Code, languageId: 'python', value: code }]);
         onDidSaveNbEvent.fire(nb);
 
-        await Reporter.expectHashes('onOpenCloseOrSave', 'notebook', pandasHash);
+        await Reporter.expectHashes();
     });
 
     test('Already opened documents', async () => {
@@ -149,13 +124,9 @@ suite(`Import Tracker`, async () => {
 
         await importTracker.activate();
 
-        await Reporter.expectHashes('onOpenCloseOrSave', 'notebook', pandasHash);
+        await Reporter.expectHashes();
     });
-    async function testImports(
-        code: string,
-        notebookType: typeof JupyterNotebookView | typeof InteractiveWindowView,
-        ...expectedPackageHashes: string[]
-    ) {
+    async function testImports(code: string, notebookType: typeof JupyterNotebookView | typeof InteractiveWindowView) {
         const nb = createMockedNotebookDocument(
             [{ kind: NotebookCellKind.Code, languageId: 'python', value: code }],
             undefined,
@@ -166,11 +137,7 @@ suite(`Import Tracker`, async () => {
 
         await importTracker.activate();
 
-        await Reporter.expectHashes(
-            'onOpenCloseOrSave',
-            notebookType === 'jupyter-notebook' ? 'notebook' : 'interactive',
-            ...expectedPackageHashes
-        );
+        await Reporter.expectHashes();
     }
     test('from <pkg>._ import _, _', async () => {
         const code = `
@@ -192,7 +159,7 @@ suite(`Import Tracker`, async () => {
 
             weights = adapter.retrieve_keras_weights(java_model)
             model.set_weights(weights)`;
-        await testImports(code, 'jupyter-notebook', elephasHash, kerasHash);
+        await testImports(code, 'jupyter-notebook');
     });
 
     test('from <pkg>._ import _', async () => {
@@ -213,7 +180,7 @@ suite(`Import Tracker`, async () => {
             evaluator = MulticlassClassificationEvaluator(metricName="accuracy")
             print("Training set accuracy = " + str(evaluator.evaluate(predictionAndLabels)))`;
 
-        await testImports(code, 'interactive', pysparkHash, sparkdlHash);
+        await testImports(code, 'interactive');
     });
 
     test('import <pkg> as _', async () => {
@@ -229,7 +196,7 @@ suite(`Import Tracker`, async () => {
         df.Age = categories
         return df`;
 
-        await testImports(code, 'interactive', pandasHash, numpyHash, randomHash);
+        await testImports(code, 'interactive');
     });
 
     test('from <pkg> import _', async () => {
@@ -243,12 +210,12 @@ suite(`Import Tracker`, async () => {
     y = np.array([r * np.sin(theta) for r in radius])
     z = np.array([drumhead_height(1, 1, r, theta, 0.5) for r in radius])`;
 
-        await testImports(code, 'interactive', scipyHash);
+        await testImports(code, 'interactive');
     });
 
     test('from <pkg> import _ as _', async () => {
         const code = `from pandas import DataFrame as df`;
-        await testImports(code, 'jupyter-notebook', pandasHash);
+        await testImports(code, 'jupyter-notebook');
     });
 
     test('import <pkg1>, <pkg2>', async () => {
@@ -261,7 +228,7 @@ suite(`Import Tracker`, async () => {
     x = np.array([r * np.cos(theta) for r in radius])
     y = np.array([r * np.sin(theta) for r in radius])
     z = np.array([drumhead_height(1, 1, r, theta, 0.5) for r in radius])`;
-        await testImports(code, 'interactive', sklearnHash, pandasHash);
+        await testImports(code, 'interactive');
     });
 
     test('Import from within a function', async () => {
@@ -275,14 +242,14 @@ suite(`Import Tracker`, async () => {
     y = np.array([r * np.sin(theta) for r in radius])
     z = np.array([drumhead_height(1, 1, r, theta, 0.5) for r in radius])`;
 
-        await testImports(code, 'interactive', sklearnHash);
+        await testImports(code, 'interactive');
     });
 
     test('Do not send the same package twice', async () => {
         const code = `
     import pandas
     import pandas`;
-        await testImports(code, 'interactive', pandasHash);
+        await testImports(code, 'interactive');
     });
 
     test('Ignore relative imports', async () => {
@@ -294,7 +261,7 @@ suite(`Import Tracker`, async () => {
         const nb = createMockedNotebookDocument([{ kind: NotebookCellKind.Code, languageId: 'python', value: code }]);
         notebookCellExecutions.changeCellState(nb.cellAt(0), NotebookCellExecutionState.Pending);
 
-        await Reporter.expectHashes('onExecution', 'notebook', numpyHash);
+        await Reporter.expectHashes();
 
         // Executing the cell multiple will have no effect, the telemetry is only sent once.
         notebookCellExecutions.changeCellState(nb.cellAt(0), NotebookCellExecutionState.Pending);
@@ -304,6 +271,6 @@ suite(`Import Tracker`, async () => {
         notebookCellExecutions.changeCellState(nb.cellAt(0), NotebookCellExecutionState.Executing);
         notebookCellExecutions.changeCellState(nb.cellAt(0), NotebookCellExecutionState.Idle);
 
-        await Reporter.expectHashes('onExecution', 'notebook', numpyHash);
+        await Reporter.expectHashes();
     });
 });