diff options
Diffstat (limited to 'plugins/eclipse')
| -rw-r--r-- | plugins/eclipse/testData/iml/allProps/expected/expected.iml | 4 | ||||
| -rw-r--r-- | plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java | 19 |
2 files changed, 9 insertions, 14 deletions
diff --git a/plugins/eclipse/testData/iml/allProps/expected/expected.iml b/plugins/eclipse/testData/iml/allProps/expected/expected.iml index 142bc1072c84..d47060bab059 100644 --- a/plugins/eclipse/testData/iml/allProps/expected/expected.iml +++ b/plugins/eclipse/testData/iml/allProps/expected/expected.iml @@ -92,7 +92,7 @@ <orderEntry type="module-library"> <library name="junit3"> <CLASSES> - <root url="jar://$JUNIT$/lib/junit.jar!/" /> + <root url="jar://$JUNIT$/junit.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -101,7 +101,7 @@ <orderEntry type="module-library"> <library name="junit4"> <CLASSES> - <root url="jar://$JUNIT$/lib/junit-4.11.jar!/" /> + <root url="jar://$JUNIT$/junit-4.11.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java index 5e1cc3f87921..4b64e08f04d6 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java @@ -22,8 +22,8 @@ package org.jetbrains.idea.eclipse; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathMacros; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.PluginPathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.components.PathMacroManager; import com.intellij.openapi.module.Module; @@ -38,8 +38,7 @@ import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.IdeaTestCase; -import junit.framework.Assert; -import org.jdom.Document; +import com.intellij.testFramework.PlatformTestUtil; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.eclipse.conversion.EclipseClasspathReader; @@ -49,7 +48,7 @@ import java.util.ArrayList; import java.util.HashSet; public class EclipseImlTest extends IdeaTestCase { - @NonNls public static final String JUNIT = "JUNIT"; + @NonNls private static final String JUNIT = "JUNIT"; @Override protected void setUp() throws Exception { @@ -75,11 +74,8 @@ public class EclipseImlTest extends IdeaTestCase { if (!SystemInfo.isWindows) { fileText = fileText.replaceAll(EclipseXml.FILE_PROTOCOL + "/", EclipseXml.FILE_PROTOCOL); } - String communityAppDir = PathManager.getHomePath(); - if (new File(PathManager.getHomePath(), "community").exists()) { - communityAppDir += "/community"; - } - fileText = fileText.replaceAll("\\$" + JUNIT + "\\$", communityAppDir); + String communityLib = FileUtil.toSystemIndependentName(PathManagerEx.findFileUnderCommunityHome("lib").getAbsolutePath()); + fileText = fileText.replaceAll("\\$" + JUNIT + "\\$", communityLib); final Element classpathElement = JDOMUtil.loadDocument(fileText).getRootElement(); final Module module = WriteCommandAction.runWriteCommandAction(null, new Computable<Module>() { @Override @@ -104,15 +100,14 @@ public class EclipseImlTest extends IdeaTestCase { final Element actualImlElement = new Element("root"); ((ModuleRootManagerImpl)ModuleRootManager.getInstance(module)).getState().writeExternal(actualImlElement); - PathMacros.getInstance().setMacro(JUNIT, communityAppDir); + PathMacros.getInstance().setMacro(JUNIT, communityLib); PathMacroManager.getInstance(module).collapsePaths(actualImlElement); PathMacroManager.getInstance(project).collapsePaths(actualImlElement); PathMacros.getInstance().removeMacro(JUNIT); final Element expectedIml = JDOMUtil.loadDocument(new File(project.getBaseDir().getPath() + "/expected", "expected.iml")).getRootElement(); - Assert.assertTrue(new String(JDOMUtil.printDocument(new Document(actualImlElement), "\n")), - JDOMUtil.areElementsEqual(expectedIml, actualImlElement)); + PlatformTestUtil.assertElementsEqual(expectedIml, actualImlElement); } |