MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove junit 3 dependency

Browse Source 
when we have junit 5 in module classpath, it's dangerous to have only junit 5 and junit 3 cause vintage engine doesn't support junit 3 and just won't start tests

GitOrigin-RevId: 65eb6b34584593fdc75aa15f908f84b91772c5e0
This commit is contained in:
Anna Kozlova
2020-12-04 16:49:24 +00:00
committed by intellij-monorepo-bot
parent 4c884b7633
commit 0614011853
13 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml
+1 -1
View File
@@ -11,10 +11,10 @@
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="module" module-name="intellij.java.guiForms.rt" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="library" name="jgoodies-forms" level="project" />
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" exported="" />
<orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
</component>
</module>
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/testAssistant/TestDataGuessByExistingFilesUtilTest.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class TestDataGuessByExistingFilesUtilTest extends TestDataPathTestCase {
@Override
protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
moduleBuilder.addLibrary("junit3", JavaSdkUtil.getJunit3JarPath());
moduleBuilder.addLibrary("junit4", JavaSdkUtil.getJunit4JarPath());
}
plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/.classpath
-1
View File
@@ -48,7 +48,6 @@
</attributes>
</classpathentry>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/lib-8"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
plugins/eclipse/testData/iml/allProps/expected/expected.iml
-9
View File
@@ -103,15 +103,6 @@
</library>
</orderEntry>
<orderEntry type="library" exported="" name="lib-8" level="project" />
<orderEntry type="module-library">
<library name="junit3">
<CLASSES>
<root url="jar://$JUNIT3_PATH$!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junit4">
<CLASSES>
plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/.classpath
-1
View File
@@ -64,7 +64,6 @@
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/lib-8"/>
<classpathentry exported="true" kind="var" path="ECLIPSE_VARS_LIB_9_CLS" sourcepath="/ECLIPSE_VARS_LIB_9_SRC"/>
<classpathentry exported="true" kind="var" path="ECLIPSE_VARS_LIB_A_CLS" sourcepath="/ECLIPSE_VARS_LIB_A_SRC"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
plugins/eclipse/testData/round/junit/test/.classpath
-1
View File
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
plugins/eclipse/testData/round/srcRootsOrder/test/.classpath
+1 -1
View File
@@ -6,6 +6,6 @@
<classpathentry kind="lib" path="test-resources"/>
<classpathentry kind="src" path="testng"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt
-1
View File
@@ -93,7 +93,6 @@ internal fun loadEditSaveAndCheck(testDataDirs: List<Path>,
PathMacros.getInstance().setMacro(name, projectDir.resolve(relativePath).toAbsolutePath().toString())
}
val junitUrls = mapOf(
"JUNIT3_PATH" to EclipseClasspathReader.getJunitClsUrl(false),
"JUNIT4_PATH" to EclipseClasspathReader.getJunitClsUrl(true)
)
for ((name, url) in junitUrls) {
plugins/junit/intellij.junit.iml
-1
View File
@@ -14,7 +14,6 @@
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.rt" />
<orderEntry type="module" module-name="intellij.platform.testRunner" />
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="library" name="JUnit4" level="project" />
<orderEntry type="module" module-name="intellij.junit.rt" />
<orderEntry type="module" module-name="intellij.java.compiler" />
plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java
+2 -2
View File
@@ -14,13 +14,13 @@ import com.intellij.util.ArrayUtilRt;
public class JUnitDependencyScopeSuggesterTest extends JavaCodeInsightFixtureTestCase {
@Override
protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
moduleBuilder.addLibrary("junit3", JavaSdkUtil.getJunit3JarPath());
//moduleBuilder.addLibrary("junit3", JavaSdkUtil.getJunit3JarPath());
moduleBuilder.addLibrary("junit4", ArrayUtilRt.toStringArray(JavaSdkUtil.getJUnit4JarPaths()));
moduleBuilder.addLibrary("ideaRt", JavaSdkUtil.getIdeaRtJarPath());
moduleBuilder.addLibrary("empty");
}
public void testJunit3() {
public void _testJunit3() {
assertSame(DependencyScope.TEST, getScope("junit3"));
}
plugins/testng/intellij.testng.iml
+1 -1
View File
@@ -14,7 +14,6 @@
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.java.debugger" />
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="intellij.platform.testRunner" />
<orderEntry type="module" module-name="intellij.java.rt" />
<orderEntry type="module" module-name="intellij.testng.rt" />
@@ -29,6 +28,7 @@
<orderEntry type="module" module-name="intellij.java.typeMigration" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
</component>
<component name="copyright">
<Base>
plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml
+1 -1
View File
@@ -43,7 +43,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
</component>
</module>
python/intellij.python.community.plugin.tests.iml
+1 -1
View File
@@ -11,8 +11,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.java.testFramework" />
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
</component>
</module>