Adapt plugin to use new language test API (#5)

Signed-off-by: svor <vsvydenk@redhat.com> * Adapt plugin to use new API
che-incubator · Sep 8, 2020 · ec40ea6 · ec40ea6
1 parent 2d535ea
commit ec40ea6
Show file tree

Hide file tree

Showing 9 changed files with 259 additions and 137 deletions.
diff --git a/README.md b/README.md
@@ -31,9 +31,3 @@ In order to do this you'll need a few things:
 
 The idea is that when you start a workspace with your devfile the testWorkspace will be the root of the application
 and the tests will be loaded into mocha and executed against the current running workspace.
-
-#### Possible Improvements
-Currently because of https://github.com/eclipse/che/issues/15826 we are restricted on some tests we could make. For instance,
-once this feature resolves we can activate the extension from inside the tests and then check whether 
-[vscode-java extension api](https://github.com/redhat-developer/vscode-java/blob/master/src/extension.api.ts#L14) is set to
-"Started" or "Error".
diff --git a/che_java_test_theia_plugin.theia b/che_java_test_theia_plugin.theia
diff --git a/devfile.yaml b/devfile.yaml
@@ -1,15 +1,10 @@
 apiVersion: 1.0.0
 metadata:
   name: che-java-sample-tests
-projects:
-  - name: che-java-test-theia-plugin
-    source:
-      location: 'https://github.com/jpinkney/che-java-test-theia-plugin.git'
-      type: git
 components:
-  - id: redhat/java8/latest
+  - id: redhat/java11/latest
     type: chePlugin
-  - reference: https://raw.githubusercontent.com/JPinkney/Che-Java-Tests/master/meta.yaml
+  - reference: https://raw.githubusercontent.com/che-incubator/che-java-tests/master/meta.yaml
     type: chePlugin
   - type: cheEditor
     id: eclipse/che-theia/next

diff --git a/meta.yaml b/meta.yaml
@@ -1,3 +1,4 @@
+
 apiVersion: v2
 publisher: Red Hat
 name: Java-Smoke-Test-Plugin
@@ -7,9 +8,9 @@ displayName: Java Smoke Test Plugin
 title: Java-Smoke-Test-Plugin
 description: This plug-in runs Java tests against vscode-java inside of your workspace
 icon: https://www.eclipse.org/che/images/logo-eclipseche.svg
-repository: https://github.com/jpinkney/Che-Java-Tests
+repository: https://github.com/che-incubator/che-java-tests
 category: Language
-firstPublicationDate: "2020-01-07"
+firstPublicationDate: "2020-08-20"
 spec:
   extensions:
-    - https://github.com/JPinkney/Che-Java-Tests/raw/master/che_java_test_theia_plugin.theia
+    - https://github.com/che-incubator/che-java-tests/raw/master/che_java_test_theia_plugin.theia
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,5 +1,5 @@
 /*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
+ * Copyright (c) 2020 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -25,33 +25,52 @@ export function start(context: theia.PluginContext): void {
     mocha.useColors(true);
 
     const e = (c: any) => console.log(c);
-
-    ncp(context.extensionPath, '/projects/Che-Java-Tests', (err: any) => {
+    ncp(context.extensionPath, '/projects/Che-Java-Tests', async (err: any) => {
         if (err) {
             return console.error(err);
         }
 
-        theia.workspace.findFiles('**/tests/*.test.ts', undefined).then(files => {
-            console.log("Found: ");
-            console.log(files);
-
-            // Add files to the test suite
-            files.forEach(f => mocha.addFile(path.resolve(f.path)));
-
-            try {
-                // Run the mocha test
-                mocha.run((failures: any) => {
-                    if (failures > 0) {
-                        e(new Error(`${failures} tests failed.`));
-                    }
-                });
-            } catch (err) {
-                e(err);
-            }
-        });
-    });
+        await activateJavaLSPlugin();
+
+        const testFiles = await theia.workspace.findFiles('**/tests/*.test.ts', undefined)
+        console.log("Found: ");
+        console.log(testFiles);
+
+        // Add files to the test suite
+        testFiles.forEach(f => mocha.addFile(path.resolve(f.path)));
 
+        try {
+            // Run the mocha test
+            mocha.run((failures: any) => {
+                theia.window.showInformationMessage('Tests completed! See results in test.log file');
+                const resultFile = path.resolve('/projects', 'test.log');
+                theia.commands.executeCommand('file-search.openFile', resultFile)
+                if (failures > 0) {
+                    e(new Error(`${failures} tests failed.`));
+                }
+            });
+        } catch (err) {
+            e(err);
+        }
+    });
+}
 
+async function activateJavaLSPlugin(): Promise<void> {
+    const files = await theia.workspace.findFiles('MyHelloText.java', undefined, 1);
+    if (files.length != 1) {
+        throw new Error('Cannot find java file');
+    }
+    const file = files[0];
+    const textDocument = await theia.workspace.openTextDocument(file);
+    if (!textDocument) {
+        throw new Error('Cannot open java file');
+    }
+    let plugin = theia.plugins.getPlugin('redhat.java');
+    if (plugin) {
+        return await plugin.activate()
+    } else {
+        throw new Error('No redhat.java plugin');
+    }
 }
 
 export function stop() {

diff --git a/src/test-reporter.ts b/src/test-reporter.ts
@@ -1,3 +1,13 @@
+/*********************************************************************
+ * Copyright (c) 2020 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+
 import Mocha from 'mocha';
 module.exports = StreamLogReporter;
 
@@ -25,12 +35,12 @@ function StreamLogReporter(runner: any) {
     });
 
     runner.on('end', function() {
-        if (failures === 0) {
+        if (failures > 0) {
             console.log('FINISH: %d/%d', passes, passes + failures);
-            writeStream.write(`TESTS FAILED: ${passes}/${passes + failures}`);
+            writeStream.write(`TESTS FAILED: ${passes}/${passes + failures}\n`);
         } else {
             console.log('FINISH: %d/%d', passes, passes + failures);
-            writeStream.write(`TESTS PASSED: ${passes}/${passes + failures}`);
+            writeStream.write(`TESTS PASSED: ${passes}/${passes + failures}\n`);
         }
     });
 }
diff --git a/tests/commands.test.ts b/tests/commands.test.ts
@@ -1,5 +1,5 @@
 /*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
+ * Copyright (c) 2020 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import * as vscode from '@theia/plugin';
+import * as theia from '@theia/plugin';
 import { strict as assert } from 'assert';
 import { closeAllOpenFiles, getSrcDocUri } from './helper';
 
@@ -20,40 +20,39 @@ describe('Test that vscode-java commands are working successfully', () => {
 
     before('Make sure vscode-java is activated', async () => {
         const myHelloTextURI = getSrcDocUri('MyHelloText.java');
-        await vscode.window.showTextDocument(myHelloTextURI);
+        await theia.window.showTextDocument(myHelloTextURI);
         closeAllOpenFiles();
     });
 
     it('Test Java Open all log files', async () => {
-
         // Ensure all files are closed
         closeAllOpenFiles();
 
-        // Then check if the serverLog command opens the server log
-        await vscode.commands.executeCommand(serverLogCmd);
-        const isServerLogFileOpen = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName === '.log');
+        // Then check if the serverLog command opens both the client log and the server log
+        await theia.commands.executeCommand(openAllLogs);
+        const isServerLogFileOpen = theia.window.visibleTextEditors.filter(editor => editor.document.fileName === '.log');
         assert.ok(isServerLogFileOpen);
+        const isClientLogFileOpen = theia.window.visibleTextEditors.filter(editor => editor.document.fileName.startsWith('client.log'));
+        assert.ok(isClientLogFileOpen);
     });
 
-    it('Test Java Open all log files', async () => {
+    it('Test Java Open server log file', async () => {
         // Ensure all files are closed
         closeAllOpenFiles();
 
-        // Then check if the serverLog command opens the client log
-        await vscode.commands.executeCommand(clientLogCmd);
-        const isClientLogFileOpen = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName.startsWith('client.log'));
-        assert.ok(isClientLogFileOpen);
+        // Then check if the serverLog command opens the server log
+        await theia.commands.executeCommand(serverLogCmd);
+        const isServerLogFileOpen = theia.window.visibleTextEditors.filter(editor => editor.document.fileName === '.log');
+        assert.ok(isServerLogFileOpen);
     });
 
-    it('Test Java Open all log files', async () => {
+    it('Test Java Open client log file', async () => {
         // Ensure all files are closed
         closeAllOpenFiles();
 
-        // Then check if the serverLog command opens both the client log and the server log
-        await vscode.commands.executeCommand(openAllLogs);
-        const isServerLogFileOpen = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName === '.log');
-        assert.ok(isServerLogFileOpen);
-        const isClientLogFileOpen = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName.startsWith('client.log'));
+        // Then check if the clientLog command opens the client log
+        await theia.commands.executeCommand(clientLogCmd);
+        const isClientLogFileOpen = theia.window.visibleTextEditors.filter(editor => editor.document.fileName.startsWith('client.log'));
         assert.ok(isClientLogFileOpen);
     });
 

diff --git a/tests/helper.ts b/tests/helper.ts
@@ -1,5 +1,5 @@
 /*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
+ * Copyright (c) 2020 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -9,15 +9,12 @@
  **********************************************************************/
 
 import * as path from 'path';
-import * as vscode from '@theia/plugin';
+import * as theia from '@theia/plugin';
 
 export const extensionID = 'redhat.java';
 
 export function closeAllOpenFiles() {
-    vscode.window.visibleTextEditors.map(file => vscode.commands.executeCommand('workbench.action.closeActiveEditor', file.document.uri));
+    theia.window.visibleTextEditors.map(file => theia.commands.executeCommand('workbench.action.closeActiveEditor', file.document.uri));
 }
-export async function sleep(ms: number) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-export const getSrcDocPath = (p: string) => path.resolve(__dirname, '../testWorkspace/src/main/java/org/my/sample', p);
-export const getSrcDocUri = (p: string) => vscode.Uri.file(getSrcDocPath(p));
+export const getSrcDocPath = (p: string) => path.resolve('/projects/Che-Java-Tests/testWorkspace/src/main/java/org/my/sample', p);
+export const getSrcDocUri = (p: string) => theia.Uri.file(getSrcDocPath(p));