diff --git a/java/execution/impl/src/com/intellij/execution/junit2/segments/SegmentReader.java b/java/execution/impl/src/com/intellij/execution/junit2/segments/SegmentReader.java index f45d4d4fbb10..7fca570417d6 100644 --- a/java/execution/impl/src/com/intellij/execution/junit2/segments/SegmentReader.java +++ b/java/execution/impl/src/com/intellij/execution/junit2/segments/SegmentReader.java @@ -62,6 +62,11 @@ public class SegmentReader { return Integer.parseInt(intString); } + public long readLong() { + final String longString = upTo(PoolOfDelimiters.INTEGER_DELIMITER); + return Long.parseLong(longString); + } + public char readChar() { myPosition++; return myChars[myPosition - 1]; diff --git a/plugins/junit/src/com/intellij/execution/junit2/states/CumulativeStatistics.java b/plugins/junit/src/com/intellij/execution/junit2/states/CumulativeStatistics.java index 19bb6670e300..335e2fb6d86d 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/states/CumulativeStatistics.java +++ b/plugins/junit/src/com/intellij/execution/junit2/states/CumulativeStatistics.java @@ -16,10 +16,8 @@ package com.intellij.execution.junit2.states; -import com.intellij.execution.junit2.states.Statistics; - public class CumulativeStatistics extends Statistics { - private int myMemoryUsage = 0; + private long myMemoryUsage = 0; private boolean myIsEmpty = true; public CumulativeStatistics() { } @@ -33,7 +31,7 @@ public class CumulativeStatistics extends Statistics { myIsEmpty = false; } - public int getMemoryUsage() { + public long getMemoryUsage() { return myMemoryUsage; } } diff --git a/plugins/junit/src/com/intellij/execution/junit2/states/Statistics.java b/plugins/junit/src/com/intellij/execution/junit2/states/Statistics.java index f329284684ad..afc98da28223 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/states/Statistics.java +++ b/plugins/junit/src/com/intellij/execution/junit2/states/Statistics.java @@ -20,13 +20,13 @@ import com.intellij.execution.junit2.segments.ObjectReader; public class Statistics { public int myTime = 0; - protected int myBeforeMemory = 0; - protected int myAfterMemory = 0; + protected long myBeforeMemory = 0; + protected long myAfterMemory = 0; public Statistics(final ObjectReader reader) { myTime = reader.readInt(); - myBeforeMemory = reader.readInt(); - myAfterMemory = reader.readInt(); + myBeforeMemory = reader.readLong(); + myAfterMemory = reader.readLong(); } public Statistics() { @@ -36,15 +36,15 @@ public class Statistics { return myTime; } - public int getBeforeMemory() { + public long getBeforeMemory() { return myBeforeMemory; } - public int getAfterMemory() { + public long getAfterMemory() { return myAfterMemory; } - public int getMemoryUsage() { + public long getMemoryUsage() { return myAfterMemory - myBeforeMemory; } } diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/ActualStatistics.java b/plugins/junit/src/com/intellij/execution/junit2/ui/ActualStatistics.java index 87796a1d853b..e086143885b9 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/ActualStatistics.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/ActualStatistics.java @@ -47,7 +47,7 @@ class ActualStatistics implements TestStatistics { return showMemory(myStatistics.getAfterMemory()); } - private String showMemory(final int memoryUsage) { + private String showMemory(final long memoryUsage) { return myPrefix + Formatters.printFullKBMemory(memoryUsage); } } diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/TestColumnInfo.java b/plugins/junit/src/com/intellij/execution/junit2/ui/TestColumnInfo.java index 76c0209df3d9..d9d3f79f316e 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/TestColumnInfo.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/TestColumnInfo.java @@ -54,7 +54,9 @@ public abstract class TestColumnInfo extends ColumnInfo implements Comparator { } public final int compare(final Object o1, final Object o2) { - return getAspect(getTestStatistics(o2)) - getAspect(getTestStatistics(o1)); + final long a2 = getAspect(getTestStatistics(o2)); + final long a1 = getAspect(getTestStatistics(o1)); + return a2 > a1 ? 1 : a1 > a2 ? -1 : 0; } private static Statistics getTestStatistics(final Object o1) { @@ -65,7 +67,7 @@ public abstract class TestColumnInfo extends ColumnInfo implements Comparator { return new RightAlignedRenderer(); } - protected abstract int getAspect(Statistics statistics); + protected abstract long getAspect(Statistics statistics); } private static final ColumnInfo TEST = new TestColumnInfo(ExecutionBundle.message("junit.runing.info.test.column.name")) { @@ -90,7 +92,7 @@ public abstract class TestColumnInfo extends ColumnInfo implements Comparator { return Formatters.statisticsFor(test).getTime(); } - public int getAspect(final Statistics statistics) { + public long getAspect(final Statistics statistics) { return statistics.getTime(); } }; @@ -99,7 +101,7 @@ public abstract class TestColumnInfo extends ColumnInfo implements Comparator { return Formatters.statisticsFor(test).getMemoryUsageDelta(); } - public int getAspect(final Statistics statistics) { + public long getAspect(final Statistics statistics) { return statistics.getMemoryUsage(); } }; @@ -109,7 +111,7 @@ public abstract class TestColumnInfo extends ColumnInfo implements Comparator { return Formatters.statisticsFor(test).getBeforeMemory(); } - public int getAspect(final Statistics statistics) { + public long getAspect(final Statistics statistics) { return statistics.getBeforeMemory(); } }; @@ -119,7 +121,7 @@ public abstract class TestColumnInfo extends ColumnInfo implements Comparator { return Formatters.statisticsFor(test).getAfterMemory(); } - public int getAspect(final Statistics statistics) { + public long getAspect(final Statistics statistics) { return statistics.getAfterMemory(); } };