[rdct-tests] AT-1029 switch to dev server

[rdct-tests] make sure parameters are calculated only in the test process and fix test sync keymaps between thin clients
[rdct-tests] skip lobby related exceptions in case ApplicationManagerEx.isInIntegrationTest
[rdct-tests] add Product code to the CWM connection link so path are customised in FrontendProcessPathCustomizer and the collect logs test passes
[rdct-tests] fix Should be invoked in manager thread use DebuggerManagerThreadImpl for XSuspendContext.toString
[rdct-tests] add pre and post clean up options for all withServerAndClient variants
[rdct-tests] introduce a way to clean up dev server artifacts deleteArtifactsOfThisRun
eap installers test


Merge-request: IJ-MR-157158
Merged-by: Anastasia Katsman <Anastasia.Katsman@jetbrains.com>

GitOrigin-RevId: c05a79fb5eadb6665df4c2e657f866be9f96a078

.idea/modules.xml

@@ -574,12 +574,14 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/intellij.kotlin.plugin.community.main.iml" filepath="$PROJECT_DIR$/plugins/kotlin/intellij.kotlin.plugin.community.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" filepath="$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/assertj-core/intellij.libraries.assertj.core.iml" filepath="$PROJECT_DIR$/libraries/assertj-core/intellij.libraries.assertj.core.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" filepath="$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml" filepath="$PROJECT_DIR$/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/grpc-netty-shaded/intellij.libraries.grpc.netty.shaded.iml" filepath="$PROJECT_DIR$/libraries/grpc-netty-shaded/intellij.libraries.grpc.netty.shaded.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" filepath="$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5/intellij.libraries.junit5.iml" filepath="$PROJECT_DIR$/libraries/junit5/intellij.libraries.junit5.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/kotlin-test/intellij.libraries.kotlinTest.iml" filepath="$PROJECT_DIR$/libraries/kotlin-test/intellij.libraries.kotlinTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/ktor-client/intellij.libraries.ktor.client.iml" filepath="$PROJECT_DIR$/libraries/ktor-client/intellij.libraries.ktor.client.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml" filepath="$PROJECT_DIR$/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/microba/intellij.libraries.microba.iml" filepath="$PROJECT_DIR$/libraries/microba/intellij.libraries.microba.iml" />

build/launch/intellij.idea.tools.launch.iml

@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

build/launch/resources/intellij.idea.tools.launch.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

java/java-runtime/intellij.java.rt.iml

@@ -33,6 +33,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" scope="PROVIDED" />
   </component>
 </module>

java/testFramework/intellij.java.testFramework.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -10,7 +11,7 @@
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.testFramework.shared" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util" exported="" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />

java/testFramework/resources/intellij.java.testFramework.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

libraries/assertj-core/intellij.libraries.assertj.core.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="assertJ" level="project" />
+  </component>
+</module>

libraries/assertj-core/resources/intellij.libraries.assertj.core.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

libraries/junit4/intellij.libraries.junit4.iml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" exported="" name="JUnit4" level="project" />
   </component>
 </module>

libraries/kotlin-test/intellij.libraries.kotlinTest.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="kotlin-test" level="project" />
+  </component>
+</module>

libraries/kotlin-test/resources/intellij.libraries.kotlinTest.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

platform/remote-driver/test-sdk/intellij.driver.sdk.iml

@@ -25,6 +25,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />

platform/remote-driver/test-sdk/resources/intellij.driver.sdk.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

platform/remoteDev-util/modelGenerated/DistributedTestModel.Generated.kt

@@ -58,7 +58,7 @@ class DistributedTestModel private constructor(
         
         private val __RdTestSessionNullableSerializer = RdTestSession.nullable()
         
-        const val serializationHash = -5949507648312297742L
+        const val serializationHash = -521719455547022632L
         
     }
     override val serializersOwner: ISerializersOwner get() = DistributedTestModel
