Refactor tests

garrytrinder · garrytrinder · commit 7bd86f5cc2f1 · 2024-12-13T17:01:39.000Z
diff --git a/src/test/examples/config-incorrect-schema-with-plugins.json b/src/test/examples/config-incorrect-schema-with-plugins.json
@@ -1,4 +1,4 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/mockresponseplugin.schema.json",
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json",
     "plugins": {}
 }
diff --git a/src/test/examples/config-incorrect-schema.json b/src/test/examples/config-incorrect-schema.json
@@ -1,3 +1,3 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/mockresponseplugin.schema.json"
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json"
 }
diff --git a/src/test/examples/config-plugin-config-missing-disabled.json b/src/test/examples/config-plugin-config-missing-disabled.json
@@ -1,6 +1,11 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
   "plugins": [
+    {
+      "name": "LatencyPlugin",
+      "enabled": true,
+      "pluginPath": "~appFolder/plugins/dev-proxy-plugins.dll"
+    },
     {
       "name": "GenericRandomErrorPlugin",
       "enabled": false,
diff --git a/src/test/examples/config-plugin-config-missing.json b/src/test/examples/config-plugin-config-missing.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
   "plugins": [
     {
       "name": "GenericRandomErrorPlugin",
diff --git a/src/test/examples/config-plugin-config-required-disabled.json b/src/test/examples/config-plugin-config-required-disabled.json
@@ -1,6 +1,11 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
   "plugins": [
+    {
+      "name": "LatencyPlugin",
+      "enabled": true,
+      "pluginPath": "~appFolder/plugins/dev-proxy-plugins.dll"
+    },
     {
       "name": "GenericRandomErrorPlugin",
       "enabled": false,
diff --git a/src/test/examples/config-plugin-config-required.json b/src/test/examples/config-plugin-config-required.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
   "plugins": [
     {
       "name": "GenericRandomErrorPlugin",
diff --git a/src/test/examples/config-plugins-codelens.json b/src/test/examples/config-plugins-codelens.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
   "plugins": [
     {
       "name": "CachingGuidancePlugin",
diff --git a/src/test/examples/config-schema-mismatch.json b/src/test/examples/config-schema-mismatch.json
@@ -1,4 +1,4 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
     "plugins": []
 }
diff --git a/src/test/examples/config-schema-version.json b/src/test/examples/config-schema-version.json
@@ -1,4 +1,10 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
-    "plugins": []
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
+    "plugins": [
+        {
+            "name": "LatencyPlugin",
+            "enabled": true,
+            "pluginPath": "~appFolder/plugins/dev-proxy-plugins.dll"
+        }
+    ]
 }
diff --git a/src/test/examples/config-schema.json b/src/test/examples/config-schema.json
@@ -1,4 +1,4 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
     "plugins": []
 }
diff --git a/src/test/examples/config-urls-to-watch-required.json b/src/test/examples/config-urls-to-watch-required.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
   "plugins": [],
   "urlsToWatch": []
 }
diff --git a/src/test/examples/devproxyrc.json b/src/test/examples/devproxyrc.json
@@ -1,4 +1,4 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",
     "plugins": []
 }
diff --git a/src/test/examples/mock-schema.json b/src/test/examples/mock-schema.json
@@ -1,4 +1,4 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/mockresponseplugin.schema.json",
+    "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json",
     "mocks": []
 }
diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts
@@ -1,14 +1,10 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
-import * as fs from 'fs';
 import {
-  getASTNode,
-  getStartPositionFromASTNode,
   isConfigFile,
   sleep,
 } from '../helpers';
 import * as path from 'path';
-import parse from 'json-to-ast';
 import { createCodeLensForPluginNodes } from '../codelens';
 import { handleStartNotification } from '../notifications';
 import { handleStatusBarUpdate, statusBarLoop } from '../statusbar';
@@ -25,7 +21,7 @@ export const testDevProxyInstall: DevProxyInstall = {
   outdatedVersion: '0.14.1',
   platform: 'win32',
   version: '0.14.1',
-}; 
+};
 
 suite('extension', () => {
 
@@ -142,9 +138,12 @@ suite('plugins', () => {
       message: 'GenericRandomErrorPlugin requires a config section.',
       severity: vscode.DiagnosticSeverity.Error,
     };
+    const diagnostic = diagnostics.find((diagnostic) => {
+      return diagnostic.message === expected.message;
+    });
     const actual = {
-      message: diagnostics[0]?.message,
-      severity: diagnostics[0]?.severity,
+      message: diagnostic?.message,
+      severity: diagnostic?.severity,
     };
     assert.deepStrictEqual(actual, expected);
   });
@@ -160,9 +159,12 @@ suite('plugins', () => {
       message: 'GenericRandomErrorPlugin requires a config section.',
       severity: vscode.DiagnosticSeverity.Warning,
     };
+    const diagnostic = diagnostics.find((diagnostic) => {
+      return diagnostic.message === expected.message;
+    });
     const actual = {
-      message: diagnostics[0]?.message,
-      severity: diagnostics[0]?.severity,
+      message: diagnostic?.message,
+      severity: diagnostic?.severity,
     };
     assert.deepStrictEqual(actual, expected);
   });
@@ -179,9 +181,12 @@ suite('plugins', () => {
         "genericRandomErrorPlugin config section is missing. Use 'devproxy-plugin-generic-random-error-config' snippet to create one.",
       severity: vscode.DiagnosticSeverity.Error,
     };
+    const diagnostic = diagnostics.find((diagnostic) => {
+      return diagnostic.message === expected.message;
+    });
     const actual = {
-      message: diagnostics[0]?.message,
-      severity: diagnostics[0]?.severity,
+      message: diagnostic?.message,
+      severity: diagnostic?.severity,
     };
     assert.deepStrictEqual(actual, expected);
   });
@@ -198,9 +203,12 @@ suite('plugins', () => {
         "genericRandomErrorPlugin config section is missing. Use 'devproxy-plugin-generic-random-error-config' snippet to create one.",
       severity: vscode.DiagnosticSeverity.Warning,
     };
+    const diagnostic = diagnostics.find((diagnostic) => {
+      return diagnostic.message === expected.message;
+    });
     const actual = {
-      message: diagnostics[0]?.message,
-      severity: diagnostics[0]?.severity,
+      message: diagnostic?.message,
+      severity: diagnostic?.severity,
     };
     assert.deepStrictEqual(actual, expected);
   });
@@ -489,7 +497,7 @@ suite('schema', () => {
       isRunning: false,
       platform: 'win32',
       outdatedVersion: '',
-      version: '0.14.1',
+      version: '0.24.0',
     } as DevProxyInstall);
 
     const fileName = 'config-schema-version.json';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/mockresponseplugin.schema.json",`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json",`
`3`	`3`	`"plugins": {}`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/mockresponseplugin.schema.json"`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,11 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",`
`3`	`3`	`"plugins": [`
	`4`	`+ {`
	`5`	`+ "name": "LatencyPlugin",`
	`6`	`+ "enabled": true,`
	`7`	`+ "pluginPath": "~appFolder/plugins/dev-proxy-plugins.dll"`
	`8`	`+ },`
`4`	`9`	`{`
`5`	`10`	`"name": "GenericRandomErrorPlugin",`
`6`	`11`	`"enabled": false,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",`
`3`	`3`	`"plugins": [`
`4`	`4`	`{`
`5`	`5`	`"name": "GenericRandomErrorPlugin",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,10 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.14.1/rc.schema.json",`
`3`		`- "plugins": []`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json",`
	`3`	`+ "plugins": [`
	`4`	`+ {`
	`5`	`+ "name": "LatencyPlugin",`
	`6`	`+ "enabled": true,`
	`7`	`+ "pluginPath": "~appFolder/plugins/dev-proxy-plugins.dll"`
	`8`	`+ }`
	`9`	`+ ]`
`4`	`10`	`}`