FYP-60: added simple test running AST command

FYP-60: add newline in utils.ts

FYP-60: wait before checking HTML

FYP-60: update the expect value

FYP-60: added setup, reset settings to default

FYP-60: console log html and hex for debugging

FYP-60: update hex value being checked

FYP-60: updated expected hex

FYP-60: trim the htmls

FYP-60: added some console logging debug

FYP-60: minify html

FYP-60: remove html check, causing issues on different platforms

Author: DiogoTheCoder

package.json

@@ -30,7 +30,7 @@
   "devDependencies": {
     "@types/glob": "^7.1.3",
     "@types/mocha": "^8.2.1",
-    "@types/node": "^14.14.32",
+    "@types/node": "^14.14.33",
     "@types/prettier": "^2.2.2",
     "@types/vscode": "^1.54.0",
     "@typescript-eslint/eslint-plugin": "^4.16.1",

src/commands/displaySyntaxTree.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
-import { getEditor } from '../utils';
+import { getActiveDocumentFilePath, getEditor } from '../utils';
 
-export async function displaySyntaxTree(): Promise<void> {
+export async function displaySyntaxTree(): Promise<vscode.WebviewPanel> {
   const editor = getEditor();
 
   const dotAst: string =
@@ -11,18 +11,12 @@ export async function displaySyntaxTree(): Promise<void> {
     )) ?? '';
 
   if (dotAst.length === 0) {
-    vscode.window.showInformationMessage('Error!');
-    return;
+    throw new Error('Unable to generate AST');
   }
 
-  // Get the last part of the filename (after the last slash), e.g. Refactor.java
-  const filename = editor.document.fileName.substring(
-    editor.document.fileName.lastIndexOf('/') + 1,
-  );
-
   const panel = vscode.window.createWebviewPanel(
     'syntaxTreeGraph',
-    `${filename} - Simple Abstract Syntax Tree`,
+    `${getActiveDocumentFilePath()} - Simple Abstract Syntax Tree`,
     vscode.ViewColumn.One,
     {
       enableScripts: true,
@@ -32,6 +26,8 @@ export async function displaySyntaxTree(): Promise<void> {
   // And set its HTML content
   const html = getWebviewContent(dotAst);
   panel.webview.html = html;
+
+  return panel;
 }
 
 function getWebviewContent(treeData: string) {

src/test/suite/extension.test.ts

@@ -3,10 +3,27 @@ import * as vscode from 'vscode';
 import { activate, getDocPath, sleep } from './helper';
 import { Commands } from '../../commands';
 import { TextDocument } from 'vscode';
+import { getActiveDocumentFilePath } from '../../utils';
 
 const hex = require('string-hex');
 
 suite('Extension Test Suite', () => {
+  setup(async function () {
+    // Reset all settings to default, so local settings don't affect the test results
+    const configuration = vscode.workspace.getConfiguration('java');
+    await configuration.update(
+      'abstractSyntaxTree.showNodeType',
+      false,
+      vscode.ConfigurationTarget.Global,
+    );
+
+    await configuration.update(
+      'refactor.reduce.operators',
+      ['PLUS', 'MINUS', 'MULTIPLY', 'DIVIDE'],
+      vscode.ConfigurationTarget.Global,
+    );
+  });
+
   vscode.window.showInformationMessage('Start all tests.');
 
   const FILE_PATH = getDocPath('App.java');
@@ -54,4 +71,14 @@ suite('Extension Test Suite', () => {
       '7075626c696320636c61737320417070207baa202020207075626c69632073746174696320766f6964206d61696e28537472696e675b5d206172677329207468726f777320457863657074696f6e207ba20202020202020204c6973743c537472696e673e206e616d6573203d204172726179732e61734c697374282244696f676f222c2022436f73746122293ba20202020202020206e616d65732e666f724561636828a202020202020202020202020737472696e67202d3e207ba2020202020202020202020202020202053797374656d2e6f75742e7072696e746c6e28737472696e67293ba2020202020202020202020207da2020202020202020293ba202020207da7d',
     );
   });
+
+  test('Running Display Abstract Syntax Tree Command', async () => {
+    const tabTitle = `${getActiveDocumentFilePath()} - Simple Abstract Syntax Tree`;
+
+    const panel = (await vscode.commands.executeCommand(
+      Commands.DISPLAY_AST,
+    )) as vscode.WebviewPanel;
+
+    assert.strictEqual(panel.title, tabTitle);
+  });
 });

src/utils.ts

@@ -34,3 +34,7 @@ export function writeCode(code: string): void {
 
   vscode.workspace.applyEdit(edit);
 }
+
+export function getActiveDocumentFilePath(): string {
+  return getEditor().document.fileName;
+}

yarn.lock

@@ -87,11 +87,16 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.1.tgz#f3f3ae4590c5386fc7c543aae9b78d4cf30ffee9"
   integrity sha512-NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ==
 
-"@types/node@*", "@types/node@^14.14.32":
+"@types/node@*":
   version "14.14.32"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448"
   integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg==
 
+"@types/node@^14.14.33":
+  version "14.14.33"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.33.tgz#9e4f8c64345522e4e8ce77b334a8aaa64e2b6c78"
+  integrity sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==
+
 "@types/prettier@^2.2.2":
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.2.tgz#e2280c89ddcbeef340099d6968d8c86ba155fdf6"