@@ -438,9 +438,8 @@ class RdTestSession private constructor(
     private val _sendException: RdSignal<RdTestSessionException>,
     private val _exitApp: RdSignal<Unit>,
     private val _showNotification: RdSignal<String>,
-    private val _closeProject: RdCall<Unit, Boolean>,
     private val _forceLeaveAllModals: RdCall<Boolean, Unit>,
-    private val _closeProjectIfOpened: RdCall<Unit, Boolean>,
+    private val _closeAllOpenedProjects: RdCall<Unit, Boolean>,
     private val _runNextAction: RdCall<RdTestActionParameters, String?>,
     private val _runNextActionGetComponentData: RdCall<RdTestActionParameters, RdTestComponentData>,
     private val _requestFocus: RdCall<Boolean, Boolean>,
@@ -470,9 +469,8 @@ class RdTestSession private constructor(
             val _sendException = RdSignal.read(ctx, buffer, RdTestSessionException)
             val _exitApp = RdSignal.read(ctx, buffer, FrameworkMarshallers.Void)
             val _showNotification = RdSignal.read(ctx, buffer, FrameworkMarshallers.String)
-            val _closeProject = RdCall.read(ctx, buffer, FrameworkMarshallers.Void, FrameworkMarshallers.Bool)
             val _forceLeaveAllModals = RdCall.read(ctx, buffer, FrameworkMarshallers.Bool, FrameworkMarshallers.Void)
-            val _closeProjectIfOpened = RdCall.read(ctx, buffer, FrameworkMarshallers.Void, FrameworkMarshallers.Bool)
+            val _closeAllOpenedProjects = RdCall.read(ctx, buffer, FrameworkMarshallers.Void, FrameworkMarshallers.Bool)
             val _runNextAction = RdCall.read(ctx, buffer, RdTestActionParameters, __StringNullableSerializer)
             val _runNextActionGetComponentData = RdCall.read(ctx, buffer, RdTestActionParameters, RdTestComponentData)
             val _requestFocus = RdCall.read(ctx, buffer, FrameworkMarshallers.Bool, FrameworkMarshallers.Bool)
@@ -483,7 +481,7 @@ class RdTestSession private constructor(
             val _isResponding = RdCall.read(ctx, buffer, FrameworkMarshallers.Void, FrameworkMarshallers.Bool)
             val _projectsAreInitialised = RdCall.read(ctx, buffer, FrameworkMarshallers.Void, FrameworkMarshallers.Bool)
             val _getProductCodeAndVersion = RdCall.read(ctx, buffer, FrameworkMarshallers.Void, RdProductInfo)
-            return RdTestSession(agentInfo, testClassName, testMethodName, traceCategories, debugCategories, _ready, _sendException, _exitApp, _showNotification, _closeProject, _forceLeaveAllModals, _closeProjectIfOpened, _runNextAction, _runNextActionGetComponentData, _requestFocus, _isFocused, _visibleFrameNames, _projectsNames, _makeScreenshot, _isResponding, _projectsAreInitialised, _getProductCodeAndVersion).withId(_id)
+            return RdTestSession(agentInfo, testClassName, testMethodName, traceCategories, debugCategories, _ready, _sendException, _exitApp, _showNotification, _forceLeaveAllModals, _closeAllOpenedProjects, _runNextAction, _runNextActionGetComponentData, _requestFocus, _isFocused, _visibleFrameNames, _projectsNames, _makeScreenshot, _isResponding, _projectsAreInitialised, _getProductCodeAndVersion).withId(_id)
         }
         
         override fun write(ctx: SerializationCtx, buffer: AbstractBuffer, value: RdTestSession)  {
@@ -497,9 +495,8 @@ class RdTestSession private constructor(
             RdSignal.write(ctx, buffer, value._sendException)
             RdSignal.write(ctx, buffer, value._exitApp)
             RdSignal.write(ctx, buffer, value._showNotification)
-            RdCall.write(ctx, buffer, value._closeProject)
             RdCall.write(ctx, buffer, value._forceLeaveAllModals)
-            RdCall.write(ctx, buffer, value._closeProjectIfOpened)
+            RdCall.write(ctx, buffer, value._closeAllOpenedProjects)
             RdCall.write(ctx, buffer, value._runNextAction)
             RdCall.write(ctx, buffer, value._runNextActionGetComponentData)
             RdCall.write(ctx, buffer, value._requestFocus)
@@ -522,9 +519,8 @@ class RdTestSession private constructor(
     val sendException: IAsyncSignal<RdTestSessionException> get() = _sendException
     val exitApp: IAsyncSignal<Unit> get() = _exitApp
     val showNotification: ISignal<String> get() = _showNotification
-    val closeProject: RdCall<Unit, Boolean> get() = _closeProject
     val forceLeaveAllModals: RdCall<Boolean, Unit> get() = _forceLeaveAllModals
-    val closeProjectIfOpened: RdCall<Unit, Boolean> get() = _closeProjectIfOpened
+    val closeAllOpenedProjects: RdCall<Unit, Boolean> get() = _closeAllOpenedProjects
     val runNextAction: RdCall<RdTestActionParameters, String?> get() = _runNextAction
     val runNextActionGetComponentData: RdCall<RdTestActionParameters, RdTestComponentData> get() = _runNextActionGetComponentData
     val requestFocus: RdCall<Boolean, Boolean> get() = _requestFocus
@@ -544,9 +540,8 @@ class RdTestSession private constructor(
     init {
         _sendException.async = true
         _exitApp.async = true
-        _closeProject.async = true
         _forceLeaveAllModals.async = true
-        _closeProjectIfOpened.async = true
+        _closeAllOpenedProjects.async = true
         _runNextAction.async = true
         _runNextActionGetComponentData.async = true
         _requestFocus.async = true
@@ -564,9 +559,8 @@ class RdTestSession private constructor(
         bindableChildren.add("sendException" to _sendException)
         bindableChildren.add("exitApp" to _exitApp)
         bindableChildren.add("showNotification" to _showNotification)
-        bindableChildren.add("closeProject" to _closeProject)
         bindableChildren.add("forceLeaveAllModals" to _forceLeaveAllModals)
-        bindableChildren.add("closeProjectIfOpened" to _closeProjectIfOpened)
+        bindableChildren.add("closeAllOpenedProjects" to _closeAllOpenedProjects)
         bindableChildren.add("runNextAction" to _runNextAction)
         bindableChildren.add("runNextActionGetComponentData" to _runNextActionGetComponentData)
         bindableChildren.add("requestFocus" to _requestFocus)
@@ -596,7 +590,6 @@ class RdTestSession private constructor(
         RdSignal<RdTestSessionException>(RdTestSessionException),
         RdSignal<Unit>(FrameworkMarshallers.Void),
         RdSignal<String>(FrameworkMarshallers.String),
-        RdCall<Unit, Boolean>(FrameworkMarshallers.Void, FrameworkMarshallers.Bool),
         RdCall<Boolean, Unit>(FrameworkMarshallers.Bool, FrameworkMarshallers.Void),
         RdCall<Unit, Boolean>(FrameworkMarshallers.Void, FrameworkMarshallers.Bool),
         RdCall<RdTestActionParameters, String?>(RdTestActionParameters, __StringNullableSerializer),
@@ -626,9 +619,8 @@ class RdTestSession private constructor(
             print("sendException = "); _sendException.print(printer); println()
             print("exitApp = "); _exitApp.print(printer); println()
             print("showNotification = "); _showNotification.print(printer); println()
-            print("closeProject = "); _closeProject.print(printer); println()
             print("forceLeaveAllModals = "); _forceLeaveAllModals.print(printer); println()
-            print("closeProjectIfOpened = "); _closeProjectIfOpened.print(printer); println()
+            print("closeAllOpenedProjects = "); _closeAllOpenedProjects.print(printer); println()
             print("runNextAction = "); _runNextAction.print(printer); println()
             print("runNextActionGetComponentData = "); _runNextActionGetComponentData.print(printer); println()
             print("requestFocus = "); _requestFocus.print(printer); println()
@@ -654,9 +646,8 @@ class RdTestSession private constructor(
             _sendException.deepClonePolymorphic(),
             _exitApp.deepClonePolymorphic(),
             _showNotification.deepClonePolymorphic(),
-            _closeProject.deepClonePolymorphic(),
             _forceLeaveAllModals.deepClonePolymorphic(),
-            _closeProjectIfOpened.deepClonePolymorphic(),
+            _closeAllOpenedProjects.deepClonePolymorphic(),
             _runNextAction.deepClonePolymorphic(),
             _runNextActionGetComponentData.deepClonePolymorphic(),
             _requestFocus.deepClonePolymorphic(),

platform/remoteDev-util/modelSources/DistributedTestModel.kt

@@ -71,9 +71,8 @@ object DistributedTestModel : Ext(TestRoot) {
     signal("sendException", RdTestSessionException).async
     signal("exitApp", void).async
     signal("showNotification", string)
-    call("closeProject", void, bool).async
     call("forceLeaveAllModals", bool, void).async
-    call("closeProjectIfOpened", void, bool).async
+    call("closeAllOpenedProjects", void, bool).async
     call("runNextAction", RdTestActionParameters, string.nullable).async
     call("runNextActionGetComponentData", RdTestActionParameters, RdTestComponentData).async
     call("requestFocus", bool, bool).async

platform/remoteDev-util/src/com/intellij/remoteDev/tests/DistributedTestsAgentConstants.kt

@@ -8,4 +8,5 @@ object DistributedTestsAgentConstants {
   const val protocolHostPropertyName = "RDCT_TESTING_HOST"
   const val protocolPortPropertyName = "RDCT_TESTING_PORT"
   const val threadDumpFileSubstring = "threadDump"
+  const val sourcePathProperty = "idea.sources.path"
 }

platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHost.kt

@@ -16,7 +16,6 @@ import com.intellij.notification.NotificationType
 import com.intellij.openapi.application.*
 import com.intellij.openapi.application.impl.LaterInvocator
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ex.ProjectManagerEx
 import com.intellij.openapi.rd.util.adviseSuspend
@@ -70,6 +69,10 @@ open class DistributedTestHost(coroutineScope: CoroutineScope) {
     fun getDistributedTestPort(): Int? =
       System.getProperty(DistributedTestsAgentConstants.protocolPortPropertyName)?.toIntOrNull()
 
+    val sourcesRootFolder: File by lazy {
+      System.getProperty(DistributedTestsAgentConstants.sourcePathProperty, PathManager.getHomePath()).let(::File)
+    }
+
     /**
      * ID of the plugin which contains test code.
      * Currently, only test code of the client part is put to a separate plugin.
@@ -156,16 +159,13 @@ open class DistributedTestHost(coroutineScope: CoroutineScope) {
           }
 
           // Create test class
-          val testPlugin = PluginManagerCore.getPlugin(PluginId.getId(TEST_PLUGIN_ID))
-          val classLoader = if (testPlugin != null) {
-            LOG.info("Test class will be loaded from '${testPlugin.pluginId}' plugin")
-            testPlugin.pluginClassLoader
-          }
-          else {
-            LOG.info("Test class will be loaded by the core classloader.")
-            javaClass.classLoader
-          }
-          val testClass = Class.forName(session.testClassName, true, classLoader)
+          val testPluginId = System.getProperty("distributed.test.module", TEST_PLUGIN_ID)
+          val testPlugin = PluginManagerCore.getPluginSet().findEnabledModule(testPluginId)
+                           ?: error("Test plugin '$testPluginId' is not found")
+
+          LOG.info("Test class will be loaded from '${testPlugin.pluginId}' plugin")
+
+          val testClass = Class.forName(session.testClassName, true, testPlugin.pluginClassLoader)
           val testClassObject = testClass.kotlin.createInstance() as DistributedTestPlayer
 
           // Tell test we are running it inside an agent
@@ -303,7 +303,7 @@ open class DistributedTestHost(coroutineScope: CoroutineScope) {
           leaveAllModals(throwErrorIfModal)
         }
 
-        session.closeProjectIfOpened.setSuspend(sessionBgtDispatcher) { _, _ ->
+        session.closeAllOpenedProjects.setSuspend(sessionBgtDispatcher) { _, _ ->
           try {
             leaveAllModals(throwErrorIfModal = true)
 
@@ -315,7 +315,7 @@ open class DistributedTestHost(coroutineScope: CoroutineScope) {
             }
           }
           catch (ce: CancellationException) {
-            LOG.info("closeProjectIfOpened was cancelled", ce)
+            LOG.info("closeAllOpenedProjects was cancelled", ce)
             throw ce
           }
 

platform/testFramework/core/intellij.platform.testFramework.core.iml

@@ -12,8 +12,8 @@
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.platform.boot" />
     <orderEntry type="module" module-name="intellij.tools.testsBootstrap" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" scope="PROVIDED" />
     <orderEntry type="library" name="opentest4j" level="project" />
-    <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.java.rt" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />

platform/testFramework/intellij.platform.testFramework.iml

@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
-    <orderEntry type="library" exported="" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" exported="" scope="PROVIDED" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />

platform/testFramework/resources/intellij.platform.testFramework.xml

@@ -3,12 +3,6 @@
     <module name="intellij.platform.testFramework.common" />
     <module name="intellij.platform.testFramework.core" />
     <module name="intellij.platform.testFramework.impl" />
+    <module name="intellij.libraries.junit4" />
   </dependencies>
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- 'serviceImplementation' not needed here-->
-    <!--suppress PluginXmlValidity -->
-    <applicationService serviceInterface="com.intellij.openapi.project.ProjectManager"
-                        testServiceImplementation="com.intellij.project.TestProjectManager"
-                        overrides="true"/>
-  </extensions>
 </idea-plugin>

plugins/junit/plugin-content.yaml

@@ -2,6 +2,12 @@
   modules:
   - name: intellij.junit.rt
 - name: lib/junit.jar
+  projectLibraries:
+  - name: JUnit4
+    files:
+    - name: $MAVEN_REPOSITORY$/junit/junit/4/junit-4.jar
+    - name: $MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1/hamcrest-core-1.jar
+    reason: <- intellij.junit
   modules:
   - name: intellij.junit
 - name: lib/junit5-rt.jar

tools/intellij.tools.ide.util.common/resources/intellij.tools.ide.util.common.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>