Fixed gradle integration tests initialization

Corrected the init of the test folder structure for gradle
integration tests to correspond to that expected when
created using `gradle init`.

Author: sid-srini

vscode/src/test/integration/suite/gradle/extension.test.ts

@@ -41,6 +41,7 @@ suite("Extension gradle tests", function () {
       assert.ok(compile, " Compile workspace command not working");
       const mainClass = path.join(
         folder,
+        "yourProject",
         "build",
         "classes",
         "java",
@@ -55,21 +56,28 @@ suite("Extension gradle tests", function () {
         "Class created by compilation: " + mainClass
       );
     } catch (error) {
-      dumpJava();
+      await dumpJava();
+      console.log(`Error: ${error}`);
       throw error;
     }
   });
 
   // Check if clean workspace command is excuted succesfully
   test("Clean workspace - Gradle", async () => {
-    let folder: string = assertWorkspace();
-    const clean = await commands.executeCommand("jdk.workspace.clean");
-    assert.ok(clean, " Clean workspace command not working");
+    try {
+      let folder: string = assertWorkspace();
+      const clean = await commands.executeCommand("jdk.workspace.clean");
+      assert.ok(clean, " Clean workspace command not working");
 
-    const mainClass = path.join(folder, "build");
-    assert.ok(
-      !fs.existsSync(mainClass),
-      "Class created by compilation: " + mainClass
-    );
+      const buildFolder = path.join(folder, "yourProject", "build");
+      assert.ok(
+        !fs.existsSync(buildFolder),
+        "Build removed by clean: " + buildFolder
+      );
+    } catch (error) {
+      await dumpJava();
+      console.log(`Error: ${error}`);
+      throw error;
+    }
   });
 });

vscode/src/test/integration/testutils.ts

@@ -253,7 +253,8 @@ export const runShellCommand = async (command: string, folderPath: string) => {
 export async function gradleInitJavaApplication(folder: string) {
 	const basePackage = "org.yourCompany.yourProject";
 
-	const projectPath = path.join(folder);
+	const rootProjectPath = path.join(folder);
+	const projectPath = path.join(rootProjectPath, "yourProject");
 	const srcMainPath = path.join(
 		projectPath,
 		"src",
@@ -272,6 +273,7 @@ export async function gradleInitJavaApplication(folder: string) {
 
 	try {
 		// Create directories
+		await fs.promises.mkdir(rootProjectPath, { recursive: true });
 		await fs.promises.mkdir(projectPath, { recursive: true });
 		await fs.promises.mkdir(srcMainPath, { recursive: true });
 		await fs.promises.mkdir(resourcesPath, { recursive: true });
@@ -283,7 +285,7 @@ export async function gradleInitJavaApplication(folder: string) {
 			SAMPLE_BUILD_GRADLE
 		);
 		await fs.promises.writeFile(
-			path.join(projectPath, "settings.gradle"),
+			path.join(rootProjectPath, "settings.gradle"),
 			SAMPLE_SETTINGS_GRADLE
 		);
 		// Create Java main file
@@ -347,7 +349,7 @@ export const awaitClient = async () : Promise<NbLanguageClient> => {
 }
 
 export function findClusters(myPath : string): string[] {
-    let clusters = [];
+    let clusters:string[] = [];
     for (let e of vscode.extensions.all) {
         if (e.extensionPath === myPath) {
             continue;