From cfc242b33f720c10b78c5698e0534b15f4e5fab3 Mon Sep 17 00:00:00 2001
From: Aleksey Dobrynin <aleksey.dobrynin@jetbrains.com>
Date: Wed, 9 Apr 2025 11:45:26 +0200
Subject: [PATCH] [junit 5] Avoid double LauncherFactory.create to prevent
 ClassCircularityError IDEA-367399

GitOrigin-RevId: 13754efdbf607d2ccea14e8ede4f5497f2c8a91b
---
 .../com/intellij/junit5/JUnit5IdeaTestRunner.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java
index 16ae5a2fc127..c7a32146641a 100644
--- a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java
+++ b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.junit5;
 
 import com.intellij.rt.execution.junit.IDEAJUnitListener;
@@ -31,7 +31,6 @@ public final class JUnit5IdeaTestRunner implements IdeaTestRunner<TestIdentifier
       }
     }
     while (--count > 0);
-    myLauncher = LauncherFactory.create();
   }
 
   @Override
@@ -54,7 +53,7 @@ public final class JUnit5IdeaTestRunner implements IdeaTestRunner<TestIdentifier
         }
       }
 
-      myLauncher.execute(discoveryRequest, listeners.toArray(new TestExecutionListener[0]));
+      getLauncher().execute(discoveryRequest, listeners.toArray(new TestExecutionListener[0]));
 
       return listener.wasSuccessful() ? 0 : -1;
     }
@@ -73,7 +72,7 @@ public final class JUnit5IdeaTestRunner implements IdeaTestRunner<TestIdentifier
   @Override
   public TestIdentifier getTestToStart(String[] args, String name) {
     final LauncherDiscoveryRequest discoveryRequest = JUnit5TestRunnerUtil.buildRequest(args, new String[1], "");
-    myForkedTestPlan = LauncherFactory.create().discover(discoveryRequest);
+    myForkedTestPlan = getLauncher().discover(discoveryRequest);
     final Set<TestIdentifier> roots = myForkedTestPlan.getRoots();
     if (roots.isEmpty()) return null;
     List<TestIdentifier> nonEmptyRoots = roots.stream()
@@ -146,4 +145,11 @@ public final class JUnit5IdeaTestRunner implements IdeaTestRunner<TestIdentifier
       }
     }
   }
+
+  private Launcher getLauncher() {
+    if (myLauncher == null) {
+      myLauncher = LauncherFactory.create();
+    }
+    return myLauncher;
+  }
 }