Enhance test cases

Author: JonatanAntoni

src/debug-configuration/debug-configuration.factory.ts

@@ -16,29 +16,44 @@
 
 import * as vscode from 'vscode';
 import { makeFactory } from '../__test__/test-data-factory';
-import { GDBTargetConfiguration } from './gdbtarget-configuration';
+import { GDBTargetConfiguration, TargetConfiguration } from './gdbtarget-configuration';
 
 export const debugConfigurationFactory = makeFactory<vscode.DebugConfiguration>({
     type: () => 'cppdbg',
     name: () => 'Debug',
     request: () => 'launch',
 });
 
+export const targetConfigurationFactory = makeFactory<TargetConfiguration>({
+    type: () => undefined,
+    parameters: () => undefined,
+    host: () => undefined,
+    port: () => undefined,
+    cwd: () => undefined,
+    environment: () => undefined,
+    server: () => undefined,
+    serverParameters: () => undefined,
+    serverPortRegExp: () => undefined,
+    serverStartupDelay: () => undefined,
+    automaticallyKillServer: () => false,
+    uart: () => undefined,
+});
+
 export const gdbTargetConfiguration = makeFactory<GDBTargetConfiguration>({
     type: () => 'gdb',
     name: () => 'Debug',
     request: () => 'launch',
-    program: () => 'program',
-    gdb: () => 'gdb',
-    cwd: () => 'cwd',
-    environment: () => ({ additionalProperties: 'additionalProperties' }),
-    gdbAsync: () => false,
-    gdbNonStop: () => false,
-    verbose: () => false,
-    logFile: () => 'logFile',
-    openGdbConsole: () => false,
-    initCommands: () => [],
-    preRunCommands: () => [],
+    program: () => undefined,
+    gdb: () => undefined,
+    cwd: () => undefined,
+    environment: () => undefined,
+    gdbAsync: () => undefined,
+    gdbNonStop: () => undefined,
+    verbose: () => undefined,
+    logFile: () => undefined,
+    openGdbConsole: () => undefined,
+    initCommands: () => undefined,
+    preRunCommands: () => undefined,
     imageAndSymbols: () => undefined,
     target: () => undefined,
     cmsis: () => undefined,

src/debug-configuration/subproviders/jlink-configuration-provider.test.ts

@@ -14,16 +14,48 @@
  * limitations under the License.
  */
 
-import { debugConfigurationFactory } from '../debug-configuration.factory';
+import { gdbTargetConfiguration, targetConfigurationFactory } from '../debug-configuration.factory';
 import { JlinkConfigurationProvider } from './jlink-configuration-provider';
 
 describe('JlinkConfigurationProvider', () => {
 
-    it('resolveDebugConfigurationWithSubstitutedVariables', async () => {
-        const configProvider = new JlinkConfigurationProvider();
-        const config = debugConfigurationFactory();
-        const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
-        expect(debugConfig).toBeDefined();
+    describe('resolveDebugConfigurationWithSubstitutedVariables', () => {
+
+        it('does not add undefined server parameters', async () => {
+            const configProvider = new JlinkConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory(),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            expect(debugConfig?.target?.serverParameters).not.toContain('-port');
+        });
+
+        it('adds port to server parameters', async () => {
+            const configProvider = new JlinkConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory({ port: '4711' }),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            expect(debugConfig?.target?.serverParameters).toContain('-port');
+            expect(debugConfig?.target?.serverParameters).toContain('4711');
+        });
+
+        it('does not overwrite port in server parameters', async () => {
+            const configProvider = new JlinkConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory({
+                    port: '4711',
+                    serverParameters: ['-port', '10815'],
+                }),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            expect(debugConfig?.target?.serverParameters).toContain('-port');
+            expect(debugConfig?.target?.serverParameters).toContain('10815');
+        });
+
     });
 
 });