Skip to content

Commit

Permalink
Merge pull request #357 from Achal1607/increase-integration-test-time…
Browse files Browse the repository at this point in the history
…outs

Increased integration tests timeouts
  • Loading branch information
sid-srini authored Dec 27, 2024
2 parents 4aef0b6 + bd466ad commit e0683e3
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion vscode/src/test/integration/suite/general/explorer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ suite('Explorer Test Suite', () => {
const lvp = await myExplorer.createViewProvider(await awaitClient(), 'foundProjects');
const firstLevelChildren = await (lvp.getChildren() as Thenable<any[]>);
assert.strictEqual(firstLevelChildren.length, 0, "No child under the root");
}).timeout(10000);
}).timeout(60000);
});
26 changes: 13 additions & 13 deletions vscode/src/test/integration/suite/general/extension.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ suite('Extension Test Suite', function () {
// Create project which used be used for testing
this.beforeAll(async () => {
await prepareProject(filePaths);
}).timeout(10000);
}).timeout(60000);

// This test must be run first, in order to activate the extension and wait for the activation to complete
test("Extension loaded and activated", async () => {
Expand All @@ -59,7 +59,7 @@ suite('Extension Test Suite', function () {
}
assert.ok(cannotReassignVersion, "Cannot reassign value of version");

}).timeout(10000);
}).timeout(60000);

// Test if clusters are loaded or not
test('Find clusters', async () => {
Expand Down Expand Up @@ -93,7 +93,7 @@ suite('Extension Test Suite', function () {
for (let c of found) {
assert.ok(c.startsWith(nbcode.extensionPath), `All extensions are below ${nbcode.extensionPath}, but: ${c}`);
}
}).timeout(10000);
}).timeout(60000);

// Check if Jdk commands have been loaded
test("Jdk commands loaded", async () => {
Expand All @@ -107,7 +107,7 @@ suite('Extension Test Suite', function () {
}

assert.ok(containsJdkCommands, "No Jdk command has been loaded");
}).timeout(10000);
}).timeout(60000);

// Check if format document command is executed successfully
test("Format document", async () => {
Expand All @@ -118,7 +118,7 @@ suite('Extension Test Suite', function () {
const unformattedCode = SAMPLE_CODE_FORMAT_DOCUMENT.split('\n').length;
const isDocumentFormatted = formattedCode > unformattedCode;
assert.ok(isDocumentFormatted, "document is not formatted");
}).timeout(10000);
}).timeout(60000);

// Check if imports are getting sorted on saving document
test("Sort imports", async () => {
Expand All @@ -133,7 +133,7 @@ suite('Extension Test Suite', function () {
savedCode.indexOf('import java.util.ArrayList;');
assert.ok(isImportsSorted, "Imports are not sorted");

}).timeout(10000);
}).timeout(60000);

// Check if unused imports are getting removed on saving document
test("Remove unused imports", async () => {
Expand All @@ -148,7 +148,7 @@ suite('Extension Test Suite', function () {
savedCode.indexOf('import java.lang.Integer;') === -1;
assert.ok(areUnusedImportsRemoved, "Unused imports are not removed");

}).timeout(10000);
}).timeout(60000);

// Check if refactor actions are getting showing on UI and if they are working
test("Refactor actions executing", async () => {
Expand Down Expand Up @@ -176,7 +176,7 @@ suite('Extension Test Suite', function () {
}
}
}
}).timeout(10000);
}).timeout(60000);

// Tests explorer is loading properly
test("Test Explorer tests", async () => {
Expand All @@ -203,7 +203,7 @@ suite('Extension Test Suite', function () {
dumpJava();
throw error;
}
}).timeout(10000);
}).timeout(60000);

// Check if compile workspace command is excuted succesfully
test("Compile workspace", async () => {
Expand All @@ -221,7 +221,7 @@ suite('Extension Test Suite', function () {
const item = await (lvp.getTreeItem(firstLevelChildren[0]) as Thenable<TreeItem>);
assert.strictEqual(item?.label, "basicapp", "Element is named as the Maven project");
});
}).timeout(10000);
}).timeout(60000);

