From 0614011853dc34f4ced056e323486b2897d37b4f Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 4 Dec 2020 11:42:09 +0100 Subject: [PATCH] remove junit 3 dependency 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 --- .../forms-compiler/intellij.java.guiForms.compiler.iml | 2 +- .../TestDataGuessByExistingFilesUtilTest.java | 2 +- .../iml/allProps/eclipse-ws-3.4.1-a/all-props/.classpath | 1 - .../eclipse/testData/iml/allProps/expected/expected.iml | 9 --------- .../allProps/eclipse-ws-3.4.1-a/all-props/.classpath | 1 - plugins/eclipse/testData/round/junit/test/.classpath | 1 - .../eclipse/testData/round/srcRootsOrder/test/.classpath | 2 +- .../testSources/org/jetbrains/idea/eclipse/testUtils.kt | 1 - plugins/junit/intellij.junit.iml | 1 - .../junit/JUnitDependencyScopeSuggesterTest.java | 4 ++-- plugins/testng/intellij.testng.iml | 2 +- .../engine/impl/intellij.xslt.debugger.impl.rt.iml | 2 +- python/intellij.python.community.plugin.tests.iml | 2 +- 13 files changed, 8 insertions(+), 22 deletions(-) diff --git a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml index 521d73379512..21ccd8032340 100644 --- a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml +++ b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml @@ -11,10 +11,10 @@ - + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/testAssistant/TestDataGuessByExistingFilesUtilTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/testAssistant/TestDataGuessByExistingFilesUtilTest.java index 502b44ade307..515d3d7ea29f 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/testAssistant/TestDataGuessByExistingFilesUtilTest.java +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/testAssistant/TestDataGuessByExistingFilesUtilTest.java @@ -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()); } diff --git a/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/.classpath b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/.classpath index 3688cde12a05..a5b90ccffc35 100644 --- a/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/.classpath +++ b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/.classpath @@ -48,7 +48,6 @@ - diff --git a/plugins/eclipse/testData/iml/allProps/expected/expected.iml b/plugins/eclipse/testData/iml/allProps/expected/expected.iml index 0cacf8c388cb..c86fc1fd6bda 100644 --- a/plugins/eclipse/testData/iml/allProps/expected/expected.iml +++ b/plugins/eclipse/testData/iml/allProps/expected/expected.iml @@ -103,15 +103,6 @@ - - - - - - - - - diff --git a/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/.classpath b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/.classpath index f75da1b1fe06..639133310f61 100644 --- a/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/.classpath +++ b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/.classpath @@ -64,7 +64,6 @@ - diff --git a/plugins/eclipse/testData/round/junit/test/.classpath b/plugins/eclipse/testData/round/junit/test/.classpath index f10d234a8bdc..3e0fb272a811 100644 --- a/plugins/eclipse/testData/round/junit/test/.classpath +++ b/plugins/eclipse/testData/round/junit/test/.classpath @@ -2,7 +2,6 @@ - diff --git a/plugins/eclipse/testData/round/srcRootsOrder/test/.classpath b/plugins/eclipse/testData/round/srcRootsOrder/test/.classpath index 2b433c0c057b..5b0e4f7bb900 100644 --- a/plugins/eclipse/testData/round/srcRootsOrder/test/.classpath +++ b/plugins/eclipse/testData/round/srcRootsOrder/test/.classpath @@ -6,6 +6,6 @@ - + diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt index 5b476c5284a9..4623ddf96b2b 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt @@ -93,7 +93,6 @@ internal fun loadEditSaveAndCheck(testDataDirs: List, 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) { diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml index 217a0f245619..642b2c86c0f1 100644 --- a/plugins/junit/intellij.junit.iml +++ b/plugins/junit/intellij.junit.iml @@ -14,7 +14,6 @@ - diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java index e17f5e2226fc..35fa0d8272d6 100644 --- a/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java +++ b/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java @@ -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")); } diff --git a/plugins/testng/intellij.testng.iml b/plugins/testng/intellij.testng.iml index c938b6fd60c9..77f231539938 100644 --- a/plugins/testng/intellij.testng.iml +++ b/plugins/testng/intellij.testng.iml @@ -14,7 +14,6 @@ - @@ -29,6 +28,7 @@ + diff --git a/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml b/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml index a04ac2b035d2..1aa6e11bbdf1 100644 --- a/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml +++ b/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml @@ -43,7 +43,7 @@ - + \ No newline at end of file diff --git a/python/intellij.python.community.plugin.tests.iml b/python/intellij.python.community.plugin.tests.iml index dbcd83cd0e5c..d59be0eb0174 100644 --- a/python/intellij.python.community.plugin.tests.iml +++ b/python/intellij.python.community.plugin.tests.iml @@ -11,8 +11,8 @@ - + \ No newline at end of file