From 7332c9e222b5eee810290fc0ce57607ec8e4837f Mon Sep 17 00:00:00 2001
From: arhont375 <arhont375@users.noreply.github.com>
Date: Thu, 1 Aug 2024 00:03:17 +0900
Subject: [PATCH] - Use plugin 2.0.0 - Update flaky test

---
 build.gradle.kts                               | 18 ++++++++++--------
 gradle.properties                              |  2 ++
 jps-plugin/build.gradle.kts                    |  2 +-
 settings.gradle.kts                            | 16 +++++++---------
 thrift/build.gradle.kts                        |  2 ++
 .../thrift/inspections/NameDuplicatesTest.java |  1 -
 .../thrift/usages/ThriftFindUsagesTest.java    | 13 ++++++++++---
 7 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 422bc251..0300c4a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,20 +2,22 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("org.jetbrains.intellij.platform") version "2.0.0-rc2" apply false
     id("java")
     id("idea")
 }
 
-idea {
-    module {
-        isDownloadSources = true
-        isDownloadJavadoc = true
-    }
-}
-
 subprojects {
     apply(plugin = "java")
+    apply(plugin = "idea")
+
+    idea {
+        module {
+            if (System.getenv("CI").toBoolean()) {
+                isDownloadSources = true
+                isDownloadJavadoc = true
+            }
+        }
+    }
 
     java {
         toolchain {
diff --git a/gradle.properties b/gradle.properties
index 153640fa..dc99876a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,3 +5,5 @@ ideaVersion=IC-242.20224.159
 ideaSinceVersion=242
 
 junitVersion=5.9.2
+
+ideaPlatformPluginVersion=2.0.0
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 1902acbc..6af94be6 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.intellij.platform")
+    id("org.jetbrains.intellij.platform.base")
     id("java")
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 228280a0..f6c0f511 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,13 +1,11 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.0/userguide/multi_project_builds.html
- */
-
 pluginManagement {
+    val ideaPlatformPluginVersion: String by settings
+
+    plugins {
+        id("org.jetbrains.intellij.platform") version ideaPlatformPluginVersion
+        id("org.jetbrains.intellij.platform.base") version ideaPlatformPluginVersion
+    }
+
     repositories {
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
         gradlePluginPortal()
diff --git a/thrift/build.gradle.kts b/thrift/build.gradle.kts
index 89745c44..df79a8d4 100644
--- a/thrift/build.gradle.kts
+++ b/thrift/build.gradle.kts
@@ -39,6 +39,8 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 
+    implementation("org.awaitility:awaitility:4.2.1")
+
     intellijPlatform {
         create(project.property("ideaVersion") as String)
         bundledPlugins("com.intellij.java")
diff --git a/thrift/src/test/java/com/intellij/plugins/thrift/inspections/NameDuplicatesTest.java b/thrift/src/test/java/com/intellij/plugins/thrift/inspections/NameDuplicatesTest.java
index d505c44b..d8fa5ffc 100644
--- a/thrift/src/test/java/com/intellij/plugins/thrift/inspections/NameDuplicatesTest.java
+++ b/thrift/src/test/java/com/intellij/plugins/thrift/inspections/NameDuplicatesTest.java
@@ -5,7 +5,6 @@
 public class NameDuplicatesTest extends ThriftInspectionTestBase {
   public NameDuplicatesTest() {
     super("inspections/duplicates/name", ThriftNameDuplicatesInspection.class);
-
   }
 
   @Test
diff --git a/thrift/src/test/java/com/intellij/plugins/thrift/usages/ThriftFindUsagesTest.java b/thrift/src/test/java/com/intellij/plugins/thrift/usages/ThriftFindUsagesTest.java
index 3786a8e3..8a74d2ec 100644
--- a/thrift/src/test/java/com/intellij/plugins/thrift/usages/ThriftFindUsagesTest.java
+++ b/thrift/src/test/java/com/intellij/plugins/thrift/usages/ThriftFindUsagesTest.java
@@ -3,10 +3,12 @@
 import com.intellij.plugins.thrift.ThriftCodeInsightFixtureTestCase;
 import com.intellij.plugins.thrift.ThriftFileType;
 import com.intellij.usages.Usage;
+import org.awaitility.Awaitility;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.time.Duration;
 import java.util.Collection;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,9 +27,14 @@ void setUp() {
   }
 
   protected void doTest(int size) throws Throwable {
-    final Collection<Usage> elements = getFixture().testFindUsagesUsingAction();
-    assertNotNull(elements);
-    assertEquals(size, elements.size());
+    Awaitility
+        .await()
+        .atMost(Duration.ofSeconds(10))
+        .untilAsserted(() -> {
+          final Collection<Usage> elements = getFixture().testFindUsagesUsingAction();
+          assertNotNull(elements);
+          assertEquals(size, elements.size());
+        });
   }
 
   @Test