From 7924add50174948b4e1913b08c360a061e62df43 Mon Sep 17 00:00:00 2001 From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:40:44 -0700 Subject: [PATCH 1/2] remove stale code in testing --- .../testController/common/argumentsHelper.ts | 16 ---------------- .../testing/testController/pytest/runner.ts | 10 ---------- .../testing/testController/serviceRegistry.ts | 4 ---- .../testing/testController/unittest/runner.ts | 11 ----------- 4 files changed, 41 deletions(-) delete mode 100644 src/client/testing/testController/pytest/runner.ts delete mode 100644 src/client/testing/testController/unittest/runner.ts diff --git a/src/client/testing/testController/common/argumentsHelper.ts b/src/client/testing/testController/common/argumentsHelper.ts index ef2999551f02..c155d0197da7 100644 --- a/src/client/testing/testController/common/argumentsHelper.ts +++ b/src/client/testing/testController/common/argumentsHelper.ts @@ -3,22 +3,6 @@ import { traceWarn } from '../../../logging'; -export function getOptionValues(args: string[], option: string): string[] { - const values: string[] = []; - let returnNextValue = false; - for (const arg of args) { - if (returnNextValue) { - values.push(arg); - returnNextValue = false; - } else if (arg.startsWith(`${option}=`)) { - values.push(arg.substring(`${option}=`.length)); - } else if (arg === option) { - returnNextValue = true; - } - } - return values; -} - export function getPositionalArguments( args: string[], optionsWithArguments: string[] = [], diff --git a/src/client/testing/testController/pytest/runner.ts b/src/client/testing/testController/pytest/runner.ts deleted file mode 100644 index e62902e4060a..000000000000 --- a/src/client/testing/testController/pytest/runner.ts +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -import { ITestsRunner } from '../common/types'; - -export class PytestRunner implements ITestsRunner { - // eslint-disable-next-line @typescript-eslint/no-useless-constructor - constructor() { - // not used, but required for DI - } -} diff --git a/src/client/testing/testController/serviceRegistry.ts b/src/client/testing/testController/serviceRegistry.ts index 783af6fc8bda..612fec23a283 100644 --- a/src/client/testing/testController/serviceRegistry.ts +++ b/src/client/testing/testController/serviceRegistry.ts @@ -7,20 +7,16 @@ import { PYTEST_PROVIDER, UNITTEST_PROVIDER } from '../common/constants'; import { ITestFrameworkController, ITestsRunner, ITestController } from './common/types'; import { PythonTestController } from './controller'; import { PytestController } from './pytest/pytestController'; -import { PytestRunner } from './pytest/runner'; -import { UnittestRunner } from './unittest/runner'; import { UnittestController } from './unittest/unittestController'; export function registerTestControllerTypes(serviceManager: IServiceManager): void { serviceManager.addSingleton(ITestFrameworkController, PytestController, PYTEST_PROVIDER); - serviceManager.addSingleton(ITestsRunner, PytestRunner, PYTEST_PROVIDER); serviceManager.addSingleton( ITestFrameworkController, UnittestController, UNITTEST_PROVIDER, ); - serviceManager.addSingleton(ITestsRunner, UnittestRunner, UNITTEST_PROVIDER); serviceManager.addSingleton(ITestController, PythonTestController); serviceManager.addBinding(ITestController, IExtensionSingleActivationService); } diff --git a/src/client/testing/testController/unittest/runner.ts b/src/client/testing/testController/unittest/runner.ts deleted file mode 100644 index 45a0bddaeb75..000000000000 --- a/src/client/testing/testController/unittest/runner.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -import { ITestsRunner } from '../common/types'; - -export class UnittestRunner implements ITestsRunner { - // eslint-disable-next-line @typescript-eslint/no-useless-constructor - constructor() { - // not used, but required for DI - } -} From e8eedf5762ae39bbc00ee5ade746afd3feee69e6 Mon Sep 17 00:00:00 2001 From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:42:48 -0700 Subject: [PATCH 2/2] linting --- src/client/testing/testController/serviceRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/testing/testController/serviceRegistry.ts b/src/client/testing/testController/serviceRegistry.ts index 612fec23a283..03bf883e8eb1 100644 --- a/src/client/testing/testController/serviceRegistry.ts +++ b/src/client/testing/testController/serviceRegistry.ts @@ -4,7 +4,7 @@ import { IExtensionSingleActivationService } from '../../activation/types'; import { IServiceManager } from '../../ioc/types'; import { PYTEST_PROVIDER, UNITTEST_PROVIDER } from '../common/constants'; -import { ITestFrameworkController, ITestsRunner, ITestController } from './common/types'; +import { ITestFrameworkController, ITestController } from './common/types'; import { PythonTestController } from './controller'; import { PytestController } from './pytest/pytestController'; import { UnittestController } from './unittest/unittestController';