tests

Signed-off-by: Jens Reinecke <[email protected]>

Author: jreineckearm

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

@@ -19,7 +19,7 @@ import { makeFactory } from '../__test__/test-data-factory';
 import { GDBTargetConfiguration, TargetConfiguration } from './gdbtarget-configuration';
 
 export const debugConfigurationFactory = makeFactory<vscode.DebugConfiguration>({
-    type: () => 'cppdbg',
+    type: () => 'mydebug',
     name: () => 'Debug',
     request: () => 'launch',
 });
@@ -40,7 +40,7 @@ export const targetConfigurationFactory = makeFactory<TargetConfiguration>({
 });
 
 export const gdbTargetConfiguration = makeFactory<GDBTargetConfiguration>({
-    type: () => 'gdb',
+    type: () => 'gdbtarget',
     name: () => 'Debug',
     request: () => 'launch',
     program: () => undefined,

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

@@ -15,6 +15,7 @@
  */
 
 import { gdbTargetConfiguration, targetConfigurationFactory } from '../debug-configuration.factory';
+import { GDBTargetConfiguration } from '../gdbtarget-configuration';
 import { JlinkConfigurationProvider } from './jlink-configuration-provider';
 
 describe('JlinkConfigurationProvider', () => {
@@ -28,7 +29,8 @@ describe('JlinkConfigurationProvider', () => {
             });
             const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
             expect(debugConfig).toBeDefined();
-            expect(debugConfig?.target?.serverParameters).not.toContain('-port');
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.serverParameters).not.toContain('-port');
         });
 
         it('adds port to server parameters', async () => {
@@ -38,8 +40,9 @@ describe('JlinkConfigurationProvider', () => {
             });
             const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
             expect(debugConfig).toBeDefined();
-            expect(debugConfig?.target?.serverParameters).toContain('-port');
-            expect(debugConfig?.target?.serverParameters).toContain('4711');
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('-port');
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('4711');
         });
 
         it('does not overwrite port in server parameters', async () => {
@@ -52,8 +55,9 @@ describe('JlinkConfigurationProvider', () => {
             });
             const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
             expect(debugConfig).toBeDefined();
-            expect(debugConfig?.target?.serverParameters).toContain('-port');
-            expect(debugConfig?.target?.serverParameters).toContain('10815');
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('-port');
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('10815');
         });
 
     });

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

@@ -14,16 +14,69 @@
  * limitations under the License.
  */
 
-import { debugConfigurationFactory } from '../debug-configuration.factory';
+import { gdbTargetConfiguration, targetConfigurationFactory } from '../debug-configuration.factory';
+import { GDBTargetConfiguration } from '../gdbtarget-configuration';
 import { PyocdConfigurationProvider } from './pyocd-configuration-provider';
 
 describe('PyocdConfigurationProvider', () => {
 
-    it('resolveDebugConfigurationWithSubstitutedVariables', async () => {
-        const configProvider = new PyocdConfigurationProvider();
-        const config = debugConfigurationFactory();
-        const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
-        expect(debugConfig).toBeDefined();
+    describe('resolveDebugConfigurationWithSubstitutedVariables', () => {
+
+        it('adds gdbserver to minimal configuration serverParameters', async () => {
+            const configProvider = new PyocdConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory(),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('gdbserver');
+            expect(gdbtargetConfig?.target?.serverParameters).not.toContain('--port');
+        });
+
+        it('adds port to server parameters, gdbserver always gets added', async () => {
+            const configProvider = new PyocdConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory({ port: '4711' }),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('gdbserver');
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('--port');
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('4711');
+        });
+
+        it('does not overwrite port in server parameters', async () => {
+            const configProvider = new PyocdConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory({
+                    port: '4711',
+                    serverParameters: ['-port', '10815'],
+                }),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('--port');
+            expect(gdbtargetConfig?.target?.serverParameters).toContain('10815');
+        });
+
+        it.each([
+            { host: 'keep absolute path on Unix', pyocdPath: '/my/pyocd' },
+            { host: 'keep absolute path on Win', pyocdPath: 'C:\\my\\pyocd' },
+        ])('handles server path if absolute or adds absolute path for built-in', async ({ pyocdPath }) => {
+            const configProvider = new PyocdConfigurationProvider();
+            const config = gdbTargetConfiguration({
+                target: targetConfigurationFactory({
+                    server: pyocdPath
+                }),
+            });
+            const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);
+            expect(debugConfig).toBeDefined();
+            const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
+            expect(gdbtargetConfig?.target?.server).toContain(pyocdPath);
+        });
     });
 
 });