-
Notifications
You must be signed in to change notification settings - Fork 36
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tests implementation liberty-ls support in server.xml for diagnostic and quickfix #377
base: main
Are you sure you want to change the base?
Changes from 33 commits
08aefcd
c1a82a4
121f17b
2771093
80d8e87
01d668f
3f5e62f
dbba2a0
3e4affe
883f757
150019c
7fdc278
108bfd5
f238c52
41114d8
fab341b
26b5cdb
8986c67
7c60cd8
e7490fa
13498f5
7ee5da3
499247d
9c3b83a
4d2fa91
3515049
e320f4d
a582ac6
b193cc5
288d1e0
4492afc
45f2c84
2cdd24d
80d2951
a3ffad9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
/** | ||
* Copyright (c) 2024 IBM Corporation. | ||
* | ||
* This program and the accompanying materials are made available under the | ||
* terms of the Eclipse Public License v. 2.0 which is available at | ||
* http://www.eclipse.org/legal/epl-2.0. | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
*/ | ||
import { By, EditorView, SideBarView, TextEditor, VSBrowser } from "vscode-extension-tester"; | ||
import * as utils from './utils/testUtils'; | ||
import * as constants from './definitions/constants'; | ||
|
||
const path = require('path'); | ||
const assert = require('assert'); | ||
|
||
describe('LCLS tests for Gradle Project', function () { | ||
let editor: TextEditor; | ||
let actualSeverXMLContent: string; | ||
|
||
before(() => { | ||
utils.copyConfig(path.join(utils.getGradleProjectPath(), 'src', 'main', 'liberty', 'config'), path.join(utils.getGradleProjectPath(), 'src', 'main', 'liberty', 'config2')); | ||
}); | ||
|
||
it('Should coppy content of server.xml', async () => { | ||
const section = await new SideBarView().getContent().getSection(constants.GRADLE_PROJECT); | ||
section.expand(); | ||
await VSBrowser.instance.openResources(path.join(utils.getGradleProjectPath(), 'src', 'main', 'liberty', 'config2', 'server.xml')); | ||
|
||
editor = await new EditorView().openEditor('server.xml') as TextEditor; | ||
actualSeverXMLContent = await editor.getText(); | ||
|
||
assert(actualSeverXMLContent.length !== 0, 'Content of server.xml is not in coppied.'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. typo copied. check for similar typos |
||
console.log('Sever.xml content:', actualSeverXMLContent); | ||
|
||
}).timeout(10000); | ||
|
||
it('Should show diagnostic for server.xml invalid value', async () => { | ||
|
||
await VSBrowser.instance.openResources(path.join(utils.getGradleProjectPath(), 'src', 'main', 'liberty', 'config2', 'server.xml')); | ||
editor = await new EditorView().openEditor('server.xml') as TextEditor; | ||
|
||
const hverExpectdOutcome = `'wrong' is not a valid value of union type 'booleanType'.`; | ||
const testHverTarget = '<logging appsWriteJson = \"wrong\" />'; | ||
|
||
await editor.typeTextAt(17, 5, testHverTarget); | ||
const focusTargtElemnt = editor.findElement(By.xpath("//*[contains(text(), 'wrong')]")); | ||
await utils.delay(3000); | ||
focusTargtElemnt.click(); | ||
await editor.click(); | ||
|
||
const actns = VSBrowser.instance.driver.actions(); | ||
await actns.move({ origin: focusTargtElemnt }).perform(); | ||
await utils.delay(5000); | ||
|
||
const hverContent = editor.findElement(By.className('hover-contents')); | ||
const hverValue = await hverContent.getText(); | ||
console.log("Hover text:" + hverValue); | ||
|
||
assert(hverValue.includes(hverExpectdOutcome), 'Did not get expected diagnostic in server.xml'); | ||
|
||
editor.clearText(); | ||
editor.setText(actualSeverXMLContent); | ||
console.log("Content restored"); | ||
|
||
}).timeout(35000); | ||
|
||
it('Should apply quick fix for invalid value in server.xml', async () => { | ||
const section = await new SideBarView().getContent().getSection(constants.GRADLE_PROJECT); | ||
section.expand(); | ||
await VSBrowser.instance.openResources(path.join(utils.getGradleProjectPath(), 'src', 'main', 'liberty', 'config2', 'server.xml')); | ||
|
||
editor = await new EditorView().openEditor('server.xml') as TextEditor; | ||
const stanzaSnipet = "<logging appsWriteJson = \"wrong\" />"; | ||
const expectedHoverData = "<logging appsWriteJson = \"true\" />"; | ||
await editor.typeTextAt(17, 5, stanzaSnipet); | ||
await utils.delay(2000); | ||
const flagedString = await editor.findElement(By.xpath("//*[contains(text(), '\"wrong\"')]")); | ||
await utils.delay(7000); | ||
|
||
const actions = VSBrowser.instance.driver.actions(); | ||
await actions.move({ origin: flagedString }).perform(); | ||
await utils.delay(3000); | ||
|
||
const driver = VSBrowser.instance.driver; | ||
const hoverTxt = await editor.findElement(By.className('hover-row status-bar')); | ||
await utils.delay(2000); | ||
|
||
const qckFixPopupLink = await hoverTxt.findElement(By.xpath("//*[contains(text(), 'Quick Fix')]")); | ||
await qckFixPopupLink.click(); | ||
|
||
const hoverTaskBar = await editor.findElement(By.className('context-view monaco-component bottom left fixed')); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is |
||
await hoverTaskBar.findElement(By.className('actionList')); | ||
await utils.delay(2000); | ||
|
||
const pointerBlockedElement = await driver.findElement(By.css('.context-view-pointerBlock')); | ||
// Setting pointer block element display value as none to choose option from Quickfix menu | ||
if (pointerBlockedElement) { | ||
await driver.executeScript("arguments[0].style.display = 'none';", pointerBlockedElement); | ||
} else { | ||
console.log('pointerBlockElementt not found!'); | ||
} | ||
const qckfixOption = await editor.findElement(By.xpath("//*[contains(text(), \"Replace with 'true'\")]")); | ||
await qckfixOption.click(); | ||
|
||
const updatedSeverXMLContent = await editor.getText(); | ||
await utils.delay(3000); | ||
console.log("Content after Quick fix : ", updatedSeverXMLContent); | ||
assert(updatedSeverXMLContent.includes(expectedHoverData), 'Quick fix not applied correctly for the invalid value in server.xml.'); | ||
|
||
editor.clearText(); | ||
editor.setText(actualSeverXMLContent); | ||
console.log("Content restored"); | ||
|
||
}).timeout(38000); | ||
|
||
after(() => { | ||
utils.removeConfigDir(path.join(utils.getGradleProjectPath(), 'src', 'main', 'liberty', 'config2')); | ||
console.log("Removed new config folder:"); | ||
}); | ||
|
||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ import { MAVEN_PROJECT, STOP_DASHBOARD_MAC_ACTION } from '../definitions/consta | |
import { MapContextMenuforMac } from './macUtils'; | ||
import clipboard = require('clipboardy'); | ||
import { expect } from 'chai'; | ||
import * as fse from 'fs-extra'; | ||
|
||
export function delay(millisec: number) { | ||
return new Promise( resolve => setTimeout(resolve, millisec) ); | ||
|
@@ -192,4 +193,37 @@ export async function clearCommandPalette() { | |
expect(buttons.length).equals(2); | ||
await dialog.pushButton('Clear'); | ||
} | ||
|
||
/** | ||
* Remove newly created Project folder with content | ||
*/ | ||
export async function removeConfigDir(projectPath: string): Promise<void> { | ||
try { | ||
await fs.accessSync(projectPath); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The following methods are synchronous methods. |
||
const projectContent = await fs.readdirSync(projectPath); | ||
await Promise.all( | ||
projectContent.map(async (projectFiles) => { | ||
const projectContentPath = path.join(projectPath, projectFiles); | ||
const stats = await fs.lstatSync(projectContentPath); | ||
if (stats.isDirectory()) { | ||
await removeConfigDir(projectContentPath); | ||
} else { | ||
await fs.unlinkSync(projectContentPath); | ||
} | ||
}) | ||
); | ||
await fs.rmdirSync(projectPath); | ||
} catch (error) { | ||
console.error(`Error removing new project: ${error}`); | ||
} | ||
} | ||
|
||
/** | ||
* Copy config directory and create new config | ||
*/ | ||
export async function copyConfig(existingConfigPath: string, copyConfigPath: string): Promise<void> { | ||
fse.copy(existingConfigPath, copyConfigPath) | ||
.then(() => console.log("New config folder created :" + copyConfigPath)) | ||
.catch(err => console.log("Error creating config folder")); | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo copy