tmf.common: Fix boundaries in data size formatter

This patch fixes the display of units on boundaries,for example
"1024" will be displayed as "1 KB" instead of "1024 B".

Change-Id: I3464d1d54e05254f3133d76faf2b75890690b766
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://git.eclipse.org/r/70698
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Hudson CI

diff --git a/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/format/DataSizeFormatTest.java b/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/format/DataSizeFormatTest.java
index f76eb7a2b106d78d983df83338054d1a3295b904..6f667513a2bc5df4994629c5a43305621dca0e51 100644 (file)
--- a/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/format/DataSizeFormatTest.java
+++ b/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/format/DataSizeFormatTest.java
@@ -56,6 +56,10 @@ public class DataSizeFormatTest {
                 { 0, "0" },
                 { 3, "3 B" },
                 { 975, "975 B" },
+                { 1024, "1 KB" },
+                { 1024 * 1024, "1 MB" },
+                { 1024 * 1024 * 1024, "1 GB" },
+                { 1024L * 1024L * 1024L * 1024L, "1 TB" },
                 { 4096, "4 KB" },
                 { -4096, "-4 KB" },
                 { 4096L, "4 KB" },

diff --git a/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/format/DataSizeWithUnitFormat.java b/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/format/DataSizeWithUnitFormat.java
index ba915f448d092edfc28f4bd6a0dd42342d2420ec..68f15fae1e2a61ebea379e33b41e795eee518798 100644 (file)
--- a/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/format/DataSizeWithUnitFormat.java
+++ b/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/format/DataSizeWithUnitFormat.java
@@ -42,16 +42,16 @@ public class DataSizeWithUnitFormat extends Format {
             if (value == 0) {
                 return toAppendTo.append("0"); //$NON-NLS-1$
             }
-            if (abs > KILO * KILO * KILO * KILO) {
+            if (abs >= KILO * KILO * KILO * KILO) {
                 return toAppendTo.append(FORMAT.format(value / (KILO * KILO * KILO * KILO))).append(' ').append(TB);
             }
-            if (abs > KILO * KILO * KILO) {
+            if (abs >= KILO * KILO * KILO) {
                 return toAppendTo.append(FORMAT.format(value / (KILO * KILO * KILO))).append(' ').append(GB);
             }
-            if (abs > KILO * KILO) {
+            if (abs >= KILO * KILO) {
                 return toAppendTo.append(FORMAT.format(value / (KILO * KILO))).append(' ').append(MB);
             }
-            if (abs > KILO) {
+            if (abs >= KILO) {
                 return toAppendTo.append(FORMAT.format(value / (KILO))).append(' ').append(KB);
             }
             return toAppendTo.append(FORMAT.format(value)).append(' ').append(B);