// Get Project info
test("Get project sources, classpath, and packages", async () => {
Expand Down Expand Up @@ -286,7 +286,7 @@ suite('Extension Test Suite', function () {
dumpJava();
throw error;
}
}).timeout(10000);
}).timeout(60000);

// Check if clean workspace command is excuted succesfully
test("Clean workspace", async () => {
Expand All @@ -296,7 +296,7 @@ suite('Extension Test Suite', function () {

const mainClass = path.join(folder, 'target');
assert.ok(!fs.existsSync(mainClass), "Class created by compilation: " + mainClass);
}).timeout(10000);
}).timeout(60000);

// Check if xml document formatting is executed successfully
test("XML Format document", async () => {
Expand All @@ -305,6 +305,6 @@ suite('Extension Test Suite', function () {

const formattedContents = editor.document.getText().trim();
assert.ok(formattedContents == FORMATTED_POM_XML.trim(), "pom.xml is not formatted");
}).timeout(10000);
}).timeout(60000);

});
4 changes: 2 additions & 2 deletions vscode/src/test/integration/suite/gradle/extension.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ suite("Extension gradle tests", function () {
dumpJava();
throw error;
}
}).timeout(50000);
}).timeout(120*1000);

// Check if clean workspace command is excuted succesfully
test("Clean workspace - Gradle", async () => {
Expand All @@ -71,5 +71,5 @@ suite("Extension gradle tests", function () {
!fs.existsSync(mainClass),
"Class created by compilation: " + mainClass
);
}).timeout(10000);
}).timeout(60000);
});
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ suite("Extension localisation tests", function () {
assert.ok(matchKeys(enBundlePath, langBundlePath), `Keys of ${DEFAULT_BUNDLE_FILE_NAME} and bundle.l10n.${lang}.json don't match`);
assert.ok(matchValuesTemplate(enBundlePath, langBundlePath), `Value templates don't match for of the keys of ${DEFAULT_BUNDLE_FILE_NAME} and bundle.l10n.${lang}.json `);
}
}).timeout(10000);
}).timeout(60000);

test("Consistency of keys across package.nls.lang.json files for supported languages", async () => {
const extension = extensions.getExtension(EXTENSION_NAME);
Expand All @@ -57,7 +57,7 @@ suite("Extension localisation tests", function () {
assert.ok(fs.existsSync(langPackagePath), `package.nls.${lang}.json doesn't exists`);
assert.ok(matchKeys(enPackagePath, langPackagePath), `Keys of ${DEFAULT_PACKAGE_FILE_NAME} and package.nls.${lang}.json don't match`);
}
}).timeout(10000);
}).timeout(60000);

// Check localisable fields being appropriately localised for the contributes defined in package.json
test("Localisable fields in package.json localised properly ", async () => {
Expand All @@ -74,7 +74,7 @@ suite("Extension localisation tests", function () {
assert.ok(checkViewsLocalisation(contributes.views, validKeys), "Error some views is not localized");
assert.ok(checkDebuggersLocalisation(contributes.debuggers, validKeys), "Error some debugger labels not localized");
assert.ok(checkConfigurationLocalisation(contributes.configuration, validKeys), "Error some configuration labels not localized");
}).timeout(10000);
}).timeout(60000);


// Check if l10n.value is called with a valid key and the placeholder map has all the keys as required in the string template
Expand All @@ -86,6 +86,6 @@ suite("Extension localisation tests", function () {
assert(enBundlePath, `${DEFAULT_BUNDLE_FILE_NAME} not found`);
const validKeyValues = JSON.parse(fs.readFileSync(enBundlePath, 'utf8'));
assert(checkL10nUsageInFiles(path.join(extension.extensionPath, "out"), ignoredDirEntriesNames, validKeyValues) === 0, "Some files have invalid localisation keys used. Check the logs or error messages");
}).timeout(10000);
}).timeout(60000);

});

0 comments on commit e0683e3

Please sign in to comment.