From bc30eb3149d9aa5310d675e8b2eb6fdfe544a9e7 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 11 Oct 2018 13:31:53 +0200
Subject: [PATCH] [tests] speeds up Maven's and OSGi's build process classpath
 tests

---
 plugins/maven/intellij.maven.iml              |  1 +
 .../compiler/BuildProcessClasspathTest.kt     | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml
index b60c7a3fd9ca..56ff8f2ba5d3 100644
--- a/plugins/maven/intellij.maven.iml
+++ b/plugins/maven/intellij.maven.iml
@@ -60,6 +60,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="module" module-name="intellij.maven.server.m3.common" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/BuildProcessClasspathTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/BuildProcessClasspathTest.kt
index ce392bc6dbe0..4e7c1b235950 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/BuildProcessClasspathTest.kt
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/BuildProcessClasspathTest.kt
@@ -2,18 +2,19 @@
 package org.jetbrains.idea.maven.compiler
 
 import com.intellij.compiler.server.impl.BuildProcessClasspathManager
-import com.intellij.testFramework.IdeaTestCase
+import com.intellij.openapi.project.DefaultProjectFactory
+import com.intellij.psi.impl.light.LightJavaModule
+import com.intellij.testFramework.fixtures.BareTestFixtureTestCase
+import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.jps.cmdline.ClasspathBootstrap
+import org.junit.Test
 import java.io.File
 
-class BuildProcessClasspathTest : IdeaTestCase() {
-  fun testBuildProcessClasspath() {
-    val cp = mutableListOf<String>()
-    cp.addAll(ClasspathBootstrap.getBuildProcessApplicationClasspath())
-    cp.addAll(BuildProcessClasspathManager().getBuildProcessPluginsClasspath(project))
-    val cpFileNames = cp.map { File(it).name }
-    assertContainsElements(cpFileNames,
-                           "intellij.maven.jps",
-                           "plexus-utils-3.0.22.jar")
+class BuildProcessClasspathTest : BareTestFixtureTestCase() {
+  @Test fun testBuildProcessClasspath() {
+    val baseCp = ClasspathBootstrap.getBuildProcessApplicationClasspath()
+    val pluginsCp = BuildProcessClasspathManager().getBuildProcessPluginsClasspath(DefaultProjectFactory.getInstance().defaultProject)
+    val libs = (baseCp.asSequence() + pluginsCp.asSequence()).map { LightJavaModule.moduleName(File(it).name) }.toSet()
+    assertThat(libs).contains("intellij.maven.jps", "plexus.utils")
   }
-}
+}
\ No newline at end of file