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

RecentTests: sorted by date inside groups

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2016-01-28 20:54:16 +03:00
parent 59062a136f
commit 95898440b9
2 changed files with 74 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/testIntegration/RecentTestsData.java
+23 -7
View File
@@ -28,14 +28,28 @@ import static com.intellij.testIntegration.TestInfo.select;
import static com.intellij.testIntegration.TestInfo.selectNot;
public class RecentTestsData {
private static Comparator<SuiteInfo> TEST_BY_PATH_COMPARATOR = new Comparator<SuiteInfo>() {
private static Comparator<TestInfo> TEST_BY_PATH_COMPARATOR = new Comparator<TestInfo>() {
@Override
public int compare(SuiteInfo o1, SuiteInfo o2) {
public int compare(TestInfo o1, TestInfo o2) {
String path1 = VirtualFileManager.extractPath(o1.getUrl());
String path2 = VirtualFileManager.extractPath(o2.getUrl());
return path1.compareTo(path2);
}
};
private static Comparator<SuiteInfo> SUITE_BY_RECENT_COMPARATOR = new Comparator<SuiteInfo>() {
@Override
public int compare(SuiteInfo o1, SuiteInfo o2) {
return -o1.getMostRecentRunDate().compareTo(o2.getMostRecentRunDate());
}
};
private static Comparator<TestInfo> TEST_BY_RECENT_COMPARATOR = new Comparator<TestInfo>() {
@Override
public int compare(TestInfo o1, TestInfo o2) {
return -o1.getRunDate().compareTo(o2.getRunDate());
}
};
private final RecentTestRunner myRunner;
private final Map<String, SuiteInfo> mySuites = ContainerUtil.newHashMap();
@@ -82,7 +96,11 @@ public class RecentTestsData {
List<SuiteInfo> suites = ContainerUtil.newArrayList(mySuites.values());
Collections.sort(suites, TEST_BY_PATH_COMPARATOR);
Collections.sort(myTestsWithoutSuites, TEST_BY_PATH_COMPARATOR);
Collections.sort(suites, SUITE_BY_RECENT_COMPARATOR);
Collections.sort(myTestsWithoutSuites, TEST_BY_RECENT_COMPARATOR);
List<String> result = ContainerUtil.newArrayList();
fillWithSuites(result, select(suites, ERROR_INDEX));
@@ -121,6 +139,7 @@ public class RecentTestsData {
}
else {
result.add(suite.getUrl());
Collections.sort(sameMagnitudeTests, TEST_BY_RECENT_COMPARATOR);
for (TestInfo test : sameMagnitudeTests) {
result.add(test.getUrl());
}
@@ -159,16 +178,13 @@ class SuiteInfo extends TestInfo {
}
public Date getMostRecentRunDate() {
if (tests.isEmpty()) return getRunDate();
Date mostRecent = tests.iterator().next().getRunDate();
Date mostRecent = getRunDate();
for (TestInfo test : tests) {
Date testDate = test.getRunDate();
if (testDate.compareTo(mostRecent) > 0) {
mostRecent = testDate;
}
}
return mostRecent;
}