Replace jmock jars with a Maven library

GitOrigin-RevId: b645bbedccbd0232c01fc25e570e1ed3a3087f0f
PerryZhao · Jul 26, 2022 · 4367c29 · 4367c29
1 parent e8c73dc
commit 4367c29
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 11 deletions.
diff --git a/.idea/libraries/jmock.xml b/.idea/libraries/jmock.xml
diff --git a/.idea/libraries/jmock_junit4.xml b/.idea/libraries/jmock_junit4.xml
diff --git a/.idea/libraries/jmock_legacy.xml b/.idea/libraries/jmock_legacy.xml
diff --git a/lib/dev/jmock-2.5.1.jar b/lib/dev/jmock-2.5.1.jar
diff --git a/lib/dev/jmock-junit4-2.5.1.jar b/lib/dev/jmock-junit4-2.5.1.jar
diff --git a/lib/dev/jmock-legacy-2.5.1.jar b/lib/dev/jmock-legacy-2.5.1.jar
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -28,6 +28,8 @@
  <orderEntry type="library" name="commons-logging" level="project" />
  <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
  <orderEntry type="library" scope="TEST" name="jmock" level="project" />
+ <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
+ <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
  <orderEntry type="library" scope="TEST" name="flexmark" level="project" />
  <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
  <orderEntry type="library" name="jackson" level="project" />

diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
@@ -11,8 +11,8 @@
  <orderEntry type="module" module-name="intellij.platform.lang.impl" />
  <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
  <orderEntry type="library" scope="TEST" name="jmock" level="project" />
- <orderEntry type="library" scope="TEST" name="easymock" level="project" />
- <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
+ <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
+ <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
  <orderEntry type="module" module-name="intellij.platform.testFramework" />
  <orderEntry type="module" module-name="intellij.platform.ide.impl" />
  <orderEntry type="module" module-name="intellij.platform.workspaceModel.storage" />
@@ -30,6 +30,7 @@
  <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
  <orderEntry type="library" scope="TEST" name="gson" level="project" />
  <orderEntry type="library" scope="TEST" name="kotlin-stdlib-jdk8" level="project" />
+ <orderEntry type="library" scope="TEST" name="easymock" level="project" />
  <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
  <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
  <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
@@ -70,5 +71,6 @@
  <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
  <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
  <orderEntry type="module" module-name="intellij.junit.rt" scope="TEST" />
+ <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
  </component>
 </module>
diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml
@@ -11,6 +11,8 @@
  <orderEntry type="inheritedJdk" />
  <orderEntry type="sourceFolder" forTests="false" />
  <orderEntry type="library" scope="TEST" name="jmock" level="project" />
+ <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
+ <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
  <orderEntry type="library" scope="TEST" name="mockito" level="project" />
  <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
  <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />