From 37a9106ab8fcb450ab09e9ea186c6fdb05ad99d9 Mon Sep 17 00:00:00 2001 From: kenherring Date: Sat, 11 Jan 2025 18:55:42 -0500 Subject: [PATCH] cleanup --- test/suites/proj0.test.ts | 2 +- test/suites/proj1.test.ts | 22 ---------------------- test/testCommon.ts | 4 ++-- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/test/suites/proj0.test.ts b/test/suites/proj0.test.ts index c60dd36c..b11136a5 100644 --- a/test/suites/proj0.test.ts +++ b/test/suites/proj0.test.ts @@ -325,7 +325,7 @@ suite('proj0 - Extension Test Suite', () => { assert.equal(e, undefined, 'expected no error to be thrown, but got e=' + JSON.stringify(e, null, 2)) assert.fail('expected no error to be thrown but got e=' + JSON.stringify(e, null, 2)) } - assert.durationMoreThan(runTestsDuration, 2500) + assert.durationMoreThan(runTestsDuration, 2000) assert.durationLessThan(runTestsDuration, 3250) return }) diff --git a/test/suites/proj1.test.ts b/test/suites/proj1.test.ts index b7be8e3c..7c8eec13 100644 --- a/test/suites/proj1.test.ts +++ b/test/suites/proj1.test.ts @@ -287,28 +287,6 @@ suite('proj1 - Extension Test Suite', () => { return p }) - test('proj17 - coverage in class property getters/setters', async () => { - await runTestAtLine('test17.cls', 15, 1, true) - .then(() => { - assert.tests.count(1) - assert.tests.passed(1) - assert.tests.failed(0) - assert.tests.errored(0) - assert.tests.skipped(0) - }) - }) - - test('proj18 - coverage in class property getters/setters', async () => { - // await runTestAtLine(['test18A.cls', 'test18B.cls'], 15, 1, true) - // .then(() => { - // assert.tests.count(1) - // assert.tests.passed(1) - // assert.tests.failed(0) - // assert.tests.errored(0) - // assert.tests.skipped(0) - // }) - }) - test('proj1.98 - check startup parmaeters for -y -yx', async () => { FileUtils.copyFile(Uri.joinPath(workspaceUri, 'openedge-project.proj1.98.json'), Uri.joinPath(workspaceUri, 'openedge-project.json'), { force: true }) await runTestAtLine('import_charset.p', 68) diff --git a/test/testCommon.ts b/test/testCommon.ts index f259209f..5a2bfd11 100644 --- a/test/testCommon.ts +++ b/test/testCommon.ts @@ -573,7 +573,7 @@ export function runTestsInFile (filename: string, len = 1, coverage = false) { } export function runTestAtLine (filename: string, line: number, len = 1, withCoverage = false) { - const command = withCoverage ? 'testing.runAtCursor' : 'testing.coverageAtCursor' + const command = withCoverage ? 'testing.coverageAtCursor' : 'testing.runAtCursor' const testpath = Uri.joinPath(getWorkspaceUri(), filename) log.info('running test at line ' + line + ' in ' + testpath.fsPath) @@ -584,7 +584,7 @@ export function runTestAtLine (filename: string, line: number, len = 1, withCove } else { throw new Error('vscode.window.activeTextEditor is undefined') } - runTestsDuration = new Duration('runTestsAtLine') + runTestsDuration = new Duration('runTestAtLine command=' + command) return commands.executeCommand(command) }) .then(() => {