From 85311e98893d4e66000f72d9dc0546485ac5b203 Mon Sep 17 00:00:00 2001
From: Ilia Kirianovskii <Ilia.Kirianovskii@jetbrains.com>
Date: Sun, 4 May 2025 13:11:59 +0200
Subject: [PATCH] [python] Add intellij.libraries.testcontainers (not
 testcontainers library) to dependencies in
 intellij.python.community.junit5Tests.framework._test module (IJPL-116621)

Also adds intellij.libraries.testcontainers module.

GitOrigin-RevId: b230f320ca4d058994570640367c549251ceab19
---
 .idea/modules.xml                             |  1 +
 .../intellij.libraries.testcontainers.iml     | 13 ++++++
 .../intellij.libraries.testcontainers.xml     |  5 +++
 .../build/CommunityLibraryLicenses.kt         |  4 ++
 ...python.community.junit5Tests.framework.iml | 44 +++++++++----------
 ....community.junit5Tests.framework._test.xml |  1 +
 6 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 libraries/testcontainers/intellij.libraries.testcontainers.iml
 create mode 100644 libraries/testcontainers/resources/intellij.libraries.testcontainers.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5b1ac21834d5..53e8b6dbd80f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -621,6 +621,7 @@
       <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" />
       <module fileurl="file://$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" filepath="$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" filepath="$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" filepath="$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" filepath="$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" filepath="$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" />
diff --git a/libraries/testcontainers/intellij.libraries.testcontainers.iml b/libraries/testcontainers/intellij.libraries.testcontainers.iml
new file mode 100644
index 000000000000..57ea7d75ec0f
--- /dev/null
+++ b/libraries/testcontainers/intellij.libraries.testcontainers.iml
@@ -0,0 +1,13 @@
+<?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="" scope="TEST" name="testcontainers" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" scope="RUNTIME" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/libraries/testcontainers/resources/intellij.libraries.testcontainers.xml b/libraries/testcontainers/resources/intellij.libraries.testcontainers.xml
new file mode 100644
index 000000000000..9c6254a8f305
--- /dev/null
+++ b/libraries/testcontainers/resources/intellij.libraries.testcontainers.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.libraries.junit4"/>
+  </dependencies>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
index 20de10fdbd7c..326dd925cf11 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
@@ -1198,6 +1198,10 @@ object CommunityLibraryLicenses {
       .lgpl21("https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html")
       .suppliedByOrganizations("Sun Microsystems, Inc."),
 
+    LibraryLicense("Testcontainers Core", libraryName = "testcontainers", url = "https://java.testcontainers.org")
+      .mit("https://github.com/testcontainers/testcontainers-java/blob/main/LICENSE")
+      .suppliedByPersons("Richard North"),
+
     LibraryLicense(libraryName = "TestNG", url = "https://testng.org/")
       .apache("https://github.com/cbeust/testng/blob/master/LICENSE.txt"),
 
diff --git a/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml b/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml
index 0f3c161f9fe4..5a2860597f11 100644
--- a/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml
+++ b/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml
@@ -8,31 +8,32 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="JUnit5Jupiter" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="JUnit5Pioneer" level="project" />
-    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="TEST" name="JUnit5Params" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="testcontainers" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.python.sdk" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="apache.sshd.osgi" level="project" />
-    <orderEntry type="library" scope="TEST" name="testcontainers-junit-jupiter" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" scope="TEST" name="jna" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit5Jupiter" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit5Params" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit5Pioneer" level="project" />
+    <orderEntry type="library" scope="TEST" name="apache.sshd.osgi" level="project" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
-    <orderEntry type="module" module-name="intellij.python.community.plugin" scope="RUNTIME" />
+    <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
+    <orderEntry type="library" scope="TEST" name="jna" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
+    <orderEntry type="library" scope="TEST" name="testcontainers-junit-jupiter" level="project" />
     <orderEntry type="module" module-name="intellij.community.wintools" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.python.community.impl.poetry" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.python.community.testFramework.testEnv" exported="" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.python.community" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.testcontainers" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.python.community" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.python.community.impl.poetry" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.python.community.plugin" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.testFramework.testEnv" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.python.sdk" scope="TEST" />
     <orderEntry type="module-library" exported="" scope="TEST">
       <library name="uk.webcompere.system.stubs.jupiter" type="repository">
         <properties maven-id="uk.org.webcompere:system-stubs-jupiter:2.1.8">
@@ -71,6 +72,5 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml b/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml
index a61dcb3fb676..2b8d4b3b8d54 100644
--- a/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml
+++ b/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml
@@ -1,5 +1,6 @@
 <idea-plugin>
   <dependencies>
+    <module name="intellij.libraries.testcontainers"/>
     <module name="intellij.platform.testFramework.junit5"/>
     <module name="intellij.python.community.testFramework.testEnv"/>
   </dependencies>