From 946fae57358a49a10531da67d33ad25f83e5560b Mon Sep 17 00:00:00 2001
From: malinthar <malintha1996@gmail.com>
Date: Mon, 24 Jul 2023 17:40:18 +0530
Subject: [PATCH] Fix failing tests

---
 language-server-simulator/build.gradle        | 20 +++++++++++--------
 .../langserver/simulator/EditorTab.java       |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/language-server-simulator/build.gradle b/language-server-simulator/build.gradle
index 3798f29761..7b28d66499 100644
--- a/language-server-simulator/build.gradle
+++ b/language-server-simulator/build.gradle
@@ -1,6 +1,10 @@
+description = 'Ballerina Language Server Simulator'
+
 apply from: "$rootDir/gradle/javaProject.gradle"
 
 configurations {
+    ballerinaDistribution
+    jBallerinaDistribution
     dependency {
         transitive true
     }
@@ -10,6 +14,7 @@ ext {
     distributionDir = "distribution"
     nbalSourceDir = "nBallerinaSrc"
     fhirSourceDir = "fhirSrc"
+    shortVersion = "${version}".split("-")[0]
 }
 
 dependencies {
@@ -28,10 +33,14 @@ dependencies {
     }
     implementation "org.slf4j:slf4j-jdk14:${slf4jJdk14Version}"
     implementation "com.google.code.gson:gson:${gsonVersion}"
-}
 
+    jBallerinaDistribution project(path: ":ballerina", configuration: "jBallerinaDistribution")
+    ballerinaDistribution project(path: ":ballerina", configuration: "ballerinaDistribution")
+}
 
 task unpackBallerinaDistribution(type: Copy) {
+    dependsOn configurations.jBallerinaDistribution
+    dependsOn configurations.ballerinaDistribution
     def sourceDir = "${buildDir}/${distributionDir}"
     from zipTree { "${rootDir}/ballerina/build/distributions/ballerina-${version}-swan-lake.zip" }
     new File("${sourceDir}").mkdirs()
@@ -39,12 +48,9 @@ task unpackBallerinaDistribution(type: Copy) {
 }
 
 task copyPackages() {
-    def fileDir = "${buildDir}/${distributionDir}" +
-            "/ballerina-${version}-swan-lake/distributions/ballerina-version"
-    File filePath = new File("${fileDir}");
-    def balVersion  = filePath.readLines().get(0)
+    dependsOn unpackBallerinaDistribution
     def sourceDir = "${buildDir}/${distributionDir}" +
-            "/ballerina-${version}-swan-lake/distributions/${balVersion}/repo"
+            "/ballerina-${version}-swan-lake/distributions/ballerina-${shortVersion}/repo"
     copy {
         from "${sourceDir}"
         into "${buildDir}/repo"
@@ -83,7 +89,6 @@ task unpackBalFHIRTestProject(type: Copy) {
 }
 
 task runLSSimulatorOnnBallerina(type: JavaExec) {
-    dependsOn unpackBallerinaDistribution
     dependsOn copyPackages
     dependsOn unpackBalTestProject
 
@@ -106,7 +111,6 @@ task runLSSimulatorOnnBallerina(type: JavaExec) {
 }
 
 task runLSSimulatorOnFHIR(type: JavaExec) {
-    dependsOn unpackBallerinaDistribution
     dependsOn copyPackages
     dependsOn unpackBalFHIRTestProject
 
diff --git a/language-server-simulator/src/main/java/org/ballerinalang/langserver/simulator/EditorTab.java b/language-server-simulator/src/main/java/org/ballerinalang/langserver/simulator/EditorTab.java
index 6bf57cd31d..ca69e276d7 100644
--- a/language-server-simulator/src/main/java/org/ballerinalang/langserver/simulator/EditorTab.java
+++ b/language-server-simulator/src/main/java/org/ballerinalang/langserver/simulator/EditorTab.java
@@ -120,7 +120,7 @@ public void type(String content) {
             }
 
             try {
-                Thread.sleep(100 + random.nextInt(300));
+                Thread.sleep(100 + (long) random.nextInt(300));
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 logger.error("Interrupted", e);