From df970ed00cffeb4bf90e3c4f3401bcd1eb9a6e1b Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 25 Jun 2015 18:30:47 +0200 Subject: [PATCH] stable order of files in jdk classes --- .../intellij/openapi/projectRoots/impl/JavaSdkImpl.java | 6 ++++++ .../com/intellij/execution/junit/JUnitClasspathTest.java | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index a6a940e401cc..2c1d56c63d0b 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -541,6 +541,12 @@ public class JavaSdkImpl extends JavaSdk { result.add(vFile); } } + Collections.sort(result, new Comparator() { + @Override + public int compare(VirtualFile o1, VirtualFile o2) { + return o1.getPath().compareTo(o2.getPath()); + } + }); return result; } diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java index 2303ec37d508..ccd5ecdf19f4 100644 --- a/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java +++ b/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java @@ -83,11 +83,11 @@ public class JUnitClasspathTest extends JavaCodeInsightFixtureTestCase { String file = preparePathsForComparison(FileUtil.loadFile(workingDirsFile), mod1, mod2); assertEquals("p\n" + "MODULE_1\n" + - "IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + + "IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/annotations.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + "1\n" + "p.T1\n" + "MODULE_2\n" + - "IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + + "IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/annotations.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + "1\n" + "p.T2\n", file); @@ -99,11 +99,11 @@ public class JUnitClasspathTest extends JavaCodeInsightFixtureTestCase { file = preparePathsForComparison(FileUtil.loadFile(workingDirsFile), mod1, mod2); assertEquals("p\n" + "MODULE_1\n" + - "SERVICE_MESSAGES;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + + "SERVICE_MESSAGES;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/annotations.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + "1\n" + "p.T1\n" + "MODULE_2\n" + - "SERVICE_MESSAGES;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + + "SERVICE_MESSAGES;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/annotations.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" + "1\n" + "p.T2\n", file